X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cmd%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcmd%2Fuser%2FCred.java;h=1a410088b2128947aaa70e5379a0570d4ae1a241;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=d7431be1827f5814b915133f8d7a2461cd63d684;hpb=321dce367d74092a0ba09930c3aa526abdbd5da8;p=aaf%2Fauthz.git diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java index d7431be1..1a410088 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java @@ -9,9 +9,9 @@ * 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. @@ -44,7 +44,7 @@ public class Cred extends Cmd { public static final String ATTEMPT_FAILED_SPECIFICS_WITHELD = "Attempt Failed. Specifics witheld."; private static final String CRED_PATH = "/authn/cred"; private static final String[] options = {"add","del","reset","extend"/*,"clean"*/}; - private ErrMessage em; + private ErrMessage em; public Cred(User parent) throws APIException { super(parent,"cred", new Param(optionsToString(options),true), @@ -72,7 +72,7 @@ public class Cred extends Cmd { if (args.length>idx) { cr.setEntry(args[idx]); } - + // Set Start/End commands setStartEnd(cr); Integer ret = same(new Retryable() { @@ -83,8 +83,8 @@ public class Cred extends Cmd { switch(option) { case 0: fp = client.create( - CRED_PATH, - getDF(CredRequest.class), + CRED_PATH, + getDF(CredRequest.class), cr ); verb = "Added Credential ["; @@ -126,18 +126,18 @@ public class Cred extends Cmd { } else if (fp.code()==202) { pw().println("Credential Action Accepted, but requires Approvals before actualizing"); } else if (fp.code()==300 || fp.code()==406) { - Error err = em.getError(fp); - String text = err.getText(); - List vars = err.getVariables(); - - // IMPORTANT! We do this backward, because it is looking for string - // %1 or %13. If we replace %1 first, that messes up %13 - for(int i=vars.size()-1;i>0;--i) { - text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + vars.get(i)); - } + Error err = em.getError(fp); + String text = err.getText(); + List vars = err.getVariables(); + + // IMPORTANT! We do this backward, because it is looking for string + // %1 or %13. If we replace %1 first, that messes up %13 + for(int i=vars.size()-1;i>0;--i) { + text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + vars.get(i)); + } - text = text.replace("%1",vars.get(0)); - pw().println(text); + text = text.replace("%1",vars.get(0)); + pw().println(text); } else if (fp.code()==406 && option==1) { pw().println("You cannot delete this Credential"); } else if (fp.code()==409 && option==0) { @@ -153,7 +153,7 @@ public class Cred extends Cmd { } return ret; } - + @Override public void detailedHelp(int indentVar, StringBuilder sb) { int indent = indentVar; @@ -169,7 +169,7 @@ public class Cred extends Cmd { sb.append('\n'); detailLine(sb,indent,"NOTE: AAF does support multiple creds with the same ID. Check with your org if you"); detailLine(sb,indent+2,"have this implemented. (For example, this is implemented for MechIDs at AT&T)"); - sb.append('\n'); + sb.append('\n'); detailLine(sb,indent,"*NOTE: com.att.csp is a reserved Domain for Global Sign On"); detailLine(sb,indent,"Delegates can be listed by the User or by the Delegate");