Sonar fixes related to exceptions

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / aaf / v2_0 / AbsAAFLocator.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
index fc29760..a0706c4 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
@@ -58,14 +58,24 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
        protected String myhostname;
        protected int myport;
        protected final String aaf_locator_host;
+       protected final URI aaf_locator_uri;
        private long earliest;
        private final long refreshWait;
 
 
        public AbsAAFLocator(Access access, String name, final long refreshMin) throws LocatorException {
                aaf_locator_host = access.getProperty(Config.AAF_LOCATE_URL, null);
+               if(aaf_locator_host==null) {
+                       aaf_locator_uri = null;
+               } else {
+                       try {
+                               aaf_locator_uri = new URI(aaf_locator_host);
+                       } catch (URISyntaxException e) {
+                               throw new LocatorException(e);
+                       }
+               }
 
-               epList = new LinkedList<EP>();
+               epList = new LinkedList<>();
                refreshWait = refreshMin;
 
                this.access = access;
@@ -118,6 +128,8 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
                                                version = split[1];
                                                name = split[0];
                                                break;
+                                       default:
+                                               break;
                                }
                        }
                }
@@ -197,7 +209,7 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
        }
 
        private boolean noEntries() {
-               return epList.size()<=0;
+               return epList.isEmpty();
        }
 
        @Override
@@ -251,7 +263,7 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
                if(!hasItems()) {
                        throw new LocatorException("No Entries found" + (pathInfo==null?"":(" for " + pathInfo)));
                }
-               List<EP> lep = new ArrayList<EP>();
+               List<EP> lep = new ArrayList<>();
                EP first = null;
                // Note: Deque is sorted on the way by closest distance
                Iterator<EP> iter = getIterator();
@@ -406,8 +418,8 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
                }
 
        protected static class EP implements Comparable<EP> {
-               public URI uri;
-               public final double distance;
+               private URI uri;
+               private final double distance;
                private boolean valid;
                
                public EP(final Endpoint ep, double latitude, double longitude) throws URISyntaxException {
@@ -476,7 +488,7 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
                        try {
                                return new URI(rv.getScheme(),rv.getUserInfo(),rv.getHost(),rv.getPort(),pathInfo,query,fragment);
                        } catch (URISyntaxException e) {
-                               throw new LocatorException("Error copying URL");
+                               throw new LocatorException("Error copying URL", e);
                        }
                }
                return rv;