Merge branch 'next' into dataelement-proxy-test

Signed-off-by: Daniel Bluhm <bluhmdj@ornl.gov>
eclipse · Jul 6, 2020 · dd16ace · dd16ace
2 parents faa0ed0 + 6850ae9
commit dd16ace
Show file tree

Hide file tree

Showing 39 changed files with 686 additions and 6 deletions.
diff --git a/org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/pom.xml b/org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/pom.xml
@@ -85,6 +85,12 @@
 			<version>5.6.2</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.testing.compile</groupId>
+			<artifactId>compile-testing</artifactId>
+			<version>0.18</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>

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
@@ -47,7 +47,7 @@
 	"org.eclipse.ice.dev.annotations.DataField.Default",
 	"org.eclipse.ice.dev.annotations.Persisted"
 })
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 @AutoService(Processor.class)
 public class DataElementProcessor extends AbstractProcessor {
 

diff --git a/...annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementSpec.java b/...annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementSpec.java
@@ -7,6 +7,7 @@
 import java.util.stream.Collectors;
 
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 
@@ -73,7 +74,7 @@ public class DataElementSpec extends AnnotatedElement {
 	 */
 	public DataElementSpec(Element element, Elements elementUtils) throws InvalidDataElementSpec {
 		super(element, elementUtils);
-		if (!element.getKind().isClass()) {
+		if (element.getKind() != ElementKind.CLASS) {
 			throw new InvalidDataElementSpec(
 				"DataElementSpec must be class, found " + element.toString()
 			);

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
@@ -134,6 +134,7 @@ public class ${class} implements ${interface}, Serializable {
 					// by debuggers.
 					#foreach($field in ${fields.Match})
 
+					// Matching ${field.Name}
 					boolean ${field.Name}Match =
 					#if(${field.Nullable})
 						this.${field.Name} == null ?
@@ -144,8 +145,6 @@ public class ${class} implements ${interface}, Serializable {
 					#else
 						this.${field.Name}.equals(other.${field.Name});
 					#end## if nullable
-					#else
-					// Not checking ${field.Name}
 					#end## foreach
 
 					retval =

diff --git a/....ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/ElementInterface.vm b/....ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/ElementInterface.vm
@@ -18,7 +18,7 @@ public interface $interface extends IDataElement<${interface}> {
 	 * Get ${field.Name}.
 	 * @return ${field.Name}
 	 */
-	public #fieldtype get${field.NameForMethod}();
+	public #fieldtype #getterprefix${field.NameForMethod}();
 	#end## if Getter
 	#if(${field.Setter})
 

diff --git a/org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/common.vm b/org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/common.vm
@@ -36,4 +36,5 @@ $shift$bodyContent.toString().replace("$tab", "").replace("$newline", "$newline$
 	 * $field.DocString.trim().replace("$newline", "$newline$tab *")
 	 */
 	#end
-#end
+#end
+#macro(getterprefix)#if(${field.Type} == "boolean")is#{else}get#end#end