Merge "Updated fields on sniro request"

2 files changed, 18 insertions, 18 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java
index e83c27c400..92b4e211d5 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java
@@ -404,9 +404,9 @@ public class SniroHomingV2 {
 			for(Candidate c:required){
 				org.onap.so.client.sniro.beans.Candidate can = new org.onap.so.client.sniro.beans.Candidate();
 				org.onap.so.client.sniro.beans.CandidateType type = new org.onap.so.client.sniro.beans.CandidateType();
-				type.setName(c.getCandidateType().getName());
-				can.setCandidateType(type);
-				can.setCandidates(c.getCandidates());
+				type.setName(c.getIdentifierType().getName());
+				can.setIdentifierType(type);
+				can.setIdentifiers(c.getIdentifiers());
 				can.setCloudOwner(c.getCloudOwner());
 				cans.add(can);
 			}
@@ -417,9 +417,9 @@ public class SniroHomingV2 {
 			for(Candidate c:excluded){
 				org.onap.so.client.sniro.beans.Candidate can = new org.onap.so.client.sniro.beans.Candidate();
 				org.onap.so.client.sniro.beans.CandidateType type = new org.onap.so.client.sniro.beans.CandidateType();
-				type.setName(c.getCandidateType().getName());
-				can.setCandidateType(type);
-				can.setCandidates(c.getCandidates());
+				type.setName(c.getIdentifierType().getName());
+				can.setIdentifierType(type);
+				can.setIdentifiers(c.getIdentifiers());
 				can.setCloudOwner(c.getCloudOwner());
 				cans.add(can);
 			}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/beans/Candidate.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/beans/Candidate.java
index b42636b078..1f8c56e727 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/beans/Candidate.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/beans/Candidate.java
@@ -29,28 +29,28 @@ public class Candidate implements Serializable{
 
 	private static final long serialVersionUID = -5474502255533410907L;
 
-	@JsonProperty("candidateType")
-	private CandidateType candidateType;
-	@JsonProperty("candidates")
-	private List<String> candidates;
+	@JsonProperty("identifierType")
+	private CandidateType identifierType;
+	@JsonProperty("identifiers")
+	private List<String> identifiers;
 	@JsonProperty("cloudOwner")
 	private String cloudOwner;
 
 
-	public CandidateType getCandidateType(){
-		return candidateType;
+	public CandidateType getIdentifierType(){
+		return identifierType;
 	}
 
-	public void setCandidateType(CandidateType candidateType){
-		this.candidateType = candidateType;
+	public void setIdentifierType(CandidateType identifierType){
+		this.identifierType = identifierType;
 	}
 
-	public List<String> getCandidates(){
-		return candidates;
+	public List<String> getIdentifiers(){
+		return identifiers;
 	}
 
-	public void setCandidates(List<String> candidates){
-		this.candidates = candidates;
+	public void setIdentifiers(List<String> identifiers){
+		this.identifiers = identifiers;
 	}
 
 	public String getCloudOwner(){