X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Flocator%2FSingleEndpointLocator.java;h=e9e9708f209fbe6c3bb6eb74cdd683ca9e43f059;hb=refs%2Fchanges%2F78%2F105978%2F3;hp=b0c830f68854d63ffba13a0fc7e659cb6f3cce46;hpb=6261a19e61138e861f5c7eaf37835205f19f1fe0;p=aaf%2Fauthz.git

diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java
index b0c830f6..e9e9708f 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.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.
@@ -22,61 +22,87 @@ package org.onap.aaf.cadi.locator;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Date;
 
-import org.onap.aaf.cadi.Locator;
 import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+
+public class SingleEndpointLocator implements SizedLocator<URI> {
+    private final URI uri;
+    private final static Item item = new Item() {};
+    private Date noRetryUntil;
+
+    /**
+     * New constructor that works with the Config.loadLocator function
+     */
+    public SingleEndpointLocator(final SecurityInfoC<?> sec, final URI uri) throws LocatorException {
+        this.uri = uri;
+    }
+
+    public SingleEndpointLocator(final URI uri) {
+        this.uri = uri;
+    }
+
+    public SingleEndpointLocator(final String endpoint) throws LocatorException {
+        try {
+            this.uri = new URI(endpoint);
+        } catch (URISyntaxException e) {
+            throw new LocatorException(e);
+        }
+    }
 
-public class SingleEndpointLocator implements Locator<URI> {
-	private final URI uri;
-	private final static Item item = new Item() {};  
-	
-	public SingleEndpointLocator(final URI uri) {
-		this.uri = uri;
-	}
-	
-	public SingleEndpointLocator(final String endpoint) throws URISyntaxException {
-		this.uri = new URI(endpoint);
-	}
+    @Override
+    public URI get(Item item) throws LocatorException {
+        return uri;
+    }
 
-	@Override
-	public URI get(Item item) throws LocatorException {
-		return uri;
-	}
+    @Override
+    public boolean hasItems() {
+        if (noRetryUntil!=null) {
+            if (new Date().after(noRetryUntil)) {
+                noRetryUntil = null;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	@Override
-	public boolean hasItems() {
-		return true;
-	}
+    @Override
+    public void invalidate(Item item) throws LocatorException {
+        // one minute timeout, because there is no other item
+        noRetryUntil = new Date(System.currentTimeMillis()+60000);
+    }
 
-	@Override
-	public void invalidate(Item item) throws LocatorException {
-		// Endpoints cannot be invalidated
-	}
+    @Override
+    public Item best() throws LocatorException {
+        return item;
+    }
 
-	@Override
-	public Item best() throws LocatorException {
-		return item;
-	}
+    @Override
+    public Item first() throws LocatorException {
+        return item;
+    }
 
-	@Override
-	public Item first() throws LocatorException {
-		return item;
-	}
+    @Override
+    public Item next(Item inItem) throws LocatorException {
+        // only one item
+        return null;
+    }
 
-	@Override
-	public Item next(Item inItem) throws LocatorException {
-		// only one item
-		return null;
-	}
+    @Override
+    public boolean refresh() {
+        // Never refreshed
+        return true;
+    }
 
-	@Override
-	public boolean refresh() {
-		// Never refreshed
-		return true;
-	}
+    @Override
+    public int size() {
+        return 1;
+    }
 
-	@Override
-	public void destroy() {
-		// Nothing to do here
-	}
+    @Override
+    public void destroy() {
+        // Nothing to do here
+    }
 }