Remove Tabs, per Jococo

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / sso / AAFSSO.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
index c0ac43e..a472ed5 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
@@ -146,7 +146,7 @@ public class AAFSSO {
             //    Config.setDefaultRealm(access);
     
             if (!dot_aaf_kf.exists()) {
-               // This will create, as required, or reuse
+                // This will create, as required, or reuse
                 ArtifactDir.getSymm(dot_aaf_kf);
             }
 
@@ -192,18 +192,18 @@ public class AAFSSO {
             
             String aaf_container_ns = "";
             if (appID!=null) {
-               if( access.getProperty(Config.AAF_APPPASS)==null) {
-                       appID = user = cons.readLine("Deployer ID [%s]: ", user);
-                       access.setProperty(Config.AAF_APPID,appID);
-                       char[] password = cons.readPassword("Password for %s: ", user);
-                       if(password.length>0) {
-                               String app_pass = access.encrypt(new String(password));
-                               access.setProperty(Config.AAF_APPPASS,app_pass);
-                               diskprops.setProperty(Config.AAF_APPPASS,app_pass);
-                       }
-                       aaf_container_ns = cons.readLine("Container Namespace (blank if none)? [\"\"]: ", aaf_container_ns);
-               }
-               diskprops.setProperty(Config.AAF_APPID,appID);
+                if( access.getProperty(Config.AAF_APPPASS)==null) {
+                    appID = user = cons.readLine("Deployer ID [%s]: ", user);
+                    access.setProperty(Config.AAF_APPID,appID);
+                    char[] password = cons.readPassword("Password for %s: ", user);
+                    if(password.length>0) {
+                        String app_pass = access.encrypt(new String(password));
+                           access.setProperty(Config.AAF_APPPASS,app_pass);
+                           diskprops.setProperty(Config.AAF_APPPASS,app_pass);
+                    }
+                    aaf_container_ns = cons.readLine("Container Namespace (blank if none)? [\"\"]: ", aaf_container_ns);
+                }
+                 diskprops.setProperty(Config.AAF_APPID,appID);
             }
             
             String keystore=access.getProperty(Config.CADI_KEYSTORE);
@@ -380,39 +380,39 @@ public class AAFSSO {
             access.setProperty(Config.AAF_LOCATE_URL, locateUrl);
             addProp(Config.AAF_LOCATE_URL, locateUrl);
             try {
-               if(access.getProperty(Config.AAF_URL)==null) {
-                       access.setProperty(Config.AAF_URL, Defaults.AAF_ROOT+".service:"+Defaults.AAF_VERSION);
-               }
-                               AAFCon<?> aafCon = AAFCon.newInstance(access);
-                       Future<Configuration> acf;
-                               RosettaDF<Configuration> configDF = new RosettaEnv().newDataFactory(Configuration.class);
-                               acf = aafCon.client(new SingleEndpointLocator(locateUrl))
-                                       .read("/configure/"+user+"/aaf", configDF);
-                       if (acf.get(aafCon.connTimeout)) {
-                               for(Props p : acf.value.getProps()) {
-                                       addProp(p.getTag(),p.getValue());
-                                       if(access.getProperty(p.getTag())==null) {
-                                               access.setProperty(p.getTag(), p.getValue());
-                                       }
-                               }
-                       } else {
-                               access.log(Level.INFO,acf.body());
-                       }
-                       } catch (LocatorException | APIException | URISyntaxException e) {
-                               access.log(e);
-                       }
+                if(access.getProperty(Config.AAF_URL)==null) {
+                    access.setProperty(Config.AAF_URL, Defaults.AAF_ROOT+".service:"+Defaults.AAF_VERSION);
+                }
+                AAFCon<?> aafCon = AAFCon.newInstance(access);
+                Future<Configuration> acf;
+                RosettaDF<Configuration> configDF = new RosettaEnv().newDataFactory(Configuration.class);
+                acf = aafCon.client(new SingleEndpointLocator(locateUrl))
+                        .read("/configure/"+user+"/aaf", configDF);
+                if (acf.get(aafCon.connTimeout)) {
+                    for(Props p : acf.value.getProps()) {
+                        addProp(p.getTag(),p.getValue());
+                        if(access.getProperty(p.getTag())==null) {
+                            access.setProperty(p.getTag(), p.getValue());
+                        }
+                    }
+                } else {
+                    access.log(Level.INFO,acf.body());
+                }
+            } catch (LocatorException | APIException | URISyntaxException e) {
+                access.log(e);
+            }
         }
         
         final String apiVersion = access.getProperty(Config.AAF_API_VERSION, Config.AAF_DEFAULT_API_VERSION);
         final String aaf_root_ns = access.getProperty(Config.AAF_ROOT_NS);
         String locateRoot;
         if(aaf_root_ns==null) {
-               locateRoot=Defaults.AAF_ROOT;
+            locateRoot=Defaults.AAF_ROOT;
         } else {
-               locateRoot = Defaults.AAF_LOCATE_CONST + "/%CNS." + aaf_root_ns;
+            locateRoot = Defaults.AAF_LOCATE_CONST + "/%CNS." + aaf_root_ns;
         }
         if(access.getProperty(Config.AAF_URL)==null) {
-               access.setProperty(Config.AAF_URL, locateRoot+".service:"+apiVersion);
+            access.setProperty(Config.AAF_URL, locateRoot+".service:"+apiVersion);
         }
 
         writeFiles();