diff options
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java | 19 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java b/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java index fb49096..76bf5ce 100644 --- a/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java +++ b/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java @@ -261,19 +261,14 @@ public class MRBaseClient extends HttpClient implements MRClient { } } - public JSONObject getNoAuth(final String path, final String username, final String password, - final String protocolFlag) throws HttpException, JSONException { - if (null != username && null != password) { - WebTarget target=null; - Response response=null; - target = DmaapClientUtil.getTarget(path, username, password); - response = DmaapClientUtil.getResponsewtNoAuth(target); + public JSONObject getNoAuth(final String path) throws HttpException, JSONException { - return getResponseDataInJson(response); - } else { - throw new HttpException( - "Authentication Failed: Username/password/AuthKey/Authdate parameter(s) cannot be null or empty."); - } + WebTarget target = null; + Response response = null; + target = DmaapClientUtil.getTarget(path); + response = DmaapClientUtil.getResponsewtNoAuth(target); + + return getResponseDataInJson(response); } public String getAuthResponse(final String path, final String authKey, final String authDate, final String username, diff --git a/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java b/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java index 72d97c9..bc156ea 100644 --- a/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java +++ b/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java @@ -200,7 +200,7 @@ public class MRConsumerImpl extends MRBaseClient implements MRConsumer { fGroup, fId, props.getProperty("Protocol")), timeoutMs, limit); try { - final JSONObject o = getNoAuth(urlPath, username, password, protocolFlag); + final JSONObject o = getNoAuth(urlPath); if (o != null) { final JSONArray a = o.getJSONArray("result"); if (a != null) { |