Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#457 - Polished usage of Lombok in ALPS package.

Browse Source 
Switched to the non-experimental @Builder. Upgraded to Lombok 1.16.8.
This commit is contained in:
Oliver Gierke
2016-06-06 11:26:59 +02:00
parent 40898cb1ea
commit 4d189cf11f
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -13,7 +13,7 @@
hyper-text driven REST web services. hyper-text driven REST web services.
</description> </description>
<inceptionYear>2012-2015</inceptionYear> <inceptionYear>2012-2016</inceptionYear>
<organization> <organization>
<name>Pivotal, Inc.</name> <name>Pivotal, Inc.</name>
@@ -471,7 +471,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.4</version> <version>1.16.8</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

8
src/main/java/org/springframework/hateoas/alps/Alps.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
*/ */
package org.springframework.hateoas.alps; package org.springframework.hateoas.alps;
import java.util.List; import lombok.Builder;
import lombok.Value; import lombok.Value;
import lombok.experimental.Builder;
import java.util.List;
import org.springframework.hateoas.alps.Descriptor.DescriptorBuilder; import org.springframework.hateoas.alps.Descriptor.DescriptorBuilder;
import org.springframework.hateoas.alps.Doc.DocBuilder; import org.springframework.hateoas.alps.Doc.DocBuilder;

8
src/main/java/org/springframework/hateoas/alps/Descriptor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
*/ */
package org.springframework.hateoas.alps; package org.springframework.hateoas.alps;
import java.util.List; import lombok.Builder;
import lombok.Value; import lombok.Value;
import lombok.experimental.Builder;
import java.util.List;
/** /**
* A value object for an ALPS descriptor. * A value object for an ALPS descriptor.

4
src/main/java/org/springframework/hateoas/alps/Doc.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
package org.springframework.hateoas.alps; package org.springframework.hateoas.alps;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value; import lombok.Value;
import lombok.experimental.Builder;
import org.springframework.util.Assert; import org.springframework.util.Assert;

4
src/main/java/org/springframework/hateoas/alps/Ext.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
*/ */
package org.springframework.hateoas.alps; package org.springframework.hateoas.alps;
import lombok.Builder;
import lombok.Value; import lombok.Value;
import lombok.experimental.Builder;
/** /**
* A value object for an ALPS ext element. * A value object for an ALPS ext element.

1
template.mf
View File

@@ -8,6 +8,7 @@ Import-Template:
javax.servlet.*;version="[2.5,4.0)";resolution:=optional, javax.servlet.*;version="[2.5,4.0)";resolution:=optional,
javax.ws.rs.*;version="${jaxrs.version:[=.=.=,+1.0.0)}";resolution:=optional, javax.ws.rs.*;version="${jaxrs.version:[=.=.=,+1.0.0)}";resolution:=optional,
javax.xml.bind.*;version="0", javax.xml.bind.*;version="0",
lombok.*;version="0";resolution:=optional,
net.minidev.json.*;version="${minidevjson.version:[=.=.=,+1.0.0)}";resolution:=optional, net.minidev.json.*;version="${minidevjson.version:[=.=.=,+1.0.0)}";resolution:=optional,
org.aopalliance.*;version="[1.0.0,2.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0,2.0.0)";resolution:=optional,
org.atteo.evo.inflector.*;version="${evo.version:[=.=.=,+1.0.0)}";resolution:=optional, org.atteo.evo.inflector.*;version="${evo.version:[=.=.=,+1.0.0)}";resolution:=optional,