summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2018-12-12 23:38:05 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-12 23:38:05 +0000
commit781ab3c11ca25212e76cb3c5f9671e867eaaac0a (patch)
tree72e7a2929730ecce6afd492b36533ef55d33ac31
parentadfe545fbfb2bf2279ed51137f8c86ca2fb35203 (diff)
parent7b90307ec5d72dc1170904f86a730e0f2eaff897 (diff)
Merge "Fixed Sonar issues in AAF_CM"
-rw-r--r--auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java23
1 files changed, 12 insertions, 11 deletions
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
index 15e298b7..689326e1 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
@@ -72,14 +72,14 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
private static final String USER_PERMS = "userPerms";
private static final Map<String,CA> certAuths = new TreeMap<>();
- public Facade1_0 facade1_0; // this is the default Facade
- public Facade1_0 facade1_0_XML; // this is the XML Facade
- public Map<String, Dated> cacheUser;
- public AAFAuthn<?> aafAuthn;
- public AAFLurPerm aafLurPerm;
- final public Cluster cluster;
+ public static Facade1_0 facade1_0; // this is the default Facade
+ public static Facade1_0 facade1_0_XML; // this is the XML Facade
+ public static Map<String, Dated> cacheUser;
+ public static AAFAuthn<?> aafAuthn;
+ public static AAFLurPerm aafLurPerm;
+ public final Cluster cluster;
public final LocateDAO locateDAO;
-
+ public static AuthzEnv envLog;
/**
* Construct AuthzAPI with all the Context Supporting Routes that Authz needs
@@ -96,8 +96,8 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
// Note: If you need both Authn and Authz construct the following:
aafAuthn = aafCon().newAuthn(aafLurPerm);
- String aaf_env = env.getProperty(Config.AAF_ENV);
- if (aaf_env==null) {
+ String aafEnv = env.getProperty(Config.AAF_ENV);
+ if (aafEnv==null) {
throw new APIException("aaf_env needs to be set");
}
@@ -133,7 +133,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
Object pinst[] = new Object[4];
pinst[0]=env;
pinst[1]= key.substring(idx+1);
- pinst[2]= aaf_env;
+ pinst[2]= aafEnv;
pinst[3] = multiParams;
CA ca = cons.newInstance(pinst);
certAuths.put(ca.getName(),ca);
@@ -228,6 +228,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
}
public static void main(final String[] args) {
+
try {
Log4JLogIt logIt = new Log4JLogIt(args, "cm");
PropAccess propAccess = new PropAccess(logIt,args);
@@ -236,7 +237,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
jss.start();
} catch (Exception e) {
- e.printStackTrace();
+ envLog.error().log(e);
}
}
}