Rename maven modules to mirror directory structure

The naming of Maven modules in drools-applications was not
aligned with the directory structure in the git repository
of drools-applications. Therefore it was difficult to
see the strucutre of the repository in Eclipse and other
IDEs. This change amends the Maven module IDs to
reflect the repository directory structure.

This patch reset fixes the previos patch set, where many
references to maven modules internally in drools-applciations
were missed. See also changes in engine and docker repos.

Updated to reflect repo directory structure in maven
artifact groups.

Issue-ID: POLICY-238
Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

5 files changed, 630 insertions, 628 deletions

diff --git a/controlloop/common/model-impl/sdc/pom.xml b/controlloop/common/model-impl/sdc/pom.xml
index 76c9de307..54724e678 100644
--- a/controlloop/common/model-impl/sdc/pom.xml
+++ b/controlloop/common/model-impl/sdc/pom.xml
@@ -1,19 +1,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.onap.policy.drools-applications</groupId>
-		<artifactId>model-impl</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>sdc</artifactId>
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sdc</artifactId>
 
   <dependencies>
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.12</version>
-		<scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java
index 58999f384..7e64787f8 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java
@@ -1,152 +1,152 @@
-/*-

- * ============LICENSE_START=======================================================

- * sdc

- * ================================================================================

- * 

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.sdc;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertTrue;

-

-import java.util.UUID;

-

-import org.junit.Test;

-

-public class TestResource {

-

-    @Test

-    public void testConstructors() {

-        Resource res = new Resource();

-        assertEquals(null, res.getResourceUUID());

-        assertEquals(null, res.getResourceInvariantUUID());

-        assertEquals(null, res.getResourceName());

-        assertEquals(null, res.getResourceType());

-        assertEquals(null, res.getResourceVersion());

-

-        UUID uuid = UUID.randomUUID();

-        res = new Resource(uuid);

-        assertEquals(uuid, res.getResourceUUID());

-        assertEquals(null, res.getResourceInvariantUUID());

-        assertEquals(null, res.getResourceName());

-        assertEquals(null, res.getResourceType());

-        assertEquals(null, res.getResourceVersion());

-

-        String name = "constTest";

-        res = new Resource(name, ResourceType.CP);

-        assertEquals(null, res.getResourceUUID());

-        assertEquals(name, res.getResourceName());

-        assertEquals(ResourceType.CP, res.getResourceType());

-        assertEquals(null, res.getResourceInvariantUUID());

-        assertEquals(null, res.getResourceVersion());

-

-        uuid = UUID.randomUUID();

-        UUID uuidInvariant = UUID.randomUUID();

-        name = "constTestUUID";

-        String version = "0.0.1";

-        res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF);

-        assertEquals(uuid, res.getResourceUUID());

-        assertEquals(uuidInvariant, res.getResourceInvariantUUID());

-        assertEquals(name, res.getResourceName());

-        assertEquals(ResourceType.VF, res.getResourceType());

-        assertEquals(version, res.getResourceVersion());

-

-        Resource r2 = new Resource(res);

-        assertEquals(uuid, r2.getResourceUUID());

-        assertEquals(uuidInvariant, r2.getResourceInvariantUUID());

-        assertEquals(name, r2.getResourceName());

-        assertEquals(ResourceType.VF, r2.getResourceType());

-        assertEquals(version, r2.getResourceVersion());

-    }

-

-    @Test

-    public void testUuid() {

-        Resource res = new Resource();

-        UUID uuid = UUID.randomUUID();

-        res.setResourceUUID(uuid);

-        assertEquals(uuid, res.getResourceUUID());

-    }

-

-    @Test

-    public void testInvariantUuid() {

-        Resource res = new Resource();

-        UUID uuid = UUID.randomUUID();

-        res.setResourceInvariantUUID(uuid);

-        assertEquals(uuid, res.getResourceInvariantUUID());

-    }

-

-    @Test

-    public void testName() {

-        Resource res = new Resource();

-        String name = "nameTest";

-        res.setResourceName(name);

-        assertEquals(name, res.getResourceName());

-    }

-

-    @Test

-    public void testVersion() {

-        Resource res = new Resource();

-        String version = "versionTest";

-        res.setResourceVersion(version);

-        assertEquals(version, res.getResourceVersion());

-    }

-

-    @Test

-    public void testType() {

-        Resource res = new Resource();

-        res.setResourceType(ResourceType.CP);

-        assertEquals(ResourceType.CP, res.getResourceType());

-    }

-

-    @Test

-    public void testEquals() {

-        Resource r1 = new Resource();

-        Resource r2 = new Resource(r1);

-        assertTrue(r1.equals(r2));

-        assertTrue(r2.equals(r1));

-

-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",

-                ResourceType.VFC);

-        r2 = new Resource(r1);

-        assertTrue(r1.equals(r2));

-        assertTrue(r2.equals(r1));

-    }

-

-    @Test

-    public void testToString() {

-        Resource r1 = new Resource();

-        Resource r2 = new Resource(r1);

-        assertEquals(r1.toString(), r2.toString());

-

-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",

-                ResourceType.VFC);

-        r2 = new Resource(r1);

-        assertEquals(r1.toString(), r2.toString());

-    }

-

-    @Test

-    public void testHashCode() {

-        Resource r1 = new Resource();

-        Resource r2 = new Resource(r1);

-        assertEquals(r1.hashCode(), r2.hashCode());

-

-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",

-                ResourceType.VFC);

-        r2 = new Resource(r1);

-        assertEquals(r1.hashCode(), r2.hashCode());

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestResource {
+
+    @Test
+    public void testConstructors() {
+        Resource res = new Resource();
+        assertEquals(null, res.getResourceUUID());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceName());
+        assertEquals(null, res.getResourceType());
+        assertEquals(null, res.getResourceVersion());
+
+        UUID uuid = UUID.randomUUID();
+        res = new Resource(uuid);
+        assertEquals(uuid, res.getResourceUUID());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceName());
+        assertEquals(null, res.getResourceType());
+        assertEquals(null, res.getResourceVersion());
+
+        String name = "constTest";
+        res = new Resource(name, ResourceType.CP);
+        assertEquals(null, res.getResourceUUID());
+        assertEquals(name, res.getResourceName());
+        assertEquals(ResourceType.CP, res.getResourceType());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceVersion());
+
+        uuid = UUID.randomUUID();
+        UUID uuidInvariant = UUID.randomUUID();
+        name = "constTestUUID";
+        String version = "0.0.1";
+        res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF);
+        assertEquals(uuid, res.getResourceUUID());
+        assertEquals(uuidInvariant, res.getResourceInvariantUUID());
+        assertEquals(name, res.getResourceName());
+        assertEquals(ResourceType.VF, res.getResourceType());
+        assertEquals(version, res.getResourceVersion());
+
+        Resource r2 = new Resource(res);
+        assertEquals(uuid, r2.getResourceUUID());
+        assertEquals(uuidInvariant, r2.getResourceInvariantUUID());
+        assertEquals(name, r2.getResourceName());
+        assertEquals(ResourceType.VF, r2.getResourceType());
+        assertEquals(version, r2.getResourceVersion());
+    }
+
+    @Test
+    public void testUuid() {
+        Resource res = new Resource();
+        UUID uuid = UUID.randomUUID();
+        res.setResourceUUID(uuid);
+        assertEquals(uuid, res.getResourceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        Resource res = new Resource();
+        UUID uuid = UUID.randomUUID();
+        res.setResourceInvariantUUID(uuid);
+        assertEquals(uuid, res.getResourceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        Resource res = new Resource();
+        String name = "nameTest";
+        res.setResourceName(name);
+        assertEquals(name, res.getResourceName());
+    }
+
+    @Test
+    public void testVersion() {
+        Resource res = new Resource();
+        String version = "versionTest";
+        res.setResourceVersion(version);
+        assertEquals(version, res.getResourceVersion());
+    }
+
+    @Test
+    public void testType() {
+        Resource res = new Resource();
+        res.setResourceType(ResourceType.CP);
+        assertEquals(ResourceType.CP, res.getResourceType());
+    }
+
+    @Test
+    public void testEquals() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertTrue(r1.equals(r2));
+        assertTrue(r2.equals(r1));
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertTrue(r1.equals(r2));
+        assertTrue(r2.equals(r1));
+    }
+
+    @Test
+    public void testToString() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertEquals(r1.toString(), r2.toString());
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertEquals(r1.toString(), r2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertEquals(r1.hashCode(), r2.hashCode());
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertEquals(r1.hashCode(), r2.hashCode());
+    }
+}
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java
index ef5986f05..77847f167 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java
@@ -1,155 +1,155 @@
-/*-

- * ============LICENSE_START=======================================================

- * sdc

- * ================================================================================

- * 

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.sdc;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertTrue;

-

-import java.util.UUID;

-

-import org.junit.Test;

-

-public class TestResourceInstance {

-

-    @Test

-    public void testConstructors() {

-        ResourceInstance ri = new ResourceInstance();

-        assertEquals(null, ri.getResourceInstanceName());

-        assertEquals(null, ri.getResourceUUID());

-        assertEquals(null, ri.getResourceInvariantUUID());

-        assertEquals(null, ri.getResourceName());

-        assertEquals(null, ri.getResourceType());

-        assertEquals(null, ri.getResourceVersion());

-

-        ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);

-        assertEquals(null, ri2.getResourceInstanceName());

-        assertEquals(null, ri2.getResourceUUID());

-        assertEquals(null, ri2.getResourceInvariantUUID());

-        assertEquals(null, ri2.getResourceName());

-        assertEquals(null, ri2.getResourceType());

-        assertEquals(null, ri2.getResourceVersion());

-

-        ri2 = new ResourceInstance(ri);

-        assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());

-        assertEquals(ri2.getResourceUUID(), ri.getResourceUUID());

-        assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID());

-        assertEquals(ri2.getResourceName(), ri.getResourceName());

-        assertEquals(ri2.getResourceType(), ri.getResourceType());

-        assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());

-    }

-

-    @Test

-    public void testInstanceName() {

-        ResourceInstance ri = new ResourceInstance();

-        String name = "nameTestInstance";

-        ri.setResourceInstanceName(name);;

-        assertEquals(name, ri.getResourceInstanceName());

-    }

-

-    @Test

-    public void testUuid() {

-        ResourceInstance ri = new ResourceInstance();

-        UUID uuid = UUID.randomUUID();

-        ri.setResourceUUID(uuid);

-        assertEquals(uuid, ri.getResourceUUID());

-    }

-

-    @Test

-    public void testInvariantUuid() {

-        ResourceInstance ri = new ResourceInstance();

-        UUID uuid = UUID.randomUUID();

-        ri.setResourceInvariantUUID(uuid);

-        assertEquals(uuid, ri.getResourceInvariantUUID());

-    }

-

-    @Test

-    public void testName() {

-        ResourceInstance ri = new ResourceInstance();

-        String name = "nameTest";

-        ri.setResourceName(name);

-        assertEquals(name, ri.getResourceName());

-    }

-

-    @Test

-    public void testVersion() {

-        ResourceInstance ri = new ResourceInstance();

-        String version = "versionTest";

-        ri.setResourceVersion(version);

-        assertEquals(version, ri.getResourceVersion());

-    }

-

-    @Test

-    public void testType() {

-        ResourceInstance ri = new ResourceInstance();

-        ri.setResourceType(ResourceType.CP);

-        assertEquals(ResourceType.CP, ri.getResourceType());

-    }

-

-    @Test

-    public void testEquals() {

-        ResourceInstance ri1 = new ResourceInstance();

-        ResourceInstance ri2 = new ResourceInstance(ri1);

-        assertTrue(ri1.equals(ri2));

-        assertTrue(ri2.equals(ri1));

-

-        ri1.setResourceInstanceName("instance");

-        ri1.setResourceName("resource");

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceVersion("0.0.0");

-        ri1.setResourceType(ResourceType.VL);

-        ri2 = new ResourceInstance(ri1);

-        assertTrue(ri1.equals(ri2));

-        assertTrue(ri2.equals(ri1));

-    }

-

-    @Test

-    public void testToString() {

-        ResourceInstance ri1 = new ResourceInstance();

-        ResourceInstance ri2 = new ResourceInstance(ri1);

-        assertEquals(ri1.toString(), ri2.toString());

-

-        ri1.setResourceInstanceName("instance");

-        ri1.setResourceName("resource");

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceVersion("0.0.0");

-        ri1.setResourceType(ResourceType.VL);

-        ri2 = new ResourceInstance(ri1);

-        assertEquals(ri1.toString(), ri2.toString());

-    }

-

-    @Test

-    public void testHashCode() {

-        ResourceInstance ri1 = new ResourceInstance();

-        ResourceInstance ri2 = new ResourceInstance(ri1);

-        assertEquals(ri1.hashCode(), ri2.hashCode());

-

-        ri1.setResourceInstanceName("instance");

-        ri1.setResourceName("resource");

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceInvariantUUID(UUID.randomUUID());

-        ri1.setResourceVersion("0.0.0");

-        ri1.setResourceType(ResourceType.VL);

-        ri2 = new ResourceInstance(ri1);

-        assertEquals(ri1.hashCode(), ri2.hashCode());

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestResourceInstance {
+
+    @Test
+    public void testConstructors() {
+        ResourceInstance ri = new ResourceInstance();
+        assertEquals(null, ri.getResourceInstanceName());
+        assertEquals(null, ri.getResourceUUID());
+        assertEquals(null, ri.getResourceInvariantUUID());
+        assertEquals(null, ri.getResourceName());
+        assertEquals(null, ri.getResourceType());
+        assertEquals(null, ri.getResourceVersion());
+
+        ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);
+        assertEquals(null, ri2.getResourceInstanceName());
+        assertEquals(null, ri2.getResourceUUID());
+        assertEquals(null, ri2.getResourceInvariantUUID());
+        assertEquals(null, ri2.getResourceName());
+        assertEquals(null, ri2.getResourceType());
+        assertEquals(null, ri2.getResourceVersion());
+
+        ri2 = new ResourceInstance(ri);
+        assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());
+        assertEquals(ri2.getResourceUUID(), ri.getResourceUUID());
+        assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID());
+        assertEquals(ri2.getResourceName(), ri.getResourceName());
+        assertEquals(ri2.getResourceType(), ri.getResourceType());
+        assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());
+    }
+
+    @Test
+    public void testInstanceName() {
+        ResourceInstance ri = new ResourceInstance();
+        String name = "nameTestInstance";
+        ri.setResourceInstanceName(name);;
+        assertEquals(name, ri.getResourceInstanceName());
+    }
+
+    @Test
+    public void testUuid() {
+        ResourceInstance ri = new ResourceInstance();
+        UUID uuid = UUID.randomUUID();
+        ri.setResourceUUID(uuid);
+        assertEquals(uuid, ri.getResourceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        ResourceInstance ri = new ResourceInstance();
+        UUID uuid = UUID.randomUUID();
+        ri.setResourceInvariantUUID(uuid);
+        assertEquals(uuid, ri.getResourceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        ResourceInstance ri = new ResourceInstance();
+        String name = "nameTest";
+        ri.setResourceName(name);
+        assertEquals(name, ri.getResourceName());
+    }
+
+    @Test
+    public void testVersion() {
+        ResourceInstance ri = new ResourceInstance();
+        String version = "versionTest";
+        ri.setResourceVersion(version);
+        assertEquals(version, ri.getResourceVersion());
+    }
+
+    @Test
+    public void testType() {
+        ResourceInstance ri = new ResourceInstance();
+        ri.setResourceType(ResourceType.CP);
+        assertEquals(ResourceType.CP, ri.getResourceType());
+    }
+
+    @Test
+    public void testEquals() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertTrue(ri1.equals(ri2));
+        assertTrue(ri2.equals(ri1));
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertTrue(ri1.equals(ri2));
+        assertTrue(ri2.equals(ri1));
+    }
+
+    @Test
+    public void testToString() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.toString(), ri2.toString());
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.toString(), ri2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.hashCode(), ri2.hashCode());
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.hashCode(), ri2.hashCode());
+    }
+}
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java
index 4d1fa99e6..e5760236b 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java
@@ -1,137 +1,137 @@
-/*-

- * ============LICENSE_START=======================================================

- * sdc

- * ================================================================================

- * 

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.sdc;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertTrue;

-

-import java.util.UUID;

-

-import org.junit.Test;

-

-public class TestService {

-

-    @Test

-    public void testConstructors() {

-        Service svc = new Service();

-        assertEquals(null, svc.getServiceUUID());

-        assertEquals(null, svc.getServiceInvariantUUID());

-        assertEquals(null, svc.getServiceName());

-        assertEquals(null, svc.getServiceVersion());

-

-        UUID uuid = UUID.randomUUID();

-        svc = new Service(uuid);

-        assertEquals(uuid, svc.getServiceUUID());

-        assertEquals(null, svc.getServiceInvariantUUID());

-        assertEquals(null, svc.getServiceName());

-        assertEquals(null, svc.getServiceVersion());

-

-        String name = "constTest";

-        svc = new Service(name);

-        assertEquals(null, svc.getServiceUUID());

-        assertEquals(name, svc.getServiceName());

-        assertEquals(null, svc.getServiceInvariantUUID());

-        assertEquals(null, svc.getServiceVersion());

-

-        uuid = UUID.randomUUID();

-        UUID uuidInvariant = UUID.randomUUID();

-        name = "constTestUUID";

-        String version = "0.0.1";

-        svc = new Service(uuid, uuidInvariant, name, version);

-        assertEquals(uuid, svc.getServiceUUID());

-        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());

-        assertEquals(name, svc.getServiceName());

-        assertEquals(version, svc.getServiceVersion());

-

-        Service s2 = new Service(svc);

-        assertEquals(uuid, s2.getServiceUUID());

-        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());

-        assertEquals(name, s2.getServiceName());

-        assertEquals(version, s2.getServiceVersion());

-    }

-

-    @Test

-    public void testUuid() {

-        Service svc = new Service();

-        UUID uuid = UUID.randomUUID();

-        svc.setServiceUUID(uuid);

-        assertEquals(uuid, svc.getServiceUUID());

-    }

-

-    @Test

-    public void testInvariantUuid() {

-        Service svc = new Service();

-        UUID uuid = UUID.randomUUID();

-        svc.setServiceInvariantUUID(uuid);

-        assertEquals(uuid, svc.getServiceInvariantUUID());

-    }

-

-    @Test

-    public void testName() {

-        Service svc = new Service();

-        String name = "nameTest";

-        svc.setServiceName(name);

-        assertEquals(name, svc.getServiceName());

-    }

-

-    @Test

-    public void testVersion() {

-        Service svc = new Service();

-        String version = "versionTest";

-        svc.setServiceVersion(version);

-        assertEquals(version, svc.getServiceVersion());

-    }

-

-    @Test

-    public void testEquals() {

-        Service s1 = new Service();

-        Service s2 = new Service(s1);

-        assertTrue(s1.equals(s2));

-        assertTrue(s2.equals(s1));

-

-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");

-        s2 = new Service(s1);

-        assertTrue(s1.equals(s2));

-        assertTrue(s2.equals(s1));

-    }

-

-    @Test

-    public void testToString() {

-        Service s1 = new Service();

-        Service s2 = new Service(s1);

-        assertEquals(s1.toString(), s2.toString());

-

-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");

-        s2 = new Service(s1);

-        assertEquals(s1.toString(), s2.toString());

-    }

-

-    @Test

-    public void testHashCode() {

-        Service s1 = new Service();

-        Service s2 = new Service(s1);

-        assertEquals(s1.hashCode(), s2.hashCode());

-

-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");

-        s2 = new Service(s1);

-        assertEquals(s1.hashCode(), s2.hashCode());

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestService {
+
+    @Test
+    public void testConstructors() {
+        Service svc = new Service();
+        assertEquals(null, svc.getServiceUUID());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceName());
+        assertEquals(null, svc.getServiceVersion());
+
+        UUID uuid = UUID.randomUUID();
+        svc = new Service(uuid);
+        assertEquals(uuid, svc.getServiceUUID());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceName());
+        assertEquals(null, svc.getServiceVersion());
+
+        String name = "constTest";
+        svc = new Service(name);
+        assertEquals(null, svc.getServiceUUID());
+        assertEquals(name, svc.getServiceName());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceVersion());
+
+        uuid = UUID.randomUUID();
+        UUID uuidInvariant = UUID.randomUUID();
+        name = "constTestUUID";
+        String version = "0.0.1";
+        svc = new Service(uuid, uuidInvariant, name, version);
+        assertEquals(uuid, svc.getServiceUUID());
+        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());
+        assertEquals(name, svc.getServiceName());
+        assertEquals(version, svc.getServiceVersion());
+
+        Service s2 = new Service(svc);
+        assertEquals(uuid, s2.getServiceUUID());
+        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());
+        assertEquals(name, s2.getServiceName());
+        assertEquals(version, s2.getServiceVersion());
+    }
+
+    @Test
+    public void testUuid() {
+        Service svc = new Service();
+        UUID uuid = UUID.randomUUID();
+        svc.setServiceUUID(uuid);
+        assertEquals(uuid, svc.getServiceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        Service svc = new Service();
+        UUID uuid = UUID.randomUUID();
+        svc.setServiceInvariantUUID(uuid);
+        assertEquals(uuid, svc.getServiceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        Service svc = new Service();
+        String name = "nameTest";
+        svc.setServiceName(name);
+        assertEquals(name, svc.getServiceName());
+    }
+
+    @Test
+    public void testVersion() {
+        Service svc = new Service();
+        String version = "versionTest";
+        svc.setServiceVersion(version);
+        assertEquals(version, svc.getServiceVersion());
+    }
+
+    @Test
+    public void testEquals() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertTrue(s1.equals(s2));
+        assertTrue(s2.equals(s1));
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertTrue(s1.equals(s2));
+        assertTrue(s2.equals(s1));
+    }
+
+    @Test
+    public void testToString() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertEquals(s1.toString(), s2.toString());
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertEquals(s1.toString(), s2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertEquals(s1.hashCode(), s2.hashCode());
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertEquals(s1.hashCode(), s2.hashCode());
+    }
+}
diff --git a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java
index 06004456b..5ee4a9de8 100644
--- a/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java
+++ b/controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java
@@ -1,170 +1,170 @@
-/*-

- * ============LICENSE_START=======================================================

- * sdc

- * ================================================================================

- * 

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.sdc;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertTrue;

-

-import java.util.UUID;

-

-import org.junit.Test;

-

-public class TestServiceInstance {

-

-    @Test

-    public void testConstructors() {

-        ServiceInstance si = new ServiceInstance();

-        assertEquals(null, si.getServiceInstanceName());

-        assertEquals(null, si.getServiceUUID());

-        assertEquals(null, si.getServiceInstanceUUID());

-        assertEquals(null, si.getServiceName());

-        assertEquals(null, si.getPersonaModelUUID());

-        assertEquals(null, si.getWidgetModelUUID());

-        assertEquals(null, si.getWidgetModelVersion());

-

-        ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);

-        assertEquals(null, si2.getServiceInstanceName());

-        assertEquals(null, si2.getServiceUUID());

-        assertEquals(null, si2.getServiceInstanceUUID());

-        assertEquals(null, si2.getServiceName());

-        assertEquals(null, si2.getPersonaModelUUID());

-        assertEquals(null, si2.getWidgetModelUUID());

-        assertEquals(null, si2.getWidgetModelVersion());

-

-        si2 = new ServiceInstance(si);

-        assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());

-        assertEquals(si2.getServiceUUID(), si.getServiceUUID());

-        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());

-        assertEquals(si2.getServiceName(), si.getServiceName());

-        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());

-        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());

-        assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());

-    }

-

-    @Test

-    public void testInstanceName() {

-        ServiceInstance si = new ServiceInstance();

-        String name = "nameTestInstance";

-        si.setServiceInstanceName(name);;

-        assertEquals(name, si.getServiceInstanceName());

-    }

-

-    @Test

-    public void testUuid() {

-        ServiceInstance si = new ServiceInstance();

-        UUID uuid = UUID.randomUUID();

-        si.setServiceUUID(uuid);

-        assertEquals(uuid, si.getServiceUUID());

-    }

-

-    @Test

-    public void testInstanceUuid() {

-        ServiceInstance si = new ServiceInstance();

-        UUID uuid = UUID.randomUUID();

-        si.setServiceInstanceUUID(uuid);

-        assertEquals(uuid, si.getServiceInstanceUUID());

-    }

-

-    @Test

-    public void testName() {

-        ServiceInstance si = new ServiceInstance();

-        String name = "nameTest";

-        si.setServiceName(name);

-        assertEquals(name, si.getServiceName());

-    }

-

-    @Test

-    public void testPersonaModelUuid() {

-        ServiceInstance si = new ServiceInstance();

-        UUID uuid = UUID.randomUUID();

-        si.setPersonaModelUUID(uuid);

-        assertEquals(uuid, si.getPersonaModelUUID());

-    }

-

-    @Test

-    public void testWidgetModelUuid() {

-        ServiceInstance si = new ServiceInstance();

-        UUID uuid = UUID.randomUUID();

-        si.setWidgetModelUUID(uuid);

-        assertEquals(uuid, si.getWidgetModelUUID());

-    }

-

-    @Test

-    public void testWidgetModelVersion() {

-        ServiceInstance si = new ServiceInstance();

-        String version = "2.2.2";

-        si.setWidgetModelVersion(version);;

-        assertEquals(version, si.getWidgetModelVersion());

-    }

-

-    @Test

-    public void testEquals() {

-        ServiceInstance si1 = new ServiceInstance();

-        ServiceInstance si2 = new ServiceInstance(si1);

-        assertTrue(si1.equals(si2));

-        assertTrue(si2.equals(si1));

-

-        si1.setServiceInstanceName("instance");

-        si1.setServiceName("service");

-        si1.setServiceInstanceUUID(UUID.randomUUID());

-        si1.setServiceUUID(UUID.randomUUID());

-        si1.setPersonaModelUUID(UUID.randomUUID());

-        si1.setWidgetModelUUID(UUID.randomUUID());

-        si1.setWidgetModelVersion("3.3.3");

-        si2 = new ServiceInstance(si1);

-        assertTrue(si1.equals(si2));

-        assertTrue(si2.equals(si1));

-    }

-

-    @Test

-    public void testToString() {

-        ServiceInstance si1 = new ServiceInstance();

-        ServiceInstance si2 = new ServiceInstance(si1);

-        assertEquals(si1.toString(), si2.toString());

-

-        si1.setServiceInstanceName("instance");

-        si1.setServiceName("service");

-        si1.setServiceInstanceUUID(UUID.randomUUID());

-        si1.setServiceUUID(UUID.randomUUID());

-        si1.setPersonaModelUUID(UUID.randomUUID());

-        si1.setWidgetModelUUID(UUID.randomUUID());

-        si1.setWidgetModelVersion("3.3.3");

-        si2 = new ServiceInstance(si1);

-        assertEquals(si1.toString(), si2.toString());

-    }

-

-    @Test

-    public void testHashCode() {

-        ServiceInstance si1 = new ServiceInstance();

-        ServiceInstance si2 = new ServiceInstance(si1);

-        assertEquals(si1.hashCode(), si2.hashCode());

-

-        si1.setServiceInstanceName("instance");

-        si1.setServiceName("service");

-        si1.setServiceInstanceUUID(UUID.randomUUID());

-        si1.setServiceUUID(UUID.randomUUID());

-        si1.setPersonaModelUUID(UUID.randomUUID());

-        si1.setWidgetModelUUID(UUID.randomUUID());

-        si1.setWidgetModelVersion("3.3.3");

-        si2 = new ServiceInstance(si1);

-        assertEquals(si1.hashCode(), si2.hashCode());

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestServiceInstance {
+
+    @Test
+    public void testConstructors() {
+        ServiceInstance si = new ServiceInstance();
+        assertEquals(null, si.getServiceInstanceName());
+        assertEquals(null, si.getServiceUUID());
+        assertEquals(null, si.getServiceInstanceUUID());
+        assertEquals(null, si.getServiceName());
+        assertEquals(null, si.getPersonaModelUUID());
+        assertEquals(null, si.getWidgetModelUUID());
+        assertEquals(null, si.getWidgetModelVersion());
+
+        ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);
+        assertEquals(null, si2.getServiceInstanceName());
+        assertEquals(null, si2.getServiceUUID());
+        assertEquals(null, si2.getServiceInstanceUUID());
+        assertEquals(null, si2.getServiceName());
+        assertEquals(null, si2.getPersonaModelUUID());
+        assertEquals(null, si2.getWidgetModelUUID());
+        assertEquals(null, si2.getWidgetModelVersion());
+
+        si2 = new ServiceInstance(si);
+        assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());
+        assertEquals(si2.getServiceUUID(), si.getServiceUUID());
+        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());
+        assertEquals(si2.getServiceName(), si.getServiceName());
+        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());
+        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());
+        assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());
+    }
+
+    @Test
+    public void testInstanceName() {
+        ServiceInstance si = new ServiceInstance();
+        String name = "nameTestInstance";
+        si.setServiceInstanceName(name);;
+        assertEquals(name, si.getServiceInstanceName());
+    }
+
+    @Test
+    public void testUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setServiceUUID(uuid);
+        assertEquals(uuid, si.getServiceUUID());
+    }
+
+    @Test
+    public void testInstanceUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setServiceInstanceUUID(uuid);
+        assertEquals(uuid, si.getServiceInstanceUUID());
+    }
+
+    @Test
+    public void testName() {
+        ServiceInstance si = new ServiceInstance();
+        String name = "nameTest";
+        si.setServiceName(name);
+        assertEquals(name, si.getServiceName());
+    }
+
+    @Test
+    public void testPersonaModelUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setPersonaModelUUID(uuid);
+        assertEquals(uuid, si.getPersonaModelUUID());
+    }
+
+    @Test
+    public void testWidgetModelUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setWidgetModelUUID(uuid);
+        assertEquals(uuid, si.getWidgetModelUUID());
+    }
+
+    @Test
+    public void testWidgetModelVersion() {
+        ServiceInstance si = new ServiceInstance();
+        String version = "2.2.2";
+        si.setWidgetModelVersion(version);;
+        assertEquals(version, si.getWidgetModelVersion());
+    }
+
+    @Test
+    public void testEquals() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertTrue(si1.equals(si2));
+        assertTrue(si2.equals(si1));
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertTrue(si1.equals(si2));
+        assertTrue(si2.equals(si1));
+    }
+
+    @Test
+    public void testToString() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertEquals(si1.toString(), si2.toString());
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertEquals(si1.toString(), si2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertEquals(si1.hashCode(), si2.hashCode());
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertEquals(si1.hashCode(), si2.hashCode());
+    }
+}