* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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;
public class Mapper1_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
-
+
@Override
public Class<?> getClass(API api) {
switch(api) {
// Certs in keystore versus Truststore. Separate in Version 2_0
if (cin.trustCAs()!=null) {
for (String c : cin.trustCAs()) {
- if (c!=null) {
- if (!cout.getCerts().contains(c)) {
- cout.getCerts().add(c);
- }
- }
+ if ((c!=null)&&(!cout.getCerts().contains(c))) {
+ cout.getCerts().add(c);
+ }
}
}
if (cin.notes()!=null) {
data.mechid = trim(arti.getMechid());
data.machine = trim(arti.getMachine());
if(arti.getType()!=null) {
- Set<String> ss = data.type(true);
- for(String t : arti.getType()) {
- ss.add(trim(t));
- }
+ Set<String> ss = data.type(true);
+ for(String t : arti.getType()) {
+ ss.add(trim(t));
+ }
}
data.ca = trim(arti.getCa());
data.dir = trim(arti.getDir());
data.ns = trim(arti.getNs());
data.renewDays = arti.getRenewDays();
data.notify = trim(arti.getNotification());
-
+
// Ignored on way in for create/update
data.sponsor = (arti.getSponsor());
if(arti.getSans()!=null) {
Set<String> 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);
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);
}
return Result.err(lArtiDAO);
}
}
-
-
+
+
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