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=1c951961691875a4c8dcd9d1dd7e624f53e0086f;hb=6309ef454e6960d95d13534645e1f15904de6862;hp=22243ae480995a71a4bf946e0616484b2e761ace;hpb=68179e83a94ad2ea2b9ec325c8fa2f9b7c765d04;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 22243ae4..1c951961 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 @@ -36,7 +36,6 @@ 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; import org.onap.aaf.cadi.util.Vars; import aaf.v2_0.Error; @@ -223,10 +222,10 @@ public class Mapper1_0 implements Mapper { data.mechid = trim(arti.getMechid()); data.machine = trim(arti.getMachine()); if(arti.getType()!=null) { - Set ss = data.type(true); - for(String t : arti.getType()) { - ss.add(trim(t)); - } + Set ss = data.type(true); + for(String t : arti.getType()) { + ss.add(trim(t)); + } } data.ca = trim(arti.getCa()); data.dir = trim(arti.getDir()); @@ -240,9 +239,9 @@ public class Mapper1_0 implements Mapper { data.sponsor = (arti.getSponsor()); if(arti.getSans()!=null) { Set ls = data.sans(true); - for(String t : arti.getSans()) { - ls.add(trim(t)); - } + for(String t : arti.getSans()) { + ls.add(trim(t)); + } } data.expires = null; ladd.add(data); @@ -266,13 +265,13 @@ public class Mapper1_0 implements Mapper { a.setCa(trim(arti.ca)); a.setDir(trim(arti.dir)); for(String t : arti.type(false)) { - a.getType().add(trim(t)); + a.getType().add(trim(t)); } a.setOsUser(trim(arti.os_user)); a.setRenewDays(arti.renewDays); a.setNotification(trim(arti.notify)); for(String t : arti.sans(false)) { - a.getSans().add(trim(t)); + a.getSans().add(trim(t)); } artis.getArtifact().add(a); } @@ -285,10 +284,10 @@ public class Mapper1_0 implements Mapper { private String trim(String s) { - if(s==null) { - return s; - } else { - return s.trim(); - } - } + if(s==null) { + return s; + } else { + return s.trim(); + } + } } \ No newline at end of file