Simplify code generation with Immutables

Author: nictas

pom.xml

@@ -20,7 +20,7 @@
         <spring-security-oauth2.version>2.5.0.RELEASE</spring-security-oauth2.version>
         <commons-io.version>2.8.0</commons-io.version>
         <micrometer.version>1.5.5</micrometer.version>
-        <immutables.version>2.7.5</immutables.version>
+        <immutables.version>2.8.8</immutables.version>
         <cloudfoundry-client.version>4.10.0.RELEASE</cloudfoundry-client.version>
     </properties>
 

src/main/java/com/sap/cloudfoundry/client/facade/domain/annotation/GenerationStyle.java renamed to src/main/java/com/sap/cloudfoundry/client/facade/ImmutablesStyle.java

@@ -1,8 +1,8 @@
-package com.sap.cloudfoundry.client.facade.domain.annotation;
+package com.sap.cloudfoundry.client.facade;
 
 import org.immutables.value.Value;
 
 @Value.Style(depluralize = true, typeImmutable = "Immutable*", typeImmutableNested = "Immutable*", visibility = Value.Style.ImplementationVisibility.PUBLIC)
-public @interface GenerationStyle {
+@interface ImmutablesStyle {
 
 }

src/main/java/com/sap/cloudfoundry/client/facade/Nullable.java

@@ -0,0 +1,5 @@
+package com.sap.cloudfoundry.client.facade;
+
+public @interface Nullable {
+
+}

src/main/java/com/sap/cloudfoundry/client/facade/SkipNulls.java

@@ -0,0 +1,5 @@
+package com.sap.cloudfoundry.client.facade;
+
+public @interface SkipNulls {
+
+}

src/main/java/com/sap/cloudfoundry/client/facade/adapters/RawCloudServiceInstance.java

@@ -8,11 +8,11 @@
 import org.cloudfoundry.client.v2.services.ServiceEntity;
 import org.immutables.value.Value;
 
+import com.sap.cloudfoundry.client.facade.Nullable;
 import com.sap.cloudfoundry.client.facade.domain.CloudServiceInstance;
 import com.sap.cloudfoundry.client.facade.domain.ImmutableCloudServiceInstance;
 import com.sap.cloudfoundry.client.facade.domain.ServiceInstanceType;
 import com.sap.cloudfoundry.client.facade.domain.ServiceOperation;
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
 
 @Value.Immutable
 public abstract class RawCloudServiceInstance extends RawCloudEntity<CloudServiceInstance> {

src/main/java/com/sap/cloudfoundry/client/facade/adapters/RawCloudSpace.java

@@ -4,11 +4,11 @@
 import org.cloudfoundry.client.v2.spaces.SpaceEntity;
 import org.immutables.value.Value;
 
+import com.sap.cloudfoundry.client.facade.Nullable;
 import com.sap.cloudfoundry.client.facade.domain.CloudOrganization;
 import com.sap.cloudfoundry.client.facade.domain.CloudSpace;
 import com.sap.cloudfoundry.client.facade.domain.Derivable;
 import com.sap.cloudfoundry.client.facade.domain.ImmutableCloudSpace;
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
 
 @Value.Immutable
 public abstract class RawCloudSpace extends RawCloudEntity<CloudSpace> {

src/main/java/com/sap/cloudfoundry/client/facade/domain/CloudApplication.java

@@ -8,7 +8,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
+import com.sap.cloudfoundry.client.facade.Nullable;
 
 @Value.Immutable
 @JsonSerialize(as = ImmutableCloudApplication.class)

src/main/java/com/sap/cloudfoundry/client/facade/domain/CloudBuild.java

@@ -6,9 +6,9 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sap.cloudfoundry.client.facade.Nullable;
 import com.sap.cloudfoundry.client.facade.domain.ImmutableCloudBuild.ImmutableCreatedBy;
 import com.sap.cloudfoundry.client.facade.domain.ImmutableCloudBuild.ImmutablePackageInfo;
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
 
 @Value.Enclosing
 @Value.Immutable

src/main/java/com/sap/cloudfoundry/client/facade/domain/CloudEntity.java

@@ -20,7 +20,7 @@
 
 import org.cloudfoundry.client.v3.Metadata;
 
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
+import com.sap.cloudfoundry.client.facade.Nullable;
 
 /**
  * Do not extend {@code Derivable<T>} in this interface. It is tempting, because all of its children have the same implementation, but

src/main/java/com/sap/cloudfoundry/client/facade/domain/CloudEvent.java

@@ -7,8 +7,8 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sap.cloudfoundry.client.facade.Nullable;
 import com.sap.cloudfoundry.client.facade.domain.ImmutableCloudEvent.ImmutableParticipant;
-import com.sap.cloudfoundry.client.facade.domain.annotation.Nullable;
 
 @Value.Enclosing
 @Value.Immutable