aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-02-01 12:18:10 -0800
committerTakamune Cho <takamune.cho@att.com>2019-02-01 21:50:14 +0000
commit47e8eed7c3b402827c7a62e0c2ec9489d6dfabc5 (patch)
tree280ae0280d7fc367668620df580036847a60930d
parent153172c09ca73be1b881e4dca229c5d91c660365 (diff)
Update rest return parameters
Change-Id: If5d860a37a87ac0feb6452173cf147bbafa079b3 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1381
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/onap/appc/adapter/rest/impl/TestRestAdapterImpl.java32
-rw-r--r--appc-core/appc-common-bundle/src/main/java/org/onap/appc/Constants.java8
2 files changed, 20 insertions, 20 deletions
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/onap/appc/adapter/rest/impl/TestRestAdapterImpl.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/onap/appc/adapter/rest/impl/TestRestAdapterImpl.java
index b4c96d5d5..f056ceb09 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/onap/appc/adapter/rest/impl/TestRestAdapterImpl.java
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/test/java/org/onap/appc/adapter/rest/impl/TestRestAdapterImpl.java
@@ -91,9 +91,9 @@ public class TestRestAdapterImpl {
adapter.commonGet(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("java.lang.IllegalArgumentException: HTTP request may not be null",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -109,9 +109,9 @@ public class TestRestAdapterImpl {
adapter.commonGet(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("org.apache.http.client.ClientProtocolException",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -140,9 +140,9 @@ public class TestRestAdapterImpl {
adapter.commonPost(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("java.lang.IllegalArgumentException: HTTP request may not be null",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -158,9 +158,9 @@ public class TestRestAdapterImpl {
adapter.commonPost(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("org.apache.http.client.ClientProtocolException",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -190,9 +190,9 @@ public class TestRestAdapterImpl {
adapter.commonPut(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("java.lang.IllegalArgumentException: HTTP request may not be null",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -208,9 +208,9 @@ public class TestRestAdapterImpl {
adapter.commonPut(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("org.apache.http.client.ClientProtocolException",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -237,9 +237,9 @@ public class TestRestAdapterImpl {
adapter.commonDelete(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("java.lang.IllegalArgumentException: HTTP request may not be null",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
@Test
@@ -255,9 +255,9 @@ public class TestRestAdapterImpl {
adapter.commonDelete(params, ctx);
assertEquals("failure", ctx.getStatus());
- assertEquals("500", ctx.getAttribute("org.openecomp.rest.result.code"));
+ assertEquals("500", ctx.getAttribute("org.onap.rest.result.code"));
assertEquals("org.apache.http.client.ClientProtocolException",
- ctx.getAttribute("org.openecomp.rest.result.message"));
+ ctx.getAttribute("org.onap.rest.result.message"));
}
private HttpRequestBase givenParams(Map<String, String> params, String method){
diff --git a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/Constants.java b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/Constants.java
index 5fab6bb31..80904ca31 100644
--- a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/Constants.java
+++ b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/Constants.java
@@ -58,19 +58,19 @@ public final class Constants {
* The name for the error message to be set in the context
*/
@SuppressWarnings("nls")
- public static final String CONTEXT_ERROR_MESSAGE = "org.openecomp.rest.result.message";
+ public static final String CONTEXT_ERROR_MESSAGE = "org.onap.rest.result.message";
@SuppressWarnings("nls")
- public static final String CONTEXT_AGENT_ERROR_MESSAGE = "org.openecomp.rest.agent.result.message";
+ public static final String CONTEXT_AGENT_ERROR_MESSAGE = "org.onap.rest.agent.result.message";
/**
* The name for the error code to be set in the context
*/
@SuppressWarnings("nls")
- public static final String CONTEXT_ERROR_CODE = "org.openecomp.rest.result.code";
+ public static final String CONTEXT_ERROR_CODE = "org.onap.rest.result.code";
@SuppressWarnings("nls")
- public static final String CONTEXT_AGENT_ERROR_CODE = "org.openecomp.rest.agent.result.code";
+ public static final String CONTEXT_AGENT_ERROR_CODE = "org.onap.rest.agent.result.code";
/**
* The name for the success message attribute to be set in the context