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

[aaf/authz.git] / auth / auth-locate / src / main / java / org / onap / aaf / auth / locate / validation / LocateValidator.java

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/validation/LocateValidator.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/validation/LocateValidator.java
index 6dd3d92..b6ae54e 100644 (file)
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/validation/LocateValidator.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/validation/LocateValidator.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.
@@ -32,22 +32,22 @@ import locate.v1_0.MgmtEndpoints;
 /**
  * Validator
  * Consistently apply content rules for content (incoming)
- * 
- * Note: We restrict content for usability in URLs (because RESTful service), and avoid 
- * issues with Regular Expressions, and other enabling technologies. 
+ *
+ * Note: We restrict content for usability in URLs (because RESTful service), and avoid
+ * issues with Regular Expressions, and other enabling technologies.
  * @author Jonathan
  *
  */
 public class LocateValidator extends Validator {
     private LocateValidator endpoint_key(Endpoint e) {
-        if(e==null) {
+        if (e==null) {
             msg("Endpoint Data is null.");
         } else {
             nullOrBlank("Endpoint Name", e.getName());
-            if(e.getName()!=null) {
+            if (e.getName()!=null) {
                 int idx = e.getName().indexOf('.');
-                if(idx<=0) {
-                    msg("Endpoint Name must prefixed by Namespace");
+                if (idx<=0) {
+                    msg("Endpoint Name (" + e.getName() + ") must prefixed by Namespace");
                 }
             }
             nullOrBlank("Endpoint Hostname", e.getHostname());
@@ -59,7 +59,7 @@ public class LocateValidator extends Validator {
 
     public LocateValidator endpoint(Endpoint e) {
         endpoint_key(e);
-        if(e!=null) {
+        if (e!=null) {
             intRange("Endpoint Major Version",e.getMajor(),0,2000);
             intRange("Endpoint Minor Version",e.getMinor(),0,2000);
             intRange("Endpoint Patch Version",e.getPatch(),0,2000);
@@ -67,21 +67,21 @@ public class LocateValidator extends Validator {
             floatRange("Endpoint Latitude",e.getLatitude(),-90f,90f);
             floatRange("Endpoint Longitude",e.getLongitude(),-180f,180f);
             nullOrBlank("Endpoint Protocol", e.getProtocol());
-            for(String s : e.getSubprotocol()) {
+            for (String s : e.getSubprotocol()) {
                 nullOrBlank("Endpoint Subprotocol", s);
             }
         }
         return this;
     }
-    
+
     public LocateValidator endpoints(Endpoints e, boolean emptyNotOK) {
-        if(e==null) {
+        if (e==null) {
             msg("Endpoints Data is null.");
         } else {
-            if(emptyNotOK && e.getEndpoint().size()==0) {
+            if (emptyNotOK && e.getEndpoint().size()==0) {
                 msg("Endpoints contains no endpoints");
             } else {
-                for(Endpoint ep : e.getEndpoint()) {
+                for (Endpoint ep : e.getEndpoint()) {
                     endpoint(ep);
                 }
             }
@@ -90,10 +90,10 @@ public class LocateValidator extends Validator {
     }
 
     public LocateValidator mgmt_endpoint_key(MgmtEndpoints meps) {
-        if(meps==null) {
+        if (meps==null) {
             msg("MgmtEndpoints Data is null.");
         } else {
-            for(MgmtEndpoint ep : meps.getMgmtEndpoint()) {
+            for (MgmtEndpoint ep : meps.getMgmtEndpoint()) {
                 endpoint_key(ep);
             }
         }
@@ -101,13 +101,13 @@ public class LocateValidator extends Validator {
     }
 
     public LocateValidator mgmt_endpoints(MgmtEndpoints me, boolean emptyOK) {
-        if(me==null) {
+        if (me==null) {
             msg("MgmtEndpoints Data is null.");
         } else {
-            if(!emptyOK && me.getMgmtEndpoint().size()==0) {
+            if (!emptyOK && me.getMgmtEndpoint().size()==0) {
                 msg("MgmtEndpoints contains no data");
             } else {
-                for(MgmtEndpoint ep : me.getMgmtEndpoint()) {
+                for (MgmtEndpoint ep : me.getMgmtEndpoint()) {
                     mgmt_endpoint(ep);
                 }
             }
@@ -117,21 +117,21 @@ public class LocateValidator extends Validator {
 
     private LocateValidator mgmt_endpoint(MgmtEndpoint ep) {
         endpoint(ep);
-        for(SpecialPorts sp : ep.getSpecialPorts()) {
+        for (SpecialPorts sp : ep.getSpecialPorts()) {
             specialPorts(sp);
         }
         return this;
     }
 
     private LocateValidator specialPorts(SpecialPorts sp) {
-        if(sp==null) {
+        if (sp==null) {
             msg("Special Ports is null.");
         } else {
             nullOrBlank("Special Port Name",sp.getName());
             nullOrBlank("Special Port Protocol",sp.getProtocol());
             intRange("Special Port",sp.getPort(),0,1000000);
-            
-            for(String s : sp.getProtocolVersions()) {
+
+            for (String s : sp.getProtocolVersions()) {
                 nullOrBlank("Special Port Protocol Version", s);
             }
         }