Merge "Sonar fixes related to exceptions"

diff --combined cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
index 7de8536,a0706c4..fca2374
--- 1/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
--- 2/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
@@@ -32,7 -32,6 +32,7 @@@ import java.util.NoSuchElementException
  
  import org.onap.aaf.cadi.Access;
  import org.onap.aaf.cadi.Access.Level;
 +import org.onap.aaf.cadi.aaf.Defaults;
  import org.onap.aaf.cadi.Locator;
  import org.onap.aaf.cadi.LocatorException;
  import org.onap.aaf.cadi.config.Config;
@@@ -88,12 -87,6 +88,12 @@@ public abstract class AbsAAFLocator<TRA
                        latitude = Double.parseDouble(lat);
                        longitude = Double.parseDouble(lng);
                }
 +              if(name.startsWith(Defaults.AAF_NS)) {
 +                      String root_ns = access.getProperty(Config.AAF_ROOT_NS, null);
 +                      if(root_ns!=null) {
 +                              name=name.replace(Defaults.AAF_NS, root_ns);
 +                      }
 +              }
                if(name.startsWith("http")) { // simple URL
                        this.name = name;
                        this.version = Config.AAF_DEFAULT_VERSION;
@@@ -135,6 -128,8 +135,8 @@@
                                                version = split[1];
                                                name = split[0];
                                                break;
+                                       default:
+                                               break;
                                }
                        }
                }
@@@ -214,7 -209,7 +216,7 @@@
        }
  
        private boolean noEntries() {
-               return epList.size()<=0;
+               return epList.isEmpty();
        }
  
        @Override
@@@ -266,7 -261,7 +268,7 @@@
        @Override
        public Item best() throws LocatorException {
                if(!hasItems()) {
 -                      throw new LocatorException("No Entries found" + (pathInfo==null?"":(" for " + pathInfo)));
 +                      throw new LocatorException("No Entries found for '" + aaf_locator_uri.toString() + "/locate/" + name + ':' + version + '\'');
                }
                List<EP> lep = new ArrayList<>();
                EP first = null;
@@@ -423,8 -418,8 +425,8 @@@
                }
  
        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 {
@@@ -493,7 -488,7 +495,7 @@@
                        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;