Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / register / RemoteRegistrant.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RemoteRegistrant.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RemoteRegistrant.java
index 3672c62..49af80f 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RemoteRegistrant.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RemoteRegistrant.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.
@@ -68,25 +68,25 @@ public class RemoteRegistrant<ENV extends BasicEnv> implements Registrant<ENV> {
         } else {
             // Note: want Property Locator or Single, not AAFLocator, because we want the core service, not what it can find
             try {
-               RegistrationPropHolder rph = new RegistrationPropHolder(access, 0);
-               aaf_locate = rph.replacements(getClass().getSimpleName(),aaf_locate, null,null);
+                RegistrationPropHolder rph = new RegistrationPropHolder(access, 0);
+                aaf_locate = rph.replacements(getClass().getSimpleName(),aaf_locate, null,null);
                 if (aaf_locate.indexOf(',')>=0) {
                     locator = new PropertyLocator(aaf_locate);
                 } else {
                     locator = new SingleEndpointLocator(aaf_locate);
                 }
-            } catch (URISyntaxException | UnknownHostException e) {
+            } catch (UnknownHostException e) {
                 throw new CadiException(e);
             }
         }
-        
+
         RegistrationCreator rcreator = new RegistrationCreator(access);
         meps = rcreator.create(port);
     }
-    
 
 
-       @Override
+
+    @Override
     public Result<Void> update(ENV env) {
         try {
             Rcli<?> client = aafcon.client(locator);
@@ -103,7 +103,7 @@ public class RemoteRegistrant<ENV extends BasicEnv> implements Registrant<ENV> {
                 access.log(e, "Error registering service to AAF Locator");
                 return Result.err(503,e.getMessage());
             }
-            
+
         } catch (CadiException e) {
             return Result.err(503,e.getMessage());
         }
@@ -125,7 +125,7 @@ public class RemoteRegistrant<ENV extends BasicEnv> implements Registrant<ENV> {
                 access.log(e, "Error deregistering service on AAF Locator");
                 return Result.err(503,e.getMessage());
             }
-            
+
         } catch (CadiException e) {
             return Result.err(503,e.getMessage());
         }