Revert changes in deserialization, typescript

Cleanup state for merging upstream Signed-off-by: Daniel Bluhm <bluhmdj@ornl.gov>
eclipse · Oct 12, 2020 · 50f10a9 · 50f10a9
1 parent 3c2639b
commit 50f10a9
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 172 deletions.
diff --git a/.../src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementWriterGenerator.java b/.../src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementWriterGenerator.java
@@ -56,15 +56,6 @@ public List<GeneratedFileWriter> generate() {
 			.fields(data.getFields())
 			.types(data.getFields().getTypes())
 			.build());
-		try {
-			writers.add(TypeScriptWriter.builder()
-				.name(data.getName())
-				.fields(nonDefaults)
-				.types(nonDefaults.getTypes())
-				.build());
-		} catch (UnsupportedOperationException e) {
-			logger.info("Failed to create typescript writer for element:", e);
-		}
 
 		return writers;
 	}

diff --git a/...nnotations/src/main/java/org/eclipse/ice/dev/annotations/processors/TypeScriptWriter.java b/...nnotations/src/main/java/org/eclipse/ice/dev/annotations/processors/TypeScriptWriter.java
diff --git a/...lipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/DataElement.vm b/...lipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/DataElement.vm
@@ -13,16 +13,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.Setter;
 
@@ -32,9 +28,7 @@ import lombok.Setter;
  * This is an implementation of $interface that satisfies the dependencies of
  * the @DataElement Annotation and was auto-generated by the ICE Framework.
  */
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -43,22 +37,12 @@ import lombok.Setter;
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = ${class}.${class}Builder.class)
 public class ${class} implements ${interface}, Serializable {
 
 	/**
 	 * Logging tool
 	 */
 	private static final Logger logger = LoggerFactory.getLogger(${class}.class);
-
-	/**
-	 * Deserialization helpers.
-	 */
-	@JsonPOJOBuilder(withPrefix = "")
-	public static class ${class}Builder implements ${class}BuilderMeta {
-	}
-	private interface ${class}BuilderMeta {
-	}
 	#foreach($field in $fields)
 
 		#fielddoc
@@ -69,7 +53,7 @@ public class ${class} implements ${interface}, Serializable {
 		#if(!${field.Setter} || ${field.VarNameDifferent})
 	@Setter(AccessLevel.NONE)
 		#end
-		#fielddecl(true)
+		#fielddecl
 	#end
 	#foreach($field in ${fields.Constants})
 
@@ -98,6 +82,25 @@ public class ${class} implements ${interface}, Serializable {
 		#end
 	#end
 
+	/**
+	 * All args constructor for $class.
+	 *
+	 * Used in JSON Deserialization.
+	#foreach($field in $fields)
+	 * @param ${field.VarName} {@code #fieldtype} for field ${field.VarName}
+	#end
+	 */
+	@JsonCreator
+	public $class(
+	#foreach($field in $fields)
+		@JsonProperty("${field.VarName}") #fieldparametertype ${field.VarName}#if($foreach.hasNext),#end
+	#end
+	) {
+		#foreach($field in $fields)
+		this.${field.VarName} = ${field.VarName};
+		#end
+	}
+
 	/**
 	 * Copy constructor for $class.
 	 * @param other Instance of $class to copy

diff --git a/...e.ice.dev.annotations/src/test/resources/patterns/DataElement/AccessibilityPreserved.java b/...e.ice.dev.annotations/src/test/resources/patterns/DataElement/AccessibilityPreserved.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	public int shouldBePublic;
 	protected int shouldBeProtected;

diff --git a/...v.annotations/src/test/resources/patterns/DataElement/DefaultNonStringImplementation.java b/...v.annotations/src/test/resources/patterns/DataElement/DefaultNonStringImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
-	@Builder.Default public int testInt = 42;
+	public int testInt = 42;
 }
diff --git a/....dev.annotations/src/test/resources/patterns/DataElement/DefaultStringImplementation.java b/....dev.annotations/src/test/resources/patterns/DataElement/DefaultStringImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
-	@NonNull @Builder.Default public String test = "A String Value";
+	@NonNull public String test = "A String Value";
 }
diff --git a/...e.ice.dev.annotations/src/test/resources/patterns/DataElement/DefaultsImplementation.java b/...e.ice.dev.annotations/src/test/resources/patterns/DataElement/DefaultsImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,18 +7,17 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	@NonNull
 	@Getter(AccessLevel.NONE)
 	@Setter(AccessLevel.NONE)
-	@Builder.Default protected UUID privateId = UUID.randomUUID();
-	@Builder.Default protected long id = 0L;
-	@NonNull @Builder.Default protected String name = "name";
-	@NonNull @Builder.Default protected String description = "description";
-	@NonNull @Builder.Default protected String comment = "no comment";
-	@NonNull @Builder.Default protected String context = "default";
-	@Builder.Default protected boolean required = false;
-	@Builder.Default protected boolean secret = false;
+	protected UUID privateId = UUID.randomUUID();
+	protected long id = 0L;
+	@NonNull protected String name = "name";
+	@NonNull protected String description = "description";
+	@NonNull protected String comment = "no comment";
+	@NonNull protected String context = "default";
+	protected boolean required = false;
+	protected boolean secret = false;
 	protected JavascriptValidator<Test> validator;
 }
diff --git a/...lipse.ice.dev.annotations/src/test/resources/patterns/DataElement/ManyImplementation.java b/...lipse.ice.dev.annotations/src/test/resources/patterns/DataElement/ManyImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	public byte testByte;
 	public short testShort;

diff --git a/...v.annotations/src/test/resources/patterns/DataElement/ManyNonPrimitiveImplementation.java b/...v.annotations/src/test/resources/patterns/DataElement/ManyNonPrimitiveImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	@NonNull public UUID testUuid;
 	@NonNull public String testString;

diff --git a/...pse.ice.dev.annotations/src/test/resources/patterns/DataElement/SingleImplementation.java b/...pse.ice.dev.annotations/src/test/resources/patterns/DataElement/SingleImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	public int testInt;
 }
diff --git a/...annotations/src/test/resources/patterns/DataElement/SingleNonPrimitiveImplementation.java b/...annotations/src/test/resources/patterns/DataElement/SingleNonPrimitiveImplementation.java
@@ -1,6 +1,4 @@
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 @JsonAutoDetect(
 	fieldVisibility = Visibility.ANY,
@@ -9,7 +7,6 @@
 	setterVisibility = Visibility.NONE
 )
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(builder = TestImplementation.TestImplementationBuilder.class)
 public class TestImplementation implements Test, Serializable {
 	@NonNull public UUID testUuid;
 }