diff options
Diffstat (limited to 'auth/auth-cmd')
4 files changed, 20 insertions, 10 deletions
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java index eb4e6bb8..a1c83ee0 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java @@ -3,6 +3,8 @@ * org.onap.aaf * =========================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2018 IBM. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +25,6 @@ package org.onap.aaf.auth.cmd.mgmt; import org.onap.aaf.auth.cmd.AAFcli; import org.onap.aaf.auth.cmd.BaseCmd; -import org.onap.aaf.misc.env.APIException; public class Mgmt extends BaseCmd<Mgmt> { public Mgmt(AAFcli aafcli) { diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/Attrib.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/Attrib.java index 77b14456..feade450 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/Attrib.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/Attrib.java @@ -3,6 +3,8 @@ * org.onap.aaf * =========================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2018 IBM. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +35,7 @@ import org.onap.aaf.cadi.client.Retryable; import org.onap.aaf.misc.env.APIException; public class Attrib extends BaseCmd<NS> { - private final static String[] options = {"add","upd","del"}; + private static final String[] options = {"add","upd","del"}; private String authzString = "/authz/ns/"; private String atrributeString = "/attrib/"; diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/ListUsers.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/ListUsers.java index 4bd3aed4..ba2f88dc 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/ListUsers.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/ListUsers.java @@ -3,6 +3,8 @@ * org.onap.aaf * =========================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2018 IBM. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,12 +33,7 @@ import aaf.v2_0.Nss; import aaf.v2_0.Users.User; public class ListUsers extends BaseCmd<List> { - - public ListUsers(List parent) { - super(parent,"user"); - cmds.add(new ListUsersWithPerm(this)); - cmds.add(new ListUsersInRole(this)); - } + private static final Future<Nss> dummy = new Future<Nss>(){ @Override @@ -59,6 +56,15 @@ public class ListUsers extends BaseCmd<List> { return null; } }; + + private static final String uformat = "%s%-50s expires:%02d/%02d/%04d\n"; + + public ListUsers(List parent) { + super(parent,"user"); + cmds.add(new ListUsersWithPerm(this)); + cmds.add(new ListUsersInRole(this)); + } + public void report(String header, String ns) { ((List)parent).report(dummy, header,ns); } @@ -67,7 +73,6 @@ public class ListUsers extends BaseCmd<List> { pw().println(subHead); } - private static final String uformat = "%s%-50s expires:%02d/%02d/%04d\n"; public void report(String prefix, User u) { XMLGregorianCalendar xgc = u.getExpires(); pw().format(uformat,prefix,u.getId(),xgc.getMonth()+1,xgc.getDay(),xgc.getYear()); diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/CreateDelete.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/CreateDelete.java index 320bac5b..e44185ec 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/CreateDelete.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/role/CreateDelete.java @@ -3,6 +3,8 @@ * org.onap.aaf * =========================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2018 IBM. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +43,7 @@ import aaf.v2_0.RoleRequest; */ public class CreateDelete extends Cmd { private static final String ROLE_PATH = "/authz/role"; - private final static String[] options = {"create","delete"}; + private static final String[] options = {"create","delete"}; public CreateDelete(Role parent) { super(parent,null, new Param(optionsToString(options),true), |