summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPrudence Au <prudence.au@amdocs.com>2018-09-07 11:34:21 -0400
committerPrudence Au <prudence.au@amdocs.com>2018-09-07 11:43:42 -0400
commit3b0cf71771ea4f4a08c19f24ee5e4b7614cb33d2 (patch)
tree991c6378ea298c61046c88b5f736476b37a22719 /src
parentf4c4eaf31ecfed85b658339c9402d227852a326a (diff)
Align consumer with version 1 of the API
Removed the need of CustomerId and ServiceType Change-Id: Icc4f04bf5d98f07984b6cac0450f201913482ea7 Signed-off-by: Prudence Au <prudence.au@amdocs.com> Issue-ID: LOG-439
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java30
-rw-r--r--src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java2
-rw-r--r--src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java26
3 files changed, 1 insertions, 57 deletions
diff --git a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
index d54ece4..83d1065 100644
--- a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
+++ b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java
@@ -56,22 +56,6 @@ public class POAEvent {
this.modelInvariantId = modelInvariantId;
}
- public String getCustomerId() {
- return customerId;
- }
-
- public void setCustomerId(String customerId) {
- this.customerId = customerId;
- }
-
- public String getServiceType() {
- return serviceType;
- }
-
- public void setServiceType(String serviceType) {
- this.serviceType = serviceType;
- }
-
public String getxFromAppId() {
return xFromAppId;
}
@@ -109,17 +93,6 @@ public class POAEvent {
"modelInvariantId" + missing);
}
- // customerId
- if (getCustomerId() == null || getCustomerId().isEmpty()) {
- throw new ContextAggregatorException(ContextAggregatorError.INVALID_EVENT_RECEIVED, "customerId" + missing);
- }
-
- // serviceType
- if (getServiceType() == null || getServiceType().isEmpty()) {
- throw new ContextAggregatorException(ContextAggregatorError.INVALID_EVENT_RECEIVED,
- "serviceType" + missing);
- }
-
// X-FromAppId
if (getxFromAppId() == null || getxFromAppId().isEmpty()) {
throw new ContextAggregatorException(ContextAggregatorError.INVALID_EVENT_RECEIVED, "xFromAppId" + missing);
@@ -137,7 +110,6 @@ public class POAEvent {
@Override
public String toString() {
return "POAEvent [serviceInstanceId=" + serviceInstanceId + ", modelVersionId=" + modelVersionId
- + ", modelInvariantId=" + modelInvariantId + ", customerId=" + customerId + ", serviceType="
- + serviceType + ", xFromAppId=" + xFromAppId + ", xTransactionId=" + xTransactionId + "]";
+ + ", modelInvariantId=" + modelInvariantId + ", xFromAppId=" + xFromAppId + ", xTransactionId=" + xTransactionId + "]";
}
}
diff --git a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
index 19bb85e..ffb2a2f 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
@@ -56,8 +56,6 @@ public class AggregatedModelsTest
pOAEvent.setServiceInstanceId("a");
pOAEvent.setModelVersionId("b");
pOAEvent.setModelInvariantId("c");
- pOAEvent.setCustomerId("d");
- pOAEvent.setServiceType("e");
pOAEvent.setxFromAppId("e");
pOAEvent.setxTransactionId("f");
}
diff --git a/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java b/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
index 016b72a..2afa260 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
@@ -39,8 +39,6 @@ public class POAEventTest
pOAEvent.setServiceInstanceId("a");
pOAEvent.setModelVersionId("b");
pOAEvent.setModelInvariantId("c");
- pOAEvent.setCustomerId("d");
- pOAEvent.setServiceType("e");
pOAEvent.setxFromAppId("e");
pOAEvent.setxTransactionId("f");
}
@@ -87,30 +85,6 @@ public class POAEventTest
}
@Test
- public void testValidateEmptyCustomerId() throws ContextAggregatorException {
- pOAEvent.setCustomerId("");
-
- try {
- pOAEvent.validate();
- }
- catch (ContextAggregatorException e){
- assertTrue(e.getMessage().contains("is missing"));
- }
- }
-
- @Test
- public void testValidateEmptyServiceType() throws ContextAggregatorException {
- pOAEvent.setServiceType("");
-
- try {
- pOAEvent.validate();
- }
- catch (ContextAggregatorException e){
- assertTrue(e.getMessage().contains("is missing"));
- }
- }
-
- @Test
public void testValidateEmptyxFromAppId() throws ContextAggregatorException {
pOAEvent.setxFromAppId("");