X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fserver%2FAbsService.java;h=0e770e5fc579c8bacdff42a4c19636d8bf50ff56;hb=HEAD;hp=9ece4847dbc6f6d425a1bb7c71e718b7e8e24137;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
index 9ece4847..0e770e5f 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
@@ -7,9 +7,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.
@@ -25,7 +25,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
 import javax.servlet.Filter;
 
 import org.onap.aaf.auth.common.Define;
@@ -52,32 +52,32 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
     public final ENV env;
     private AAFConHttp aafCon;
 
-    public final String app_name;
-    public final String app_version;
-    public final String ROOT_NS;
-    
+    public final String appName;
+    public final String appVersion;
+    public final String rootNs;
+
     public AbsService(final Access access, final ENV env) throws CadiException {
         Define.set(access);
-        ROOT_NS = Define.ROOT_NS();
+        rootNs = Define.ROOT_NS();
         this.access = access;
         this.env = env;
 
-        String str = access.getProperty(Config.AAF_LOCATOR_NAMES, null);
+        String str = access.getProperty(Config.AAF_LOCATOR_ENTRIES, null);
         String[] scomp = Split.splitTrim(',', str);
         if(scomp.length==0) {
-        	throw new CadiException(Config.AAF_LOCATOR_NAMES + " must be defined.");
+            throw new CadiException(Config.AAF_LOCATOR_ENTRIES + " must be defined.");
         } else {
-        	str = ROOT_NS + '.' + scomp[0];
+            str = rootNs + '.' + scomp[0];
         }
-        app_name = str;
-        
+        appName = str;
+
         str = access.getProperty(Config.AAF_LOCATOR_VERSION, null);
         if(str==null) {
-        	str = Defaults.AAF_VERSION;
-        	env.setProperty(Config.AAF_LOCATOR_VERSION, str);
+            str = Defaults.AAF_VERSION;
+            env.setProperty(Config.AAF_LOCATOR_VERSION, str);
         }
-        app_version = str;
-        
+        appVersion = access.getProperty(Config.AAF_DEPLOYED_VERSION, str);
+
         // Print Cipher Suites Available
         if (access.willLog(Level.DEBUG)) {
             SSLContext context;
@@ -86,7 +86,7 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
             } catch (NoSuchAlgorithmException e) {
                 throw new CadiException("SSLContext issue",e);
             }
-            SSLSocketFactory sf = context.getSocketFactory();
+            SSLServerSocketFactory sf = context.getServerSocketFactory();
             StringBuilder sb = new StringBuilder("Available Cipher Suites: ");
             boolean first = true;
             int count=0;
@@ -99,20 +99,20 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
             access.log(Level.DEBUG,sb);
         }
     }
-    
+
     public void setProtocol(String proto) {
-    	env.setProperty(Config.AAF_LOCATOR_PROTOCOL, proto);
+        env.setProperty(Config.AAF_LOCATOR_PROTOCOL, proto);
     }
 
     public void setSubprotocol(String subproto) {
-    	env.setProperty(Config.AAF_LOCATOR_SUBPROTOCOL, subproto);
+        env.setProperty(Config.AAF_LOCATOR_SUBPROTOCOL, subproto);
     }
-    
+
     protected abstract Filter[] _filters(Object ... additionalTafLurs) throws CadiException,  LocatorException;
-    
+
     /**
      * Overload this method to add new TAF or LURs
-     * 
+     *
      * @return
      * @throws CadiException
      * @throws LocatorException
@@ -134,11 +134,11 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
             }
             return aafCon;
     }
-    
+
     /**
      * Allow to be over ridden for special cases
      * @return
-     * @throws LocatorException 
+     * @throws LocatorException
      */
         protected synchronized AAFConHttp _newAAFConHttp() throws CadiException, LocatorException {
             if (aafCon==null) {
@@ -147,25 +147,25 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
             return aafCon;
 
         }
-    
+
     // This is a method, so we can overload for AAFAPI
     public String aaf_url() {
             return access.getProperty(Config.AAF_URL, null);
     }
-    
+
     public Rcli<?> client() throws CadiException {
         return aafCon.client();
     }
 
     public Rcli<?> clientAsUser(TaggedPrincipal p) throws CadiException {
         return aafCon.client().forUser(
-                new HTransferSS(p,app_name, aafCon.securityInfo()));
+                new HTransferSS(p, appName, aafCon.securityInfo()));
     }
 
     public<RET> RET clientAsUser(TaggedPrincipal p,Retryable<RET> retryable) throws APIException, LocatorException, CadiException  {
-            return aafCon.hman().best(new HTransferSS(p,app_name, aafCon.securityInfo()), retryable);
+            return aafCon.hman().best(new HTransferSS(p, appName, aafCon.securityInfo()), retryable);
     }
-    
+
     protected static final String loadFromArgOrSystem(final Properties props, final String tag, final String args[], final String def) {
         String tagEQ = tag + '=';
         String value;
@@ -177,15 +177,14 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
         }
         // check System.properties
         value = System.getProperty(tag);
-        if (value!=null) { 
+        if (value!=null) {
             props.put(tag, value);
             return value;
         }
-        
+
         if (def!=null) {
             props.put(tag,def);
         }
         return def;
     }
-
 }