Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add JAVA_HOME to check.sh
[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
..
66ef4b1
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
@@
-60,23
+60,27
@@
public class DNSLocator implements Locator<URI> {
if (aaf_locate==null) {
throw new LocatorException("Null passed into DNSLocator constructor");
}
if (aaf_locate==null) {
throw new LocatorException("Null passed into DNSLocator constructor");
}
- int start,
p
ort;
+ int start,
defP
ort;
if (aaf_locate.startsWith("https:")) {
if (aaf_locate.startsWith("https:")) {
- protocol = "https
:
";
- start =
9
; // https://
-
p
ort = 443;
+ protocol = "https";
+ start =
8
; // https://
+
defP
ort = 443;
} else if (aaf_locate.startsWith("http:")) {
} else if (aaf_locate.startsWith("http:")) {
- protocol = "http
:
";
- start =
8
; // http://
-
p
ort = 80;
+ protocol = "http";
+ start =
7
; // http://
+
defP
ort = 80;
} else {
throw new LocatorException("DNSLocator accepts only https or http protocols. (requested URL " + aaf_locate + ')');
}
} 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(
);
}
}
- @Override
+ public static DNSLocator create(Access access, String url) throws LocatorException {
+ return new DNSLocator(access, url);
+ }
+
+ @Override
public URI get(Item item) throws LocatorException {
return hosts[((DLItem)item).cnt].uri;
}
public URI get(Item item) throws LocatorException {
return hosts[((DLItem)item).cnt].uri;
}
@@
-159,10
+163,11
@@
public class DNSLocator implements Locator<URI> {
return false;
}
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 slash, start;
- int colon = aaf_locate.indexOf(':');
+ int colon = aaf_locate.indexOf(':'
,_start
);
if (colon > 0) {
if (colon > 0) {
+ host = aaf_locate.substring(_start,colon);
start = colon + 1;
int left = aaf_locate.indexOf('[', start);
if (left > 0) {
start = colon + 1;
int left = aaf_locate.indexOf('[', start);
if (left > 0) {
@@
-182,6
+187,10
@@
public class DNSLocator implements Locator<URI> {
startPort = Integer.parseInt(aaf_locate.substring(left + 1, dash));
endPort = Integer.parseInt(aaf_locate.substring(dash + 1, right));
}
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);
} else {
slash = aaf_locate.indexOf('/', start);
@@
-192,11
+201,16
@@
public class DNSLocator implements Locator<URI> {
startPort = endPort = Integer.parseInt(aaf_locate.substring(start));
} else {
startPort = endPort = Integer.parseInt(aaf_locate.substring(start, slash));
startPort = endPort = Integer.parseInt(aaf_locate.substring(start));
} else {
startPort = endPort = Integer.parseInt(aaf_locate.substring(start, slash));
+ suffix = aaf_locate.substring(slash);
}
}
} else {
}
}
} else {
+ slash = aaf_locate.indexOf('/', _start);
+ host = slash<_start?aaf_locate.substring(_start):aaf_locate.substring(_start,slash);
startPort = endPort = defaultPort;
startPort = endPort = defaultPort;
- }
+ }
+
+ return host;
}
private class Host {
}
private class Host {
@@
-206,9
+220,13
@@
public class DNSLocator implements Locator<URI> {
public Host(InetAddress inetAddress, int port, String suffix) throws URISyntaxException {
ia = inetAddress;
public Host(InetAddress inetAddress, int port, String suffix) throws URISyntaxException {
ia = inetAddress;
- uri = new URI(protocol,null,inetAddress.get
HostAddress
(),port,suffix,null,null);
+ uri = new URI(protocol,null,inetAddress.get
CanonicalHostName
(),port,suffix,null,null);
status = Status.UNTRIED;
}
status = Status.UNTRIED;
}
+
+ public String toString() {
+ return uri.toString() + " - " + status.name();
+ }
}
private class DLItem implements Item {
}
private class DLItem implements Item {