X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=champ-lib%2Fchamp-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fchampcore%2Fmodel%2FChampRelationship.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fchamp%2Fmodel%2FChampRelationship.java;h=2d7f033b76529d87864662978858f21aa7e0263f;hb=c74f7b13b573386e70c10721fc391624ee792ed6;hp=2b4e61b4bd50156c11775434dbf9dc92851d9a18;hpb=9fc28cff11a4b570618c0f533ce9de6209a5dd0c;p=aai%2Fchamp.git

diff --git a/src/main/java/org/onap/aai/champ/model/ChampRelationship.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java
similarity index 89%
rename from src/main/java/org/onap/aai/champ/model/ChampRelationship.java
rename to champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java
index 2b4e61b..2d7f033 100644
--- a/src/main/java/org/onap/aai/champ/model/ChampRelationship.java
+++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java
@@ -19,33 +19,31 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.onap.aai.champ.model;
+package org.onap.aai.champcore.model;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.onap.aai.champ.model.fluent.relationship.CreateChampRelationshipable;
-import org.onap.aai.champ.model.fluent.relationship.impl.CreateChampRelationshipableImpl;
-
 import java.util.Optional;
 
+import org.onap.aai.champcore.model.fluent.relationship.CreateChampRelationshipable;
+import org.onap.aai.champcore.model.fluent.relationship.impl.CreateChampRelationshipableImpl;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public final class ChampRelationship implements ChampElement {
-	private final String type; //AKA edge label
-	private final Optional<Object> key;
-	private final Map<String, Object> properties;
-	private final ChampObject source;
-	private final ChampObject target;
+	private String type; //AKA edge label
+	private  Optional<Object> key;
+	private  Map<String, Object> properties;
+	private  ChampObject source;
+	private  ChampObject target;
 
 	public static CreateChampRelationshipable create() {
 		return new CreateChampRelationshipableImpl();
 	}
 
-	private ChampRelationship() { //Not instantiable
-		throw new RuntimeException("Cannot call ChampRelationship() constructor");
+	public ChampRelationship() { //Not instantiable
 	}
 	
 	private ChampRelationship(Builder builder) {
@@ -58,12 +56,16 @@ public final class ChampRelationship implements ChampElement {
 
 	@JsonIgnore
 	public Optional<Object> getKey() {
-		return key;
+		if (key == null) {
+			return Optional.empty ();
+		} else {
+			return key;
+		}
 	}
 
     @JsonProperty("key")
-    public Object getKeyValue() {
-      return key.orElse("");      
+    public String getKeyValue() {
+      return (getKey().isPresent() ? getKey().get() : "").toString();
     }
 	   
 	public ChampObject getSource() {