diff options
9 files changed, 65 insertions, 69 deletions
diff --git a/dmi-service/pom.xml b/dmi-service/pom.xml index f161a96a..0e75008b 100644 --- a/dmi-service/pom.xml +++ b/dmi-service/pom.xml @@ -14,7 +14,7 @@ <properties> <app>org.onap.cps.ncmp.dmi.Application</app> <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image> - <cps.version>3.4.9</cps.version> + <cps.version>3.5.2</cps.version> <image.tag>${project.version}-${maven.build.timestamp}</image.tag> <jacoco.minimum.coverage>0.98</jacoco.minimum.coverage> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> diff --git a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java index b8bd277d..7dcc0122 100644 --- a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java +++ b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java @@ -39,7 +39,6 @@ import org.onap.cps.ncmp.events.avc1_0_0.DatastoreChanges; import org.onap.cps.ncmp.events.avc1_0_0.Edit; import org.onap.cps.ncmp.events.avc1_0_0.IetfYangPatchYangPatch; import org.onap.cps.ncmp.events.avc1_0_0.PushChangeUpdate; -import org.onap.cps.ncmp.events.avc1_0_0.Value; /** * Helper to create AvcEvents. @@ -84,14 +83,12 @@ public class DmiDataAvcCloudEventCreator { final IetfYangPatchYangPatch ietfYangPatchYangPatch = new IetfYangPatchYangPatch(); ietfYangPatchYangPatch.setPatchId("abcd"); final Edit edit1 = new Edit(); - final Value value = new Value(); final Map<String, Object> attributeMap = new LinkedHashMap<>(); attributeMap.put("isHoAllowed", false); - value.setAttributes(List.of(attributeMap)); edit1.setEditId("editId"); edit1.setOperation("replace"); edit1.setTarget("target_xpath"); - edit1.setValue(value); + edit1.setValue(List.of(attributeMap)); ietfYangPatchYangPatch.setEdit(List.of(edit1)); datastoreChanges.setIetfYangPatchYangPatch(ietfYangPatchYangPatch); pushChangeUpdate.setDatastoreChanges(datastoreChanges); diff --git a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiInEventConsumer.java index 3a9838b0..9df74504 100644 --- a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java +++ b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiInEventConsumer.java @@ -25,9 +25,9 @@ import lombok.RequiredArgsConstructor; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.onap.cps.ncmp.dmi.notifications.cmsubscription.model.CmNotificationSubscriptionStatus; import org.onap.cps.ncmp.dmi.notifications.mapper.CloudEventMapper; -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.CmNotificationSubscriptionDmiOutEvent; -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.Data; -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.ncmp_to_dmi.CmNotificationSubscriptionDmiInEvent; +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.Data; +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.DmiOutEvent; +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.ncmp_to_dmi.DmiInEvent; import org.springframework.beans.factory.annotation.Value; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.core.KafkaTemplate; @@ -35,31 +35,31 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor -public class CmNotificationSubscriptionDmiInEventConsumer { +public class DmiInEventConsumer { @Value("${app.dmi.avc.cm-subscription-dmi-out}") - private String cmNotificationSubscriptionDmiOutTopic; + private String dmoOutEventTopic; @Value("${dmi.service.name}") private String dmiName; private final KafkaTemplate<String, CloudEvent> cloudEventKafkaTemplate; /** - * Consume the cmNotificationSubscriptionDmiInCloudEvent event. + * Consume the DmiInCloudEvent. * - * @param cmNotificationSubscriptionDmiInCloudEvent the event to be consumed + * @param dmiInCloudEvent the event to be consumed */ @KafkaListener(topics = "${app.dmi.avc.cm-subscription-dmi-in}", containerFactory = "cloudEventConcurrentKafkaListenerContainerFactory") - public void consumeCmNotificationSubscriptionDmiInEvent( - final ConsumerRecord<String, CloudEvent> cmNotificationSubscriptionDmiInCloudEvent) { - final CmNotificationSubscriptionDmiInEvent cmNotificationSubscriptionDmiInEvent = - CloudEventMapper.toTargetEvent(cmNotificationSubscriptionDmiInCloudEvent.value(), - CmNotificationSubscriptionDmiInEvent.class); + public void consumeDmiInEvent( + final ConsumerRecord<String, CloudEvent> dmiInCloudEvent) { + final DmiInEvent cmNotificationSubscriptionDmiInEvent = + CloudEventMapper.toTargetEvent(dmiInCloudEvent.value(), + DmiInEvent.class); if (cmNotificationSubscriptionDmiInEvent != null) { - final String subscriptionId = cmNotificationSubscriptionDmiInCloudEvent.value().getId(); - final String subscriptionType = cmNotificationSubscriptionDmiInCloudEvent.value().getType(); - final String correlationId = String.valueOf(cmNotificationSubscriptionDmiInCloudEvent.value() + final String subscriptionId = dmiInCloudEvent.value().getId(); + final String subscriptionType = dmiInCloudEvent.value().getType(); + final String correlationId = String.valueOf(dmiInCloudEvent.value() .getExtension("correlationid")); if ("subscriptionCreateRequest".equals(subscriptionType)) { @@ -84,21 +84,21 @@ public class CmNotificationSubscriptionDmiInEventConsumer { final String eventKey, final String subscriptionType, final String correlationId, final CmNotificationSubscriptionStatus cmNotificationSubscriptionStatus) { - final CmNotificationSubscriptionDmiOutEvent cmNotificationSubscriptionDmiOutEvent = - new CmNotificationSubscriptionDmiOutEvent(); - final Data cmNotificationSubscriptionDmiOutEventData = new Data(); + final DmiOutEvent cmNotificationSubscriptionDmiOutEvent = + new DmiOutEvent(); + final Data dmiOutEventData = new Data(); if (cmNotificationSubscriptionStatus.equals(CmNotificationSubscriptionStatus.ACCEPTED)) { - cmNotificationSubscriptionDmiOutEventData.setStatusCode("1"); - cmNotificationSubscriptionDmiOutEventData.setStatusMessage("ACCEPTED"); + dmiOutEventData.setStatusCode("1"); + dmiOutEventData.setStatusMessage("ACCEPTED"); } else { - cmNotificationSubscriptionDmiOutEventData.setStatusCode("104"); - cmNotificationSubscriptionDmiOutEventData.setStatusMessage("REJECTED"); + dmiOutEventData.setStatusCode("104"); + dmiOutEventData.setStatusMessage("REJECTED"); } - cmNotificationSubscriptionDmiOutEvent.setData(cmNotificationSubscriptionDmiOutEventData); + cmNotificationSubscriptionDmiOutEvent.setData(dmiOutEventData); - cloudEventKafkaTemplate.send(cmNotificationSubscriptionDmiOutTopic, eventKey, - CmNotificationSubscriptionDmiOutEventToCloudEventMapper.toCloudEvent(cmNotificationSubscriptionDmiOutEvent, + cloudEventKafkaTemplate.send(dmoOutEventTopic, eventKey, + DmiOutEventToCloudEventMapper.toCloudEvent(cmNotificationSubscriptionDmiOutEvent, subscriptionType, dmiName, correlationId)); } diff --git a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiOutEventToCloudEventMapper.java index 51205da2..fd42c400 100644 --- a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java +++ b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiOutEventToCloudEventMapper.java @@ -28,23 +28,23 @@ import java.util.UUID; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException; -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.CmNotificationSubscriptionDmiOutEvent; +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.DmiOutEvent; @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class CmNotificationSubscriptionDmiOutEventToCloudEventMapper { +public class DmiOutEventToCloudEventMapper { private static final ObjectMapper objectMapper = new ObjectMapper(); /** * Maps SubscriptionEventResponse to a CloudEvent. * - * @param cmSubscriptionDmiOutEvent object. + * @param dmiOutEvent object. * @param subscriptionType String of subscription type. * @param dmiName String of dmiName. * @param correlationId String of correlationId. * @return CloudEvent built. */ - public static CloudEvent toCloudEvent(final CmNotificationSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent, + public static CloudEvent toCloudEvent(final DmiOutEvent dmiOutEvent, final String subscriptionType, final String dmiName, final String correlationId) { try { @@ -52,7 +52,7 @@ public class CmNotificationSubscriptionDmiOutEventToCloudEventMapper { .withType(subscriptionType) .withDataSchema(URI.create("urn:cps:org.onap.ncmp.dmi.cm.subscription:1.0.0")) .withExtension("correlationid", correlationId) - .withData(objectMapper.writeValueAsBytes(cmSubscriptionDmiOutEvent)).build(); + .withData(objectMapper.writeValueAsBytes(dmiOutEvent)).build(); } catch (final Exception ex) { throw new CloudEventConstructionException("The Cloud Event could not be constructed", "Invalid object passed", ex); diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiInEventConsumerSpec.groovy index f1f476f6..52fa3794 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiInEventConsumerSpec.groovy @@ -32,12 +32,11 @@ import org.onap.cps.ncmp.dmi.TestUtils import org.onap.cps.ncmp.dmi.api.kafka.MessagingBaseSpec import org.onap.cps.ncmp.dmi.notifications.cmsubscription.model.CmNotificationSubscriptionStatus import org.onap.cps.ncmp.dmi.notifications.mapper.CloudEventMapper -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.CmNotificationSubscriptionDmiOutEvent -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.Data -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.ncmp_to_dmi.CmNotificationSubscriptionDmiInEvent +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.Data +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.DmiOutEvent +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.ncmp_to_dmi.DmiInEvent import org.slf4j.LoggerFactory import org.spockframework.spring.SpringBean -import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.annotation.DirtiesContext import org.testcontainers.spock.Testcontainers @@ -49,13 +48,13 @@ import java.time.ZoneId @Testcontainers @DirtiesContext -class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec { +class DmiInEventConsumerSpec extends MessagingBaseSpec { def objectMapper = new ObjectMapper() def testTopic = 'dmi-ncmp-cm-avc-subscription' def testDmiName = 'test-ncmp-dmi' @SpringBean - CmNotificationSubscriptionDmiInEventConsumer objectUnderTest = new CmNotificationSubscriptionDmiInEventConsumer(cloudEventKafkaTemplate) + DmiInEventConsumer objectUnderTest = new DmiInEventConsumer(cloudEventKafkaTemplate) def logger = Spy(ListAppender<ILoggingEvent>) @@ -71,11 +70,11 @@ class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec def 'Sends subscription cloud event response successfully.'() { given: 'an subscription event response' objectUnderTest.dmiName = testDmiName - objectUnderTest.cmNotificationSubscriptionDmiOutTopic = testTopic + objectUnderTest.dmoOutEventTopic = testTopic def correlationId = 'test-subscriptionId#test-ncmp-dmi' def cmSubscriptionDmiOutEventData = new Data(statusCode: subscriptionStatusCode, statusMessage: subscriptionStatusMessage) def subscriptionEventResponse = - new CmNotificationSubscriptionDmiOutEvent().withData(cmSubscriptionDmiOutEventData) + new DmiOutEvent().withData(cmSubscriptionDmiOutEventData) and: 'consumer has a subscription' kafkaConsumer.subscribe([testTopic] as List<String>) when: 'an event is published' @@ -92,9 +91,9 @@ class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec assert expectedValue == record.value assert eventKey == record.key where: 'given #scenario' - scenario | subscriptionAcceptanceType | subscriptionStatusCode | subscriptionStatusMessage - 'Subscription is Accepted' | CmNotificationSubscriptionStatus.ACCEPTED | '1' | 'ACCEPTED' - 'Subscription is Rejected' | CmNotificationSubscriptionStatus.REJECTED | '104' | 'REJECTED' + scenario | subscriptionAcceptanceType | subscriptionStatusCode | subscriptionStatusMessage + 'Subscription is Accepted' | CmNotificationSubscriptionStatus.ACCEPTED | '1' | 'ACCEPTED' + 'Subscription is Rejected' | CmNotificationSubscriptionStatus.REJECTED | '104' | 'REJECTED' } def 'Consume valid message.'() { @@ -103,17 +102,17 @@ class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec def eventKey = UUID.randomUUID().toString() def timestamp = new Timestamp(1679521929511) def jsonData = TestUtils.getResourceFileContent('cmNotificationSubscriptionCreationEvent.json') - def subscriptionEvent = objectMapper.readValue(jsonData, CmNotificationSubscriptionDmiInEvent.class) - objectUnderTest.cmNotificationSubscriptionDmiOutTopic = testTopic + def subscriptionEvent = objectMapper.readValue(jsonData, DmiInEvent.class) + objectUnderTest.dmoOutEventTopic = testTopic def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) .withType(subscriptionType) - .withDataSchema(URI.create("urn:cps:" + CmNotificationSubscriptionDmiInEvent.class.getName() + ":1.0.0")) + .withDataSchema(URI.create("urn:cps:" + DmiInEvent.class.getName() + ":1.0.0")) .withExtension("correlationid", eventKey) .withTime(OffsetDateTime.ofInstant(timestamp.toInstant(), ZoneId.of("UTC"))) .withData(objectMapper.writeValueAsBytes(subscriptionEvent)).build() def testEventSent = new ConsumerRecord<String, CloudEvent>('topic-name', 0, 0, eventKey, cloudEvent) when: 'the valid event is consumed' - objectUnderTest.consumeCmNotificationSubscriptionDmiInEvent(testEventSent) + objectUnderTest.consumeDmiInEvent(testEventSent) then: 'no exception is thrown' noExceptionThrown() where: 'given #scenario' @@ -128,7 +127,7 @@ class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec def eventKey = UUID.randomUUID().toString() def timestamp = new Timestamp(1679521929511) def invalidJsonBody = "/////" - objectUnderTest.cmNotificationSubscriptionDmiOutTopic = testTopic + objectUnderTest.dmoOutEventTopic = testTopic def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) .withType("subscriptionCreated") .withDataSchema(URI.create("urn:cps:org.onap.ncmp.dmi.cm.subscription:1.0.0")) @@ -136,7 +135,7 @@ class CmNotificationSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec .withExtension("correlationid", eventKey).withData(objectMapper.writeValueAsBytes(invalidJsonBody)).build() def testEventSent = new ConsumerRecord<String, CloudEvent>('topic-name', 0, 0, eventKey, cloudEvent) when: 'the invalid event is consumed' - objectUnderTest.consumeCmNotificationSubscriptionDmiInEvent(testEventSent) + objectUnderTest.consumeDmiInEvent(testEventSent) then: 'exception is thrown and event is logged' def loggingEvent = getLoggingEvent() assert loggingEvent.level == Level.ERROR diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiOutEventToCloudEventMapperSpec.groovy index 8ca629f1..95ac93f0 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/DmiOutEventToCloudEventMapperSpec.groovy @@ -23,21 +23,21 @@ package org.onap.cps.ncmp.dmi.notifications.cmsubscription import com.fasterxml.jackson.databind.ObjectMapper import io.cloudevents.core.builder.CloudEventBuilder import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.CmNotificationSubscriptionDmiOutEvent -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.dmi_to_ncmp.Data +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.Data +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.dmi_to_ncmp.DmiOutEvent import org.spockframework.spring.SpringBean import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import spock.lang.Specification @SpringBootTest(classes = [ObjectMapper]) -class CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec extends Specification { +class DmiOutEventToCloudEventMapperSpec extends Specification { @Autowired def objectMapper = new ObjectMapper() @SpringBean - CmNotificationSubscriptionDmiOutEventToCloudEventMapper objectUnderTest = new CmNotificationSubscriptionDmiOutEventToCloudEventMapper() + DmiOutEventToCloudEventMapper objectUnderTest = new DmiOutEventToCloudEventMapper() def 'Convert a Cm Subscription DMI Out Event to CloudEvent successfully.'() { given: 'a Cm Subscription DMI Out Event and an event key' @@ -45,13 +45,13 @@ class CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec extends Specif def correlationId = 'subscription1#test-ncmp-dmi' def cmSubscriptionDmiOutEventData = new Data(statusCode: "1", statusMessage: "accepted") def cmSubscriptionDmiOutEvent = - new CmNotificationSubscriptionDmiOutEvent().withData(cmSubscriptionDmiOutEventData) + new DmiOutEvent().withData(cmSubscriptionDmiOutEventData) when: 'a Cm Subscription DMI Out Event is converted' def result = objectUnderTest.toCloudEvent(cmSubscriptionDmiOutEvent, "subscriptionCreatedStatus", dmiName, correlationId) then: 'Cm Subscription DMI Out Event is converted as expected' def expectedCloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) .withType("subscriptionCreated") - .withDataSchema(URI.create("urn:cps:" + CmNotificationSubscriptionDmiOutEvent.class.getName() + ":1.0.0")) + .withDataSchema(URI.create("urn:cps:" + DmiOutEvent.class.getName() + ":1.0.0")) .withExtension("correlationid", correlationId) .withData(objectMapper.writeValueAsBytes(cmSubscriptionDmiOutEvent)).build() assert expectedCloudEvent.data == result.data @@ -60,9 +60,9 @@ class CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec extends Specif def 'Map the Cloud Event to data of the subscription event with null parameters causes an exception'() { given: 'an empty subscription response event and event key' def correlationId = 'subscription1#test-ncmp-dmi' - def cmSubscriptionDmiOutEvent = new CmNotificationSubscriptionDmiOutEvent() + def dmiOutEvent = new DmiOutEvent() when: 'the cm subscription dmi out Event map to data of cloud event' - objectUnderTest.toCloudEvent(cmSubscriptionDmiOutEvent, "subscriptionCreatedStatus", null , correlationId) + objectUnderTest.toCloudEvent(dmiOutEvent, "subscriptionCreatedStatus", null , correlationId) then: 'a run time exception is thrown' thrown(CloudEventConstructionException) } diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy index 0b404776..7393b669 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy @@ -22,7 +22,7 @@ package org.onap.cps.ncmp.dmi.notifications.mapper import com.fasterxml.jackson.databind.ObjectMapper import io.cloudevents.core.builder.CloudEventBuilder -import org.onap.cps.ncmp.events.cmnotificationsubscription_merge1_0_0.client_to_ncmp.CmNotificationSubscriptionNcmpInEvent +import org.onap.cps.ncmp.impl.cmnotificationsubscription_1_0_0.client_to_ncmp.NcmpInEvent import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import spock.lang.Specification @@ -38,12 +38,12 @@ class CloudEventMapperSpec extends Specification { assert mappedCloudEvent == (CloudEventMapper.toTargetEvent(testCloudEvent(), targetClass) != null) where: 'below are the scenarios' scenario | targetClass || mappedCloudEvent - 'valid concrete type' | CmNotificationSubscriptionNcmpInEvent.class || true + 'valid concrete type' | NcmpInEvent.class || true 'invalid concrete type' | ArrayList.class || false } def testCloudEvent() { - return CloudEventBuilder.v1().withData(objectMapper.writeValueAsBytes(new CmNotificationSubscriptionNcmpInEvent())) + return CloudEventBuilder.v1().withData(objectMapper.writeValueAsBytes(new NcmpInEvent())) .withId("cmhandle1") .withSource(URI.create('test-source')) .withDataSchema(URI.create('test')) diff --git a/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json b/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json index 3b780976..7f8adb39 100644 --- a/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json +++ b/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json @@ -1,22 +1,22 @@ { "data": { - "cmhandles": [ + "cmHandles": [ { "cmhandleId": "CMHandle1", - "private-properties": { + "privateProperties": { "prop1": "prop-value" } }, { "cmhandleId": "CMHandle2", - "private-properties": { + "privateProperties": { "prop-x": "prop-valuex", "prop-p": "prop-valuep" } }, { "cmhandleId": "CMHandle3", - "private-properties": { + "privateProperties": { "prop-y": "prop-valuey" } } @@ -30,7 +30,7 @@ ], "scopeFilter": { "datastore": "ncmp-datastore:passthrough-running", - "xpath-filter": [ + "xpathFilter": [ "//_3gpp-nr-nrm-gnbdufunction:GNBDUFunction/_3gpp-nr-nrm-nrcelldu:NRCellDU/", "//_3gpp-nr-nrm-gnbcuupfunction:GNBCUUPFunction//", "//_3gpp-nr-nrm-gnbcucpfunction:GNBCUCPFunction/_3gpp-nr-nrm-nrcelldu:NRCellCU//", diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml index 64cdeb5b..e8d88ddd 100644 --- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml +++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml @@ -91,7 +91,7 @@ <dependency> <groupId>org.onap.cps</groupId> <artifactId>cps-ncmp-events</artifactId> - <version>3.4.9</version> + <version>3.5.2</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> |