aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-impl/rest/src
diff options
context:
space:
mode:
authorwaynedunican <wayne.dunican@est.tech>2020-06-19 15:30:59 +0100
committerwaynedunican <wayne.dunican@est.tech>2020-06-26 15:30:23 +0100
commitf7da60fabf647665d61f142a0d6ba9a9fc940106 (patch)
tree93ddc1c8a089a847077ccc6c5a0ca7dee7737bf2 /models-interactions/model-impl/rest/src
parent93e2ba2e1756596323774398673736946b220090 (diff)
Clean up of Pair classes - models
Removed Pair class from policy-models and replaced with Aoache Common Pair class Issue-ID: POLICY-2202 Change-Id: I786467ac02ecb2d433dba94deba45785be3dcf23 Signed-off-by: waynedunican <wayne.dunican@est.tech>
Diffstat (limited to 'models-interactions/model-impl/rest/src')
-rw-r--r--models-interactions/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java100
-rw-r--r--models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java43
-rw-r--r--models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java290
3 files changed, 194 insertions, 239 deletions
diff --git a/models-interactions/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java b/models-interactions/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
index a452c142f..4f37e9592 100644
--- a/models-interactions/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
+++ b/models-interactions/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
@@ -3,7 +3,7 @@
* rest
* ================================================================================
* Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Map.Entry;
import javax.xml.bind.DatatypeConverter;
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpDelete;
@@ -47,29 +48,19 @@ public class RestManager {
// Constants for string literals
private static final String CONTENT_TYPE = "Content-Type";
- public class Pair<A, B> {
- public final A first;
- public final B second;
-
- public Pair(A first, B second) {
- this.first = first;
- this.second = second;
- }
- }
-
/**
* Perform REST PUT.
*
- * @param url the url
- * @param username the user name
- * @param password the password
- * @param headers any headers
+ * @param url the url
+ * @param username the user name
+ * @param password the password
+ * @param headers any headers
* @param contentType what the content type is
- * @param body body to send
+ * @param body body to send
* @return the response status code and the body
*/
- public Pair<Integer, String> put(String url, String username, String password,
- Map<String, String> headers, String contentType, String body) {
+ public Pair<Integer, String> put(String url, String username, String password, Map<String, String> headers,
+ String contentType, String body) {
HttpPut put = new HttpPut(url);
addHeaders(put, username, password, headers);
put.addHeader(CONTENT_TYPE, contentType);
@@ -87,16 +78,16 @@ public class RestManager {
/**
* Perform REST Post.
*
- * @param url the url
- * @param username the user name
- * @param password the password
- * @param headers any headers
+ * @param url the url
+ * @param username the user name
+ * @param password the password
+ * @param headers any headers
* @param contentType what the content type is
- * @param body body to send
+ * @param body body to send
* @return the response status code and the body
*/
- public Pair<Integer, String> post(String url, String username, String password,
- Map<String, String> headers, String contentType, String body) {
+ public Pair<Integer, String> post(String url, String username, String password, Map<String, String> headers,
+ String contentType, String body) {
HttpPost post = new HttpPost(url);
addHeaders(post, username, password, headers);
post.addHeader(CONTENT_TYPE, contentType);
@@ -114,14 +105,13 @@ public class RestManager {
/**
* Do a REST get.
*
- * @param url URL
+ * @param url URL
* @param username user name
* @param password password
- * @param headers any headers to add
+ * @param headers any headers to add
* @return a Pair for the response status and the body
*/
- public Pair<Integer, String> get(String url, String username, String password,
- Map<String, String> headers) {
+ public Pair<Integer, String> get(String url, String username, String password, Map<String, String> headers) {
HttpGet get = new HttpGet(url);
addHeaders(get, username, password, headers);
return sendRequest(get);
@@ -131,16 +121,16 @@ public class RestManager {
* Perform REST Delete. <br/>
* <i>Note: Many REST endpoints will return a 400 error for delete requests with a non-empty body</i>
*
- * @param url the url
- * @param username the user name
- * @param password the password
- * @param headers any headers
+ * @param url the url
+ * @param username the user name
+ * @param password the password
+ * @param headers any headers
* @param contentType what the content type is
- * @param body body (optional) to send
+ * @param body body (optional) to send
* @return the response status code and the body
*/
public Pair<Integer, String> delete(String url, String username, String password, Map<String, String> headers,
- String contentType, String body) {
+ String contentType, String body) {
HttpDeleteWithBody delete = new HttpDeleteWithBody(url);
addHeaders(delete, username, password, headers);
if (body != null && !body.isEmpty()) {
@@ -160,10 +150,10 @@ public class RestManager {
/**
* Perform REST Delete.
*
- * @param url the url
- * @param username the user name
- * @param password the password
- * @param headers any headers
+ * @param url the url
+ * @param username the user name
+ * @param password the password
+ * @param headers any headers
* @return the response status code and the body
*/
public Pair<Integer, String> delete(String url, String username, String password, Map<String, String> headers) {
@@ -175,15 +165,15 @@ public class RestManager {
/**
* Perform REST Patch.
*
- * @param url the url
- * @param username the user name
- * @param password the password
- * @param headers any headers
- * @param body body to send
+ * @param url the url
+ * @param username the user name
+ * @param password the password
+ * @param headers any headers
+ * @param body body to send
* @return the response status code and the body
*/
- public Pair<Integer, String> patch(String url, String username, String password,
- Map<String, String> headers, String body) {
+ public Pair<Integer, String> patch(String url, String username, String password, Map<String, String> headers,
+ String body) {
String contentType = "application/merge-patch+json";
HttpPatch patch = new HttpPatch(url);
addHeaders(patch, username, password, headers);
@@ -211,20 +201,15 @@ public class RestManager {
}
try (CloseableHttpClient client =
- HttpClientBuilder
- .create()
- .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
- .build()) {
+ HttpClientBuilder.create().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).build()) {
HttpResponse response = client.execute(request);
if (response != null) {
String returnBody = EntityUtils.toString(response.getEntity(), "UTF-8");
- logger.debug("HTTP Response Status Code: {}",
- response.getStatusLine().getStatusCode());
+ logger.debug("HTTP Response Status Code: {}", response.getStatusLine().getStatusCode());
logger.debug("HTTP Response Body:");
logger.debug(returnBody);
- return new Pair<>(response.getStatusLine().getStatusCode(),
- returnBody);
+ return Pair.of(response.getStatusLine().getStatusCode(), returnBody);
} else {
logger.error("Response from {} is null", request.getURI());
return null;
@@ -238,13 +223,12 @@ public class RestManager {
/**
* Add header to the request.
*
- * @param request http request to send
+ * @param request http request to send
* @param username the user name
* @param password the password
- * @param headers any headers
+ * @param headers any headers
*/
- private void addHeaders(HttpRequestBase request, String username, String password, Map<String,
- String> headers) {
+ private void addHeaders(HttpRequestBase request, String username, String password, Map<String, String> headers) {
String authHeader = makeAuthHeader(username, password);
if (headers != null) {
for (Entry<String, String> entry : headers.entrySet()) {
diff --git a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java b/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
deleted file mode 100644
index 2db9ebca0..000000000
--- a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * rest
- * ================================================================================
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.rest;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.onap.policy.rest.RestManager.Pair;
-
-public class PairTest {
-
- @Test
- public void testPair() {
- RestManager mgr = new RestManager();
-
- Pair<Integer, Integer> pii = mgr.new Pair<>(1, 2);
- assertEquals((Integer) 1, pii.first);
- assertEquals((Integer) 2, pii.second);
-
- Pair<Integer, String> pis = mgr.new Pair<>(1, "test");
- assertEquals((Integer) 1, pis.first);
- assertEquals("test", pis.second);
- }
-}
diff --git a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java b/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java
index 8c241c83e..52c0912e3 100644
--- a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java
+++ b/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java
@@ -3,7 +3,7 @@
* rest
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import org.apache.commons.lang3.tuple.Pair;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.endpoints.http.server.HttpServletServer;
import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
import org.onap.policy.common.utils.network.NetworkUtil;
-import org.onap.policy.rest.RestManager.Pair;
@Path("RestTest")
public class RestTest {
@@ -144,58 +144,60 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(getUri, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("GOT: " + EXPECT_STRING, result.second);
+
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("GOT: " + EXPECT_STRING, result.getRight());
result = mgr.delete(deleteUri, null, null, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("DELETE: " + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("DELETE: " + EXPECT_STRING, result.getRight());
result = mgr.delete(deleteUri, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("DELETE: " + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("DELETE: " + EXPECT_STRING, result.getRight());
result = mgr.put(putUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.put(putUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.post(postUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.post(postUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.patch(patchUri, null, null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.patch(patchUriBlank, null, null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.getRight());
+
}
@Test
@@ -203,52 +205,54 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(getUri, "", null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("GOT: " + EXPECT_STRING, result.second);
+
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("GOT: " + EXPECT_STRING, result.getRight());
result = mgr.delete(deleteUri, "", null, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("DELETE: " + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("DELETE: " + EXPECT_STRING, result.getRight());
result = mgr.put(putUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.put(putUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.post(postUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.post(postUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.patch(patchUri, "", null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.patch(patchUriBlank, "", null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.getRight());
+
}
@Test
@@ -256,52 +260,54 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(getUri, "user", null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("GOT: " + EXPECT_STRING, result.second);
+
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("GOT: " + EXPECT_STRING, result.getRight());
result = mgr.delete(deleteUri, "user", null, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("DELETE: " + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("DELETE: " + EXPECT_STRING, result.getRight());
result = mgr.put(putUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.put(putUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.post(postUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.post(postUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.getRight());
result = mgr.patch(patchUri, "user", null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.getRight());
result = mgr.patch(patchUriBlank, "user", null, null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.getRight());
+
}
@Test
@@ -309,19 +315,21 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/", null, null, null);
- assertEquals((Integer) 404, result.first);
+
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.delete(baseUri + "RestTest/DeleteHello/", null, null, null, null, null);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.put(baseUri + "RestTest/PutHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.post(baseUri + "RestTest/PostHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.patch(baseUri + "RestTest/PatchHello/", null, null, null, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
+
}
@Test
@@ -329,36 +337,38 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/" + NAME_PARAM, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("GOT: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
+
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("GOT: " + RETURN_STRING + NAME_PARAM + " aged 90", result.getRight());
result = mgr.delete(baseUri + "RestTest/DeleteHello/" + NAME_PARAM, null, null, null, null, null);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("DELETE: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("DELETE: " + RETURN_STRING + NAME_PARAM + " aged 90", result.getRight());
result = mgr.put(baseUri + "RestTest/PutHello/" + NAME_PARAM, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PUT: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PUT: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.getRight());
result = mgr.post(baseUri + "RestTest/PostHello/" + NAME_PARAM, null, null,
null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("POST: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("POST: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.getRight());
result = mgr.patch(baseUri + "RestTest/PatchHello/" + NAME_PARAM, null, null,
null, PAYLOAD);
- assertEquals((Integer) 200, result.first);
- assertTrue(result.second != null);
- assertTrue(result.second.length() > 0);
- assertEquals("PATCH: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second);
+ assertEquals((Integer) 200, result.getLeft());
+ assertTrue(result.getRight() != null);
+ assertTrue(result.getRight().length() > 0);
+ assertEquals("PATCH: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.getRight());
+
}
@Test
@@ -366,19 +376,21 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(baseUri + "NonExistant/URL/", null, null, null);
- assertEquals((Integer) 404, result.first);
+
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.delete(baseUri + "NonExistant/URL/", null, null, null, null, null);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.put(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.post(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
result = mgr.patch(baseUri + "NonExistant/URL/", null, null, null, PAYLOAD);
- assertEquals((Integer) 404, result.first);
+ assertEquals((Integer) 404, result.getLeft());
+
}
@Test
@@ -386,22 +398,24 @@ public class RestTest {
RestManager mgr = new RestManager();
Pair<Integer, String> result = mgr.get(deleteUri, null, null, null);
- assertEquals((Integer) 405, result.first);
+
+ assertEquals((Integer) 405, result.getLeft());
result = mgr.delete(getUri, null, null, null, null, null);
- assertEquals((Integer) 405, result.first);
+ assertEquals((Integer) 405, result.getLeft());
result = mgr.delete(getUri, null, null, null);
- assertEquals((Integer) 405, result.first);
+ assertEquals((Integer) 405, result.getLeft());
result = mgr.put(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 405, result.first);
+ assertEquals((Integer) 405, result.getLeft());
result = mgr.post(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD);
- assertEquals((Integer) 405, result.first);
+ assertEquals((Integer) 405, result.getLeft());
result = mgr.patch(getUri, null, null, null, PAYLOAD);
- assertEquals((Integer) 405, result.first);
+ assertEquals((Integer) 405, result.getLeft());
+
}
@GET