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

[aaf/authz.git] / cadi / client / src / main / java / org / onap / aaf / cadi / locator / DNSLocator.java

diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
index 8357129..c0b9f37 100644 (file)
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.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.
@@ -27,20 +27,21 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.onap.aaf.cadi.Access;
-import org.onap.aaf.cadi.Locator;
-import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.LocatorException;
 
-public class DNSLocator implements Locator<URI> {
+public class DNSLocator implements SizedLocator<URI> {
     private static enum Status {UNTRIED, OK, INVALID, SLOW};
     private static final int CHECK_TIME = 3000;
-    
+
     private String host, protocol;
     private Access access;
     private Host[] hosts;
     private int startPort, endPort;
     private String suffix;
-    
+
+    private int size = 1; // initial, until refreshed.
+
     public DNSLocator(Access access, String protocol, String host, String range) {
         this.host = host;
         this.protocol = protocol;
@@ -60,20 +61,24 @@ public class DNSLocator implements Locator<URI> {
         if (aaf_locate==null) {
             throw new LocatorException("Null passed into DNSLocator constructor");
         }
-        int start, port;
-        if (aaf_locate.startsWith("https:")) {
-            protocol = "https:";
-            start = 9; // https://
-            port = 443;
-        } else if (aaf_locate.startsWith("http:")) {
-            protocol = "http:";
-            start = 8; // http://
-            port = 80;
+        int start, defPort;
+        if (aaf_locate.startsWith("https://")) {
+            protocol = "https";
+            start = 8; // https://
+            defPort = 443;
+        } else if (aaf_locate.startsWith("http://")) {
+            protocol = "http";
+            start = 7; // http://
+            defPort = 80;
         } else {
             throw new LocatorException("DNSLocator accepts only https or http protocols.  (requested URL " + aaf_locate + ')');
         }
-        
-        parsePorts(aaf_locate.substring(start), port);
+        host = parseHostAndPorts(aaf_locate, start, defPort);
+        refresh();
+    }
+
+    public static DNSLocator create(Access access, String url) throws LocatorException {
+        return new DNSLocator(access, url);
     }
 
     @Override
@@ -152,17 +157,19 @@ public class DNSLocator implements Locator<URI> {
                 }
             }
             hosts = temp;
+            size = temp.length * (endPort-startPort+1);
             return true;
         } catch (Exception e) {
             access.log(Level.ERROR, e);
         }
         return false;
     }
-    
-    private void parsePorts(String aaf_locate, int defaultPort) throws LocatorException {
+
+    private String parseHostAndPorts(String aaf_locate, int _start, int defaultPort) throws LocatorException {
         int slash, start;
-        int colon = aaf_locate.indexOf(':');
+        int colon = aaf_locate.indexOf(':',_start);
         if (colon > 0) {
+            host = aaf_locate.substring(_start,colon);
             start = colon + 1;
             int left = aaf_locate.indexOf('[', start);
             if (left > 0) {
@@ -182,7 +189,11 @@ public class DNSLocator implements Locator<URI> {
                     startPort = Integer.parseInt(aaf_locate.substring(left + 1, dash));
                     endPort = Integer.parseInt(aaf_locate.substring(dash + 1, right));
                 }
-                
+                slash = aaf_locate.indexOf('/', start);
+                if(slash>=0) {
+                    suffix = aaf_locate.substring(slash);
+                }
+
             } else {
                 slash = aaf_locate.indexOf('/', start);
                 if (slash == start) {
@@ -192,25 +203,34 @@ public class DNSLocator implements Locator<URI> {
                     startPort = endPort = Integer.parseInt(aaf_locate.substring(start));
                 } else {
                     startPort = endPort = Integer.parseInt(aaf_locate.substring(start, slash));
+                    suffix = aaf_locate.substring(slash);
                 }
             }
         } else {
+            slash = aaf_locate.indexOf('/', _start);
+            host = slash<_start?aaf_locate.substring(_start):aaf_locate.substring(_start,slash);
             startPort = endPort = defaultPort;
-        }        
+        }
+
+        return host;
     }
 
     private class Host {
         private URI uri;
         private InetAddress ia;
         private Status status;
-        
+
         public Host(InetAddress inetAddress, int port, String suffix) throws URISyntaxException {
             ia = inetAddress;
-            uri = new URI(protocol,null,inetAddress.getHostAddress(),port,suffix,null,null);
+            uri = new URI(protocol,null,inetAddress.getCanonicalHostName(),port,suffix,null,null);
             status = Status.UNTRIED;
         }
+
+        public String toString() {
+            return uri.toString() + " - " + status.name();
+        }
     }
-    
+
     private class DLItem implements Item {
         public DLItem(int i) {
             cnt = i;
@@ -218,6 +238,10 @@ public class DNSLocator implements Locator<URI> {
 
         private int cnt;
     }
-    
+
     public void destroy() {}
+
+    public int size() {
+        return size;
+    }
 }