Simplify PojoFromJson, use DataElementMetadata directly

Signed-off-by: Daniel Bluhm <bluhmdj@ornl.gov>
eclipse · Oct 23, 2020 · fa187fb · fa187fb
1 parent d71d6c4
commit fa187fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 200 deletions.
diff --git a/...pse.ice.dev.pojofromjson/src/main/java/org/eclipse/ice/dev/pojofromjson/PojoFromJson.java b/...pse.ice.dev.pojofromjson/src/main/java/org/eclipse/ice/dev/pojofromjson/PojoFromJson.java
@@ -20,11 +20,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.ice.dev.annotations.processors.DataElementMetadata;
 import org.eclipse.ice.dev.annotations.processors.DefaultFields;
 import org.eclipse.ice.dev.annotations.processors.Fields;
 import org.eclipse.ice.dev.annotations.processors.ImplementationWriter;
 import org.eclipse.ice.dev.annotations.processors.InterfaceWriter;
-import org.eclipse.ice.dev.annotations.processors.Types;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
@@ -73,40 +73,26 @@ public class PojoFromJson {
 	 */
 	public static void handleInputJson(
 		InputStream is, Path destination
-	) throws JsonParseException, JsonMappingException, IOException {
+	) throws IOException {
 		// Parse outline from input stream
-		PojoOutline pojo = mapper.readValue(is, PojoOutline.class);
+		DataElementMetadata data = mapper.readValue(is, DataElementMetadata.class);
 
 		// Collect fields
-		Fields fields = new Fields();
+		Fields fields = data.getFields();
 		fields.collect(DefaultFields.get());
-		fields.collect(pojo.getFields());
 
 		// Write Interface
 		try (Writer elementInterface = Files.newBufferedWriter(
-			destination.resolve(pojo.getElement() + ".java")
+			destination.resolve(data.getName() + ".java")
 		)) {
-			InterfaceWriter.builder()
-				.packageName(pojo.getPackageName())
-				.interfaceName(pojo.getElement())
-				.fields(fields)
-				.types(new Types(fields.getInterfaceFields()))
-				.build()
-				.write(elementInterface);
+			new InterfaceWriter(data).write(elementInterface);
 		}
 
 		// Write implementation
 		try (Writer elementImpl = Files.newBufferedWriter(
-			destination.resolve(pojo.getImplementation() + ".java")
+			destination.resolve(data.getImplementationName() + ".java")
 		)) {
-			ImplementationWriter.builder()
-				.packageName(pojo.getPackageName())
-				.interfaceName(pojo.getElement())
-				.className(pojo.getImplementation())
-				.fields(fields)
-				.types(fields.getTypes())
-				.build()
-				.write(elementImpl);
+			new ImplementationWriter(data).write(elementImpl);
 		}
 	}
 

diff --git a/...ipse.ice.dev.pojofromjson/src/main/java/org/eclipse/ice/dev/pojofromjson/PojoOutline.java b/...ipse.ice.dev.pojofromjson/src/main/java/org/eclipse/ice/dev/pojofromjson/PojoOutline.java
diff --git a/...ev.pojofromjson/src/test/java/org/eclipse/ice/tests/dev/pojofromjson/PojoOutlineTest.java b/...ev.pojofromjson/src/test/java/org/eclipse/ice/tests/dev/pojofromjson/PojoOutlineTest.java
diff --git a/org.eclipse.ice.dev/org.eclipse.ice.dev.pojofromjson/src/test/resources/TestElement.json b/org.eclipse.ice.dev/org.eclipse.ice.dev.pojofromjson/src/test/resources/TestElement.json
@@ -1,6 +1,6 @@
 {
 	"package": "testpackage",
-	"element": "TestElement",
+	"name": "TestElement",
 	"fields": [{
 		"name": "test",
 		"type": "String"