X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2FAAF_GUI.java;h=8492b85fa6082e93d3907926493516e72eb3edb0;hb=3cb19eb94fc06aed30bd3bca7178a7d1ba8c7183;hp=5d243e9b7381b71c82f90d0a811e9eb420046353;hpb=6dd9704640eb8cc8d6b4ccd266e40a3f6f589e75;p=aaf%2Fauthz.git

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
index 5d243e9b..8492b85f 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
@@ -103,7 +103,7 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
     public static final String AAF_GUI_COPYRIGHT = "aaf_gui_copyright";
     public static final String HTTP_SERVLET_REQUEST = "HTTP_SERVLET_REQUEST";
     public static final int TIMEOUT = 60000;
-    public static final String app = "AAF GUI";
+    public static final String APP = "AAF GUI";
 
     // AAF API
 
@@ -115,7 +115,7 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
     public final AAFConHttp aafCon;
     public final AAFLurPerm lur;
 
-    public final Slot slot_httpServletRequest;
+    public final Slot slotHttpServletRequest;
     protected final String deployedVersion;
     private StaticSlot sThemeWebPath;
     private StaticSlot sDefaultTheme;
@@ -132,12 +132,14 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
             env.put(sThemeWebPath,"theme");
         }
 
-        slot_httpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
-        deployedVersion = app_version;
+
+        slotHttpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
+        deployedVersion = appVersion;
+
 
         // Certificate Manager
-        String aaf_url_cm = env.getProperty(Config.AAF_URL_CM,Config.AAF_URL_CM_DEF);
-        cmCon =  new AAFConHttp(env.access(),aaf_url_cm);
+        String aafUrlCm = env.getProperty(Config.AAF_URL_CM,Config.AAF_URL_CM_DEF);
+        cmCon =  new AAFConHttp(env.access(),aafUrlCm);
         artifactsDF = env.newDataFactory(Artifacts.class);
         certInfoDF  = env.newDataFactory(CertInfo.class);
 
@@ -231,7 +233,6 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
         // WebContent Handler
         ///////////////////////
         CachingFileAccess<AuthzTrans> cfa = new CachingFileAccess<AuthzTrans>(env);
-        //route(env,GET,"/"+env.get(sThemeWebPath)+"/:key*", cfa);
         route(env,GET,"/theme/:key*", cfa);
         ///////////////////////
         aafCon = aafCon();
@@ -254,7 +255,7 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
     }
 
     public<RET> RET cmClientAsUser(TaggedPrincipal p,Retryable<RET> retryable) throws APIException, LocatorException, CadiException  {
-            return cmCon.hman().best(new HTransferSS(p,app, aafCon.securityInfo()), retryable);
+            return cmCon.hman().best(new HTransferSS(p, APP, aafCon.securityInfo()), retryable);
     }
 
     @Override