import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.NoSuchElementException;
import org.onap.aaf.cadi.Access;
import org.onap.aaf.cadi.Access.Level;
this.version = Config.AAF_DEFAULT_VERSION;
} else {
String[] split = Split.split(':', name);
-
- switch(split.length) {
- case 1:
- this.name = split[0];
- this.version = Config.AAF_DEFAULT_VERSION;
- break;
- case 0:
- this.name = name;
- this.version = Config.AAF_DEFAULT_VERSION;
- break;
- default:
- this.version = split[1];
- this.name = split[0];
-
- }
+ this.name = split[0];
+ this.version = (split.length > 1) ? split[1] : Config.AAF_DEFAULT_VERSION;
}
}
if(key.startsWith("http")) {
if(name!=null) {
if(locatorCreator != null) {
- if(name!=null) {
- AbsAAFLocator<?> aal = locatorCreator.create(name, version);
- if(pathInfo!=null) {
- aal.setPathInfo(pathInfo);
- }
- return aal;
+ AbsAAFLocator<?> aal = locatorCreator.create(name, version);
+ if(pathInfo!=null) {
+ aal.setPathInfo(pathInfo);
}
+ return aal;
}
} else {
return new PropertyLocator(key);
case 1:
return new AAFLItem(iter,first);
default:
- int i = Math.abs(sr.nextInt())%lep.size();
+ int rand = sr.nextInt(); // Sonar chokes without.
+ int i = Math.abs(rand)%lep.size();
if(i<0) {
return null;
} else {
@Override
public EP next() {
+ if(!hasNext() ) {
+ throw new NoSuchElementException();
+ }
return (EP)epa[idx++];
}
public int compareTo(EP o) {
if(distance<o.distance) {
return -1;
- } else if(distance==o.distance) {
- return 0;
- } else {
+ } else if(distance>o.distance) {
return 1;
+ } else {
+ return 0;
}
}
try {
return new URI(rv.getScheme(),rv.getUserInfo(),rv.getHost(),rv.getPort(),pathInfo,query,fragment);
} catch (URISyntaxException e) {
- throw new LocatorException("Error coping URL");
+ throw new LocatorException("Error copying URL");
}
}
return rv;