X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fmapper%2FMapper1_0.java;h=c06734f4b5b5af864ae67d6e54ddeb3d6b4a4101;hb=c060284812fbbc18fcf22eb628c47c251505fe50;hp=16517c95453d2c11e1ba62f9ea2b11fec0fac848;hpb=2c0dd5c5136e249f63f1d3296063795cde30c399;p=aaf%2Fauthz.git

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
index 16517c95..c06734f4 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
@@ -31,8 +31,8 @@ import org.onap.aaf.auth.cm.data.CertReq;
 import org.onap.aaf.auth.cm.data.CertResp;
 import org.onap.aaf.auth.cm.validation.CertmanValidator;
 import org.onap.aaf.auth.dao.cass.ArtiDAO;
-import org.onap.aaf.auth.dao.cass.CertDAO;
 import org.onap.aaf.auth.dao.cass.ArtiDAO.Data;
+import org.onap.aaf.auth.dao.cass.CertDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.cadi.util.FQI;
@@ -108,7 +108,9 @@ public class Mapper1_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
 		if((value=cin.challenge())!=null) {
 			cout.setChallenge(value);
 		}
+		// In Version 1, Cert is always first
 		cout.getCerts().add(cin.asCertString());
+		// Follow with Trust Chain
 		if(cin.trustChain()!=null) {
 			for(String c : cin.trustChain()) {
 				if(c!=null) {
@@ -116,12 +118,15 @@ public class Mapper1_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
 				}
 			}
 		}
+
 		// Adding all the Certs in one response is a mistake.  Makes it very hard for Agent to setup
 		// Certs in keystore versus Truststore.  Separate in Version 2_0
 		if(cin.trustCAs()!=null) {
 			for(String c : cin.trustCAs()) {
 				if(c!=null) {
-					cout.getCerts().add(c);
+					if(!cout.getCerts().contains(c)) {
+						cout.getCerts().add(c);
+					}
 				}
 			}
 		}
@@ -138,7 +143,10 @@ public class Mapper1_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
 			}
 			cout.setNotes(sb.toString());
 		}
-		cout.getCaIssuerDNs().addAll(cin.caIssuerDNs());
+		List<String> caIssuerDNs = cout.getCaIssuerDNs();
+		for(String s : cin.caIssuerDNs()) {
+			caIssuerDNs.add(s);
+		}
 		cout.setEnv(cin.env());
 		return Result.ok(cout);