1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java b/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
index a6c404e..0e98da8 100644
--- a/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
+++ b/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
@@ -19,11 +19,11 @@
  */
 package org.onap.aai.graphgraph.velocity;
 
-import java.util.UUID;
-
 import org.eclipse.jetty.util.StringUtil;
 import org.onap.aai.graphgraph.dto.Property;
 
+import java.util.UUID;
+
 public class VelocityEntityProperty extends Property {
 
     private final VelocityEntity entity;
@@ -34,7 +34,7 @@ public class VelocityEntityProperty extends Property {
         super(propertyName, propertyValue);
         this.description = propertyDescription;
         this.entity = entity;
-        propertyId = entity != null ? entity.getRandomId() : UUID.randomUUID().toString();
+        propertyId = VelocityId.getRandomId();
     }
 
     public String getEntityId() {
@@ -69,4 +69,5 @@ public class VelocityEntityProperty extends Property {
     public String toString() {
         return "VelocityEntityProperty{" + " name=" + getPropertyName() + " description=" + getDescription() + " type=" + getPropertyValue() + '}';
     }
+
 }