Revert some UUID variable names

Unfortunately, some code uses "new Yaml(...)" to decode policies and
"Yaml" doesn't understand GSON annotations.  As a result, this means
that the field names must match the serialized name, thus they must
continue to end with "UUID" instead of "Uuid".

Issue-ID: POLICY-1910
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I97c2f5c7e59b758b13a1dbcceed709b2e2e064a2

2 files changed, 15 insertions, 32 deletions

diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java
index 765eeec54..d372f1221 100644
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java
+++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java
@@ -21,11 +21,8 @@
 
 package org.onap.policy.sdc;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.UUID;
-
 import lombok.Data;
 
 @Data
@@ -33,12 +30,8 @@ public class Service implements Serializable {
 
     private static final long serialVersionUID = -1249276698549996806L;
 
-    @SerializedName("serviceUuid")
-    private UUID serviceUuid;
-
-    @SerializedName("serviceInvariantUuid")
-    private UUID serviceInvariantUuid;
-
+    private UUID serviceUUID;
+    private UUID serviceInvariantUUID;
     private String serviceName;
     private String serviceVersion;
 
@@ -47,7 +40,7 @@ public class Service implements Serializable {
     }
 
     public Service(UUID uuid) {
-        this.serviceUuid = uuid;
+        this.serviceUUID = uuid;
     }
 
     public Service(String name) {
@@ -63,8 +56,8 @@ public class Service implements Serializable {
      * @param version version
      */
     public Service(UUID uuid, UUID invariantUuid, String name, String version) {
-        this.serviceUuid = uuid;
-        this.serviceInvariantUuid = invariantUuid;
+        this.serviceUUID = uuid;
+        this.serviceInvariantUUID = invariantUuid;
         this.serviceName = name;
         this.serviceVersion = version;
     }
@@ -75,8 +68,8 @@ public class Service implements Serializable {
      * @param service copy object
      */
     public Service(Service service) {
-        this.serviceUuid = service.serviceUuid;
-        this.serviceInvariantUuid = service.serviceInvariantUuid;
+        this.serviceUUID = service.serviceUUID;
+        this.serviceInvariantUUID = service.serviceInvariantUUID;
         this.serviceName = service.serviceName;
         this.serviceVersion = service.serviceVersion;
     }
diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java
index 45e1dc56a..b476de20f 100644
--- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java
+++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java
@@ -21,11 +21,8 @@
 
 package org.onap.policy.sdc;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.UUID;
-
 import lombok.Data;
 
 @Data
@@ -33,17 +30,10 @@ public class ServiceInstance implements Serializable {
 
     private static final long serialVersionUID = 6285260780966679625L;
 
-    @SerializedName("personaModelUUID")
-    private UUID personaModelUuid;
-
-    @SerializedName("serviceUUID")
-    private UUID serviceUuid;
-
-    @SerializedName("serviceInstanceUUID")
-    private UUID serviceInstanceUuid;
-
-    @SerializedName("widgetModelUUID")
-    private UUID widgetModelUuid;
+    private UUID personaModelUUID;
+    private UUID serviceUUID;
+    private UUID serviceInstanceUUID;
+    private UUID widgetModelUUID;
 
     private String widgetModelVersion;
     private String serviceName;
@@ -62,10 +52,10 @@ public class ServiceInstance implements Serializable {
         if (instance == null) {
             return;
         }
-        this.personaModelUuid = instance.personaModelUuid;
-        this.serviceUuid = instance.serviceUuid;
-        this.serviceInstanceUuid = instance.serviceInstanceUuid;
-        this.widgetModelUuid = instance.widgetModelUuid;
+        this.personaModelUUID = instance.personaModelUUID;
+        this.serviceUUID = instance.serviceUUID;
+        this.serviceInstanceUUID = instance.serviceInstanceUUID;
+        this.widgetModelUUID = instance.widgetModelUUID;
         this.widgetModelVersion = instance.widgetModelVersion;
         this.serviceName = instance.serviceName;
         this.serviceInstanceName = instance.serviceInstanceName;