ContextProperty -> DataElementTemplateProperty

And add preliminary PersistenceHandlerTemplateProperty Signed-off-by: Daniel Bluhm <bluhmdj@ornl.gov>
eclipse · Jun 4, 2020 · 049ed7c · 049ed7c
1 parent f41186e
commit 049ed7c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/...ations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementProcessor.java b/...ations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementProcessor.java
@@ -267,10 +267,10 @@ private void writeClass(final String interfaceName, final List<Field> fields) th
 
 		// Prepare context of template
 		final VelocityContext context = new VelocityContext();
-		context.put(ContextProperty.PACKAGE.key(), packageName);
-		context.put(ContextProperty.INTERFACE.key(), simpleName);
-		context.put(ContextProperty.CLASS.key(), generatedSimpleClassName);
-		context.put(ContextProperty.FIELDS.key(), fields);
+		context.put(DataElementTemplateProperty.PACKAGE.getKey(), packageName);
+		context.put(DataElementTemplateProperty.INTERFACE.getKey(), simpleName);
+		context.put(DataElementTemplateProperty.CLASS.getKey(), generatedSimpleClassName);
+		context.put(DataElementTemplateProperty.FIELDS.getKey(), fields);
 
 		// Write to file
 		final JavaFileObject generatedClassFile = processingEnv.getFiler().createSourceFile(generatedClassName);

diff --git a/...notations/processors/ContextProperty.java → ...ocessors/DataElementTemplateProperty.java b/...notations/processors/ContextProperty.java → ...ocessors/DataElementTemplateProperty.java
@@ -1,21 +1,17 @@
 package org.eclipse.ice.dev.annotations.processors;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Enumeration for Keys used in DataElement Velocity Template.
  */
-enum ContextProperty {
+@AllArgsConstructor
+enum DataElementTemplateProperty {
 	PACKAGE("package"),
 	FIELDS("fields"),
 	INTERFACE("interface"),
 	CLASS("class");
 
-	private String key;
-
-	ContextProperty(String key) {
-		this.key = key;
-	}
-
-	String key() {
-		return this.key;
-	}
+	@Getter private String key;
 }
diff --git a/...n/java/org/eclipse/ice/dev/annotations/processors/PersistenceHandlerTemplateProperty.java b/...n/java/org/eclipse/ice/dev/annotations/processors/PersistenceHandlerTemplateProperty.java
@@ -0,0 +1,19 @@
+package org.eclipse.ice.dev.annotations.processors;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * Enumeration of keys of Persistence Handler Template.
+ * @author Daniel Bluhm
+ */
+@AllArgsConstructor
+enum PersistenceHandlerTemplateProperty {
+	PACKAGE("package"),
+	ELEMENT_INTERFACE("elementInterface"),
+	CLASS("class"),
+	COLLECTION("collection"),
+	IMPLEMENTATION("implementation");
+
+	@Getter private String key;
+}