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

2 files changed, 0 insertions, 28 deletions

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("");