summaryrefslogtreecommitdiffstats
path: root/cadi/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'cadi/client/src')
-rw-r--r--cadi/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java2
-rw-r--r--cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java16
-rw-r--r--cadi/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java4
-rw-r--r--cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java16
-rw-r--r--cadi/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java2
-rw-r--r--cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java6
6 files changed, 23 insertions, 23 deletions
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
index 30673f75..38465da4 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
@@ -34,7 +34,7 @@ public class HBasicAuthSS extends HAuthorizationHeader implements BasicAuth {
public HBasicAuthSS(SecurityInfoC<HttpURLConnection> si, String user, String password) throws IOException {
super(si, user, "Basic " + Symm.base64noSplit.encode(user + ':' + password));
if(password==null) {
- throw new IOException("No password passed for " + user);
+ throw new IOException("No password passed for " + user);
}
}
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
index 9255128c..61112c47 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
@@ -121,7 +121,7 @@ public class HClient implements EClient<HttpURLConnection> {
}
pi.append(pathinfo);
}
- URI sendURI = null;
+ URI sendURI = null;
try {
sendURI = new URI(
uri.getScheme(),
@@ -149,13 +149,13 @@ public class HClient implements EClient<HttpURLConnection> {
}
// TODO other settings? There's a bunch here.
} catch (APIException e) {
- throw e;
+ throw e;
} catch (Exception e) {
- if(sendURI==null) {
- throw new APIException("Cannot connect to Root URI: '" + uri.toString() + '\'',e);
- } else {
- throw new APIException("Cannot connect to '" + sendURI.toString() + "' (Root URI: '" + uri.toString() + "')",e);
- }
+ if(sendURI==null) {
+ throw new APIException("Cannot connect to Root URI: '" + uri.toString() + '\'',e);
+ } else {
+ throw new APIException("Cannot connect to '" + sendURI.toString() + "' (Root URI: '" + uri.toString() + "')",e);
+ }
} finally { // ensure all these are reset after sends
meth=pathinfo=null;
if (headers!=null) {
@@ -170,7 +170,7 @@ public class HClient implements EClient<HttpURLConnection> {
}
public void setURI(URI uri) {
- this.uri = uri;
+ this.uri = uri;
}
public int timeout() {
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
index ae562cb2..19e40b3a 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
@@ -170,11 +170,11 @@ public class HMangr {
}
public <RET> RET allExcept(SecuritySetter<HttpURLConnection> ss, Retryable<RET> retryable,boolean notify, String selfHost) throws LocatorException, CadiException, APIException {
- return call(ss,retryable,notify,selfHost);
+ return call(ss,retryable,notify,selfHost);
}
public<RET> RET oneOf(SecuritySetter<HttpURLConnection> ss, Retryable<RET> retryable,boolean notify,String host) throws LocatorException, CadiException, APIException {
- return call(ss,retryable,notify,host);
+ return call(ss,retryable,notify,host);
}
private<RET> RET call(SecuritySetter<HttpURLConnection> ss, Retryable<RET> retryable,boolean notify,String host) throws LocatorException, CadiException, APIException {
RET ret = null;
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 66ef4b1e..4711aee6 100644
--- 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
@@ -77,10 +77,10 @@ public class DNSLocator implements Locator<URI> {
}
public static DNSLocator create(Access access, String url) throws LocatorException {
- return new DNSLocator(access, url);
- }
+ return new DNSLocator(access, url);
+ }
- @Override
+ @Override
public URI get(Item item) throws LocatorException {
return hosts[((DLItem)item).cnt].uri;
}
@@ -167,7 +167,7 @@ public class DNSLocator implements Locator<URI> {
int slash, start;
int colon = aaf_locate.indexOf(':',_start);
if (colon > 0) {
- host = aaf_locate.substring(_start,colon);
+ host = aaf_locate.substring(_start,colon);
start = colon + 1;
int left = aaf_locate.indexOf('[', start);
if (left > 0) {
@@ -189,7 +189,7 @@ public class DNSLocator implements Locator<URI> {
}
slash = aaf_locate.indexOf('/', start);
if(slash>=0) {
- suffix = aaf_locate.substring(slash);
+ suffix = aaf_locate.substring(slash);
}
} else {
@@ -205,8 +205,8 @@ public class DNSLocator implements Locator<URI> {
}
}
} else {
- slash = aaf_locate.indexOf('/', _start);
- host = slash<_start?aaf_locate.substring(_start):aaf_locate.substring(_start,slash);
+ slash = aaf_locate.indexOf('/', _start);
+ host = slash<_start?aaf_locate.substring(_start):aaf_locate.substring(_start,slash);
startPort = endPort = defaultPort;
}
@@ -225,7 +225,7 @@ public class DNSLocator implements Locator<URI> {
}
public String toString() {
- return uri.toString() + " - " + status.name();
+ return uri.toString() + " - " + status.name();
}
}
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
index bccb8116..34889138 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
@@ -182,7 +182,7 @@ public class PropertyLocator implements Locator<URI> {
String realname;
for (int i = 0; i < orig.length ; ++i) {
try {
- FixURIinfo fui = new FixURIinfo(orig[i]);
+ FixURIinfo fui = new FixURIinfo(orig[i]);
InetAddress ia[] = InetAddress.getAllByName(fui.getHost());
URI o,n;
diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java b/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java
index d1744253..10eb8184 100644
--- a/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java
+++ b/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java
@@ -184,10 +184,10 @@ public class JU_HMangr {
assertThat(hman.best(ssMock, retryableMock), is(nullValue()));
try {
- hman.all(ssMock, retryableMock, true);
- Assert.fail("Should have thrown LocatorException");
+ hman.all(ssMock, retryableMock, true);
+ Assert.fail("Should have thrown LocatorException");
} catch (LocatorException e) {
- assertEquals(e.getLocalizedMessage(),"No available clients to call");
+ assertEquals(e.getLocalizedMessage(),"No available clients to call");
}
}