AT&T 1712 and 1802 release code

[so.git] / common / src / main / java / org / openecomp / mso / client / aai / entities / CustomQuery.java

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java b/common/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java
similarity index 72%
rename from bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java
rename to common/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java
index fab8d64..3d014b8 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java
+++ b/common/src/main/java/org/openecomp/mso/client/aai/entities/CustomQuery.java
@@ -21,15 +21,20 @@
 package org.openecomp.mso.client.aai.entities;
 
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
 
+import org.openecomp.mso.client.aai.entities.uri.AAIResourceUri;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonInclude(JsonInclude.Include.NON_NULL) 
 public class CustomQuery {
        
-       List<String> start;
+       private List<String> start;
+       private String query;
+       private String gremlin;
        
        public String getGremlin() {
                return gremlin;
@@ -38,11 +43,14 @@ public class CustomQuery {
        public void setGremlin(String gremlin) {
                this.gremlin = gremlin;
        }
-       String query;
-       String gremlin;
+
+       
+       public CustomQuery(List<AAIResourceUri> start){
+               this.setStart(start);
+       }
        
-       public CustomQuery(List<String>start, String query){
-               this.start=start;
+       public CustomQuery(List<AAIResourceUri> start, String query){
+               this.setStart(start);
                this.query= "query/" + query;
        }
        
@@ -54,8 +62,8 @@ public class CustomQuery {
                return start;
        }
 
-       public void setStart(List<String> start) {
-               this.start = start;
+       public void setStart(List<AAIResourceUri> start) {
+               this.start = this.mapUris(start);
        }
 
        public String getQuery() {
@@ -65,4 +73,10 @@ public class CustomQuery {
        public void setQuery(String query) {
                this.query = query;
        }
+       
+       private List<String> mapUris(List<AAIResourceUri> uris) {
+               final List<String> result = new ArrayList<>();
+               uris.stream().map(item -> item.build().toString()).forEach(result::add);
+               return result;
+       }
 }