diff options
Diffstat (limited to 'auth')
3 files changed, 19 insertions, 8 deletions
diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java index e63bc52a..43a88aa5 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java @@ -391,6 +391,14 @@ public class Question { lookup = nsd.parent; if (type.type == nsd.type) { return Result.ok(nsd); + } else { + int dot = str.lastIndexOf('.'); + + if (dot < 0) { + return Result.err(Status.ERR_NsNotFound, "No Namespace for [%s]", str); + } else { + return deriveFirstNsForType(trans, str.substring(0, dot),type); + } } } else { return Result.err(Status.ERR_NsNotFound,"There is no valid Company Namespace for %s",str); diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java index ad7f10eb..3e2fb816 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java @@ -41,7 +41,8 @@ public class CertReq { // These may be null public String sponsor; - public XMLGregorianCalendar start, end; + public XMLGregorianCalendar start; + public XMLGregorianCalendar end; public CSRMeta getCSRMeta() throws CertException { return BCFactory.createCSRMeta(certAuthority, mechid, sponsor,fqdns); diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java index db59df0a..237e3c9e 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Log.java @@ -35,18 +35,18 @@ import org.onap.aaf.cadi.config.Config; import org.onap.aaf.misc.env.APIException; public class Log extends BaseCmd<Mgmt> { - private final static String[] options = {"add","del"}; + private static final String[] options = {"add","del"}; - public Log(Mgmt mgmt) throws APIException { + public Log(Mgmt mgmt) { super(mgmt, "log", new Param(optionsToString(options),true), new Param("id[,id]*",true)); } @Override - public int _exec(int _idx, String ... args) throws CadiException, APIException, LocatorException { + public int _exec(int idxValue, String ... args) throws CadiException, APIException, LocatorException { int rv=409; - int idx = _idx; + int idx = idxValue; final int option = whichOption(options, args[idx++]); for (String name : args[idx++].split(COMMA)) { @@ -83,7 +83,9 @@ public class Log extends BaseCmd<Mgmt> { pw().println(msg + " Special Log for " + fname + " on " + client); rv=200; } else { - if (rv==409)rv = fp.code(); + if (rv==409) { + rv = fp.code(); + }; error(fp); } return rv; @@ -96,8 +98,8 @@ public class Log extends BaseCmd<Mgmt> { } @Override - public void detailedHelp(int _indent, StringBuilder sb) { - int indent = _indent; + public void detailedHelp(int indentValue, StringBuilder sb) { + int indent = indentValue; detailLine(sb,indent,"Clear the cache for certain tables"); indent+=2; detailLine(sb,indent,"name - name of table or 'all'"); |