diff options
4 files changed, 4 insertions, 60 deletions
diff --git a/config/application.properties b/config/application.properties index 2320d0b..a74d9d8 100644 --- a/config/application.properties +++ b/config/application.properties @@ -3,9 +3,9 @@ server.port=9529 builders.properties.path=config/builders/ # Transport Configuration -transport.consume.host=<replace_with_host_or_ip> -transport.consume.port=<replace> -transport.consume.topic=POA-AUDIT-INIT +transport.consume.host=10.147.112.149 +transport.consume.port=30227 +transport.consume.topic=POA-AUDIT-INIT1 transport.consume.motsid=motsid@motsid.com transport.consume.pass=1234 transport.consume.consumergroup=audit1 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(""); |