Merge pull request #3 from eclipse/next

Next

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/ManyNonPrimitive.java → org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/ManyNonPrimitive.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public java.util.UUID getTestUuid();
 	public void setTestUuid(java.util.UUID testUuid);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/Setter.java → org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Setter.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public int getTest();
 }
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/Single.java → org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Single.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public int getTestInt();
 	public void setTestInt(int testInt);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/SingleNonPrimitive.java → org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/SingleNonPrimitive.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public java.util.UUID getTestUuid();
 	public void setTestUuid(java.util.UUID testUuid);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/Defaults.java

-import org.eclipse.ice.dev.annotations.IDataElement;
-public interface Test extends IDataElement<Test> {}
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/Persistence/DefaultImplementation.java

+public class TestPersistenceHandler implements IPersistenceHandler<Test> {
+	private final static String COLLECTION = "test";
+}
\ No newline at end of file

org.eclipse.ice.renderer/pom.xml

@@ -55,6 +55,12 @@
 			<artifactId>dagger</artifactId>
 			<version>2.16</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.ice</groupId>
+			<artifactId>org.eclipse.ice.data</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.ice.dev</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>

org.eclipse.ice.renderer/src/main/java/org/eclipse/ice/renderer/Renderer.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.function.BiConsumer;
 import javax.inject.Inject;
 
-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 
 /**
  * This class is a basic controller that connects data and UI classes in a

org.eclipse.ice.renderer/src/test/java/org/eclipse/ice/tests/renderer/GeneratedDataElementTest.java

@@ -13,7 +13,7 @@ package org.eclipse.ice.tests.renderer;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import org.eclipse.ice.dev.annotations.JavascriptValidator;
+import org.eclipse.ice.data.JavascriptValidator;
 import org.junit.jupiter.api.Test;
 
 /**

rse-renderer-client-test/pom.xml

@@ -137,6 +137,12 @@
 			<artifactId>vaadin-testbench</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.ice</groupId>
+			<artifactId>org.eclipse.ice.data</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.renderer</artifactId>

rse-renderer-client-test/src/main/java/gov/ornl/rse/renderer/client/test/IRendererClient.java

@@ -13,7 +13,7 @@ package gov.ornl.rse.renderer.client.test;
 
 import java.io.Serializable;
 
-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 import org.eclipse.ice.renderer.DataElement;
 
 public interface IRendererClient<T extends IDataElement> {

rse-renderer-client-test/src/main/java/gov/ornl/rse/renderer/client/test/MainView.java

@@ -16,7 +16,7 @@ import java.util.function.BiConsumer;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 import org.eclipse.ice.renderer.DataElement;
 import org.eclipse.ice.renderer.JavascriptValidator;
 import org.eclipse.ice.renderer.Renderer;

rse-renderer-client-test/src/main/java/gov/ornl/rse/renderer/client/test/VaadinRendererClient.java

@@ -16,7 +16,7 @@ package gov.ornl.rse.renderer.client.test;
 
 import java.io.Serializable;
 
-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 import org.eclipse.ice.renderer.DataElement;
 
 import com.fasterxml.jackson.core.JsonProcessingException;