From 5e4eb8c3bd9886e4c3ee2089b54236a01a99566b Mon Sep 17 00:00:00 2001 From: egernug Date: Fri, 21 Jun 2024 12:53:06 +0100 Subject: [PATCH] Create module structure in DMI Plugin To push the stub in to DMI Plugin the Plugin will need to be modulized akin to CPS/NCMP. This involves creating a new module in the repo and porting the packages in src into this module Issue-ID: CPS-2284 Change-Id: Iffa4eded4e49c220891fe73c30ea3b2f12a9e66d Signed-off-by: egernug --- {openapi => dmi-service/openapi}/components.yml | 0 .../openapi}/openapi-datajob.yml | 0 {openapi => dmi-service/openapi}/openapi.yml | 0 dmi-service/pom.xml | 660 +++++++++++++++++++++ .../java/org/onap/cps/ncmp/dmi/Application.java | 0 .../onap/cps/ncmp/dmi/config/DmiConfiguration.java | 0 .../onap/cps/ncmp/dmi/config/DmiPluginConfig.java | 0 .../cps/ncmp/dmi/config/WebSecurityConfig.java | 0 .../cps/ncmp/dmi/config/kafka/KafkaConfig.java | 0 .../rest/controller/DmiDatajobsRestController.java | 0 .../exception/CloudEventConstructionException.java | 0 .../exception/CmHandleRegistrationException.java | 0 .../onap/cps/ncmp/dmi/exception/DmiException.java | 0 .../ncmp/dmi/exception/DmiExceptionHandler.java | 0 .../dmi/exception/HttpClientRequestException.java | 0 .../dmi/exception/InvalidDatastoreException.java | 0 .../exception/ModuleResourceNotFoundException.java | 0 .../dmi/exception/ModulesNotFoundException.java | 0 .../onap/cps/ncmp/dmi/exception/SdncException.java | 0 .../dmi/notifications/async/AsyncTaskExecutor.java | 0 .../async/DmiAsyncRequestResponseEventCreator.java | 0 .../DmiAsyncRequestResponseEventProducer.java | 0 .../avc/DmiDataAvcCloudEventCreator.java | 0 .../notifications/avc/DmiDataAvcEventProducer.java | 0 .../avc/DmiDataAvcEventSimulationController.java | 0 ...NotificationSubscriptionDmiInEventConsumer.java | 0 ...nSubscriptionDmiOutEventToCloudEventMapper.java | 0 .../model/CmNotificationSubscriptionStatus.java | 0 .../dmi/notifications/mapper/CloudEventMapper.java | 0 .../dmi/rest/controller/DmiRestController.java | 0 .../rest/controller/handlers/DatastoreType.java | 0 .../org/onap/cps/ncmp/dmi/service/DmiService.java | 0 .../onap/cps/ncmp/dmi/service/DmiServiceImpl.java | 0 .../ncmp/dmi/service/YangResourceExtractor.java | 0 .../ncmp/dmi/service/client/NcmpRestClient.java | 0 .../dmi/service/client/SdncRestconfClient.java | 0 .../ncmp/dmi/service/model/CmHandleOperation.java | 0 .../ncmp/dmi/service/model/CreatedCmHandle.java | 0 .../ncmp/dmi/service/model/ModuleReference.java | 0 .../cps/ncmp/dmi/service/model/ModuleSchema.java | 0 .../ncmp/dmi/service/operation/SdncOperations.java | 0 .../src}/main/resources/application.yml | 0 .../src}/main/resources/logback-spring.xml | 0 .../ncmp/dmi/api/kafka/MessagingBaseSpec.groovy | 0 .../ncmp/dmi/config/DmiConfigurationSpec.groovy | 0 .../cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy | 0 .../ncmp/dmi/config/kafka/KafkaConfigSpec.groovy | 0 .../DmiDatajobsRestControllerSpec.groovy | 0 .../async/AsyncTaskExecutorIntegrationSpec.groovy | 0 .../avc/AvcEventExecutorIntegrationSpec.groovy | 0 ...cationSubscriptionDmiInEventConsumerSpec.groovy | 0 ...riptionDmiOutEventToCloudEventMapperSpec.groovy | 0 .../mapper/CloudEventMapperSpec.groovy | 0 .../rest/controller/ControllerSecuritySpec.groovy | 0 .../rest/controller/DmiRestControllerSpec.groovy | 0 .../cps/ncmp/dmi/service/DmiServiceImplSpec.groovy | 0 .../dmi/service/YangResourceExtractorSpec.groovy | 0 .../dmi/service/client/NcmpRestClientSpec.groovy | 0 .../service/client/SdncRestconfClientSpec.groovy | 0 .../service/operation/SdncOperationsSpec.groovy | 0 .../test/java/org/onap/cps/ncmp/dmi/TestUtils.java | 0 .../ncmp/dmi/rest/controller/TestController.java | 0 .../src}/test/resources/ModuleSchema.json | 0 .../src}/test/resources/application.yml | 0 .../cmNotificationSubscriptionCreationEvent.json | 0 .../test/resources/createDataWithNormalChar.json | 0 .../test/resources/createDataWithSpecialChar.json | 0 .../src}/test/resources/deleteData.json | 0 .../src}/test/resources/moduleResources.json | 0 .../src}/test/resources/patchData.json | 0 .../src}/test/resources/readData.json | 0 .../src}/test/resources/updateData.json | 0 pom.xml | 648 +------------------- 73 files changed, 664 insertions(+), 644 deletions(-) rename {openapi => dmi-service/openapi}/components.yml (100%) rename {openapi => dmi-service/openapi}/openapi-datajob.yml (100%) rename {openapi => dmi-service/openapi}/openapi.yml (100%) create mode 100644 dmi-service/pom.xml rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/Application.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java (100%) rename {src => dmi-service/src}/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java (100%) rename {src => dmi-service/src}/main/resources/application.yml (100%) rename {src => dmi-service/src}/main/resources/logback-spring.xml (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy (100%) rename {src => dmi-service/src}/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy (100%) rename {src => dmi-service/src}/test/java/org/onap/cps/ncmp/dmi/TestUtils.java (100%) rename {src => dmi-service/src}/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java (100%) rename {src => dmi-service/src}/test/resources/ModuleSchema.json (100%) rename {src => dmi-service/src}/test/resources/application.yml (100%) rename {src => dmi-service/src}/test/resources/cmNotificationSubscriptionCreationEvent.json (100%) rename {src => dmi-service/src}/test/resources/createDataWithNormalChar.json (100%) rename {src => dmi-service/src}/test/resources/createDataWithSpecialChar.json (100%) rename {src => dmi-service/src}/test/resources/deleteData.json (100%) rename {src => dmi-service/src}/test/resources/moduleResources.json (100%) rename {src => dmi-service/src}/test/resources/patchData.json (100%) rename {src => dmi-service/src}/test/resources/readData.json (100%) rename {src => dmi-service/src}/test/resources/updateData.json (100%) diff --git a/openapi/components.yml b/dmi-service/openapi/components.yml similarity index 100% rename from openapi/components.yml rename to dmi-service/openapi/components.yml diff --git a/openapi/openapi-datajob.yml b/dmi-service/openapi/openapi-datajob.yml similarity index 100% rename from openapi/openapi-datajob.yml rename to dmi-service/openapi/openapi-datajob.yml diff --git a/openapi/openapi.yml b/dmi-service/openapi/openapi.yml similarity index 100% rename from openapi/openapi.yml rename to dmi-service/openapi/openapi.yml diff --git a/dmi-service/pom.xml b/dmi-service/pom.xml new file mode 100644 index 00000000..033fd53d --- /dev/null +++ b/dmi-service/pom.xml @@ -0,0 +1,660 @@ + + + 4.0.0 + + org.onap.cps + ncmp-dmi-plugin + 1.6.0-SNAPSHOT + + + dmi-service + + + org.onap.cps.ncmp.dmi.Application + ${docker.pull.registry}/onap/integration-java17:12.0.0 + 3.4.9 + ${project.version}-${maven.build.timestamp} + 0.98 + yyyyMMdd'T'HHmmss'Z' + UTF-8 + + + + + org.springframework.boot + spring-boot-dependencies + 3.1.2 + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + 2022.0.3 + pom + import + + + com.google.code.gson + gson + 2.8.9 + + + io.swagger.core.v3 + swagger-annotations + 2.2.10 + + + io.cloudevents + cloudevents-json-jackson + 2.5.0 + + + io.cloudevents + cloudevents-kafka + 2.5.0 + + + io.cloudevents + cloudevents-spring + 2.5.0 + + + net.logstash.logback + logstash-logback-encoder + 7.0.1 + + + net.minidev + json-smart + 2.5.0 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.codehaus.groovy + groovy + 3.0.18 + + + org.spockframework + spock-core + 2.4-M1-groovy-3.0 + + + org.spockframework + spock-spring + 2.4-M1-groovy-3.0 + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.0.2 + + + org.testcontainers + testcontainers-bom + 1.18.3 + pom + import + + + org.codehaus.janino + janino + 3.1.10 + + + org.projectlombok + lombok + 1.18.24 + + + org.onap.cps + cps-ncmp-events + ${cps.version} + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-validation + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.kafka + spring-kafka + + + com.google.code.gson + gson + + + com.jayway.jsonpath + json-path + + + io.micrometer + micrometer-registry-prometheus + + + io.swagger.core.v3 + swagger-annotations + + + io.cloudevents + cloudevents-json-jackson + + + io.cloudevents + cloudevents-kafka + + + io.cloudevents + cloudevents-spring + + + net.logstash.logback + logstash-logback-encoder + + + net.minidev + json-smart + + + org.apache.httpcomponents + httpclient + + + + org.codehaus.groovy + groovy + + + org.codehaus.janino + janino + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-http + + + org.onap.cps + cps-ncmp-events + + + org.projectlombok + lombok + + + org.apache.httpcomponents.client5 + httpclient5 + + + + org.spockframework + spock-core + test + + + org.spockframework + spock-spring + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + org.springframework.kafka + spring-kafka-test + test + + + org.springframework.security + spring-security-test + test + + + org.testcontainers + spock + test + + + org.testcontainers + kafka + test + + + + + + src/main/resources + true + + + target/generated-sources/license + + third-party-licenses.txt + + + + target/generated-resources/licenses + + *.* + + third-party-licenses + + + + + org.openapitools + openapi-generator-maven-plugin + 6.6.0 + + + dmi-code-gen + + generate + + + ${project.basedir}/openapi/openapi.yml + spring + false + org.onap.cps.ncmp.dmi.rest.controller + org.onap.cps.ncmp.dmi.rest.api + org.onap.cps.ncmp.dmi.model + true + + src/gen/java + java11 + true + true + true + false + true + + + + + dmi-datajob-code-gen + + generate + + + ${project.basedir}/openapi/openapi-datajob.yml + spring + false + org.onap.cps.ncmp.dmi.datajobs.rest.controller + org.onap.cps.ncmp.dmi.datajobs.rest.api + org.onap.cps.ncmp.dmi.datajobs.model + true + + src/gen/java + java11 + true + true + true + false + true + + + + + openapi-yaml-gen + + generate + + compile + + ${project.basedir}/openapi/openapi.yml + openapi-yaml + + openapi/openapi.yaml + + + + + openapi-datajob-yaml-gen + + generate + + compile + + ${project.basedir}/openapi/openapi-datajob.yml + openapi-yaml + + openapi/openapi-datajob.yaml + + + + + + + maven-resources-plugin + + + copy-resources + compile + + copy-resources + + + ${project.basedir}/target/classes/static/api-docs + + + ${project.basedir}/target/generated-sources/openapi/openapi + + openapi*.yaml + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 3.1.2 + + + + build-info + repackage + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + + compileTests + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} + + **/*Spec.java + + + **/IT*.java + + + + true + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + onap-license + + check + + process-sources + + onap-checkstyle/check-license.xml + false + true + false + + ${project.build.sourceDirectory} + + false + warning + true + + + + onap-java-style + + check + + process-sources + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory} + + true + true + true + false + warning + true + + + + cps-java-style + + check + + process-sources + + cps-java-style.xml + + ${project.build.sourceDirectory} + + true + true + true + true + warning + true + + + + + + ${project.groupId} + checkstyle + ${cps.version} + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.4.2 + + + analyze-compile + compile + + check + + + + + + ${project.groupId} + spotbugs + ${cps.version} + compile + + + + + + jp.skypencil.findbugs.slf4j + bug-pattern + 1.5.0 + + + Max + Low + true + spotbugs-exclude.xml + true + true + ${basedir}/target/spotbugs + + + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + org/onap/cps/ncmp/dmi/model/* + org/onap/cps/ncmp/dmi/datajobs/model/* + + + + + default-prepare-agent + + prepare-agent + + + + coverage-check + + check + + + ${basedir}/target/code-coverage/jacoco-ut.exec + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + ${jacoco.minimum.coverage} + + + + + + + + report + verify + + report-aggregate + + + + **/code-coverage/jacoco-ut.exec + + + + + + + + + + com.google.cloud.tools + jib-maven-plugin + 3.3.2 + + + ${app} + USE_CURRENT_TIMESTAMP + + + ${base.image} + + + + latest + ${project.version}-latest + + ${docker.push.registry}/onap/${image.name}:${image.tag} + + + + + package + build + + dockerBuild + + + + deploy + buildAndPush + + build + + + + + + + + + + docker + + true + + + ncmp-dmi-plugin + + + + + com.google.cloud.tools + jib-maven-plugin + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/onap/cps/ncmp/dmi/Application.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/Application.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/Application.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/Application.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java diff --git a/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 similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java diff --git a/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/CmNotificationSubscriptionDmiInEventConsumer.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java diff --git a/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/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java similarity index 100% rename from src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java rename to dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java diff --git a/src/main/resources/application.yml b/dmi-service/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to dmi-service/src/main/resources/application.yml diff --git a/src/main/resources/logback-spring.xml b/dmi-service/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to dmi-service/src/main/resources/logback-spring.xml diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy diff --git a/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/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy diff --git a/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/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy diff --git a/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 similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy similarity index 100% rename from src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy rename to dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy diff --git a/src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java b/dmi-service/src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java similarity index 100% rename from src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java rename to dmi-service/src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java diff --git a/src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java b/dmi-service/src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java similarity index 100% rename from src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java rename to dmi-service/src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java diff --git a/src/test/resources/ModuleSchema.json b/dmi-service/src/test/resources/ModuleSchema.json similarity index 100% rename from src/test/resources/ModuleSchema.json rename to dmi-service/src/test/resources/ModuleSchema.json diff --git a/src/test/resources/application.yml b/dmi-service/src/test/resources/application.yml similarity index 100% rename from src/test/resources/application.yml rename to dmi-service/src/test/resources/application.yml diff --git a/src/test/resources/cmNotificationSubscriptionCreationEvent.json b/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json similarity index 100% rename from src/test/resources/cmNotificationSubscriptionCreationEvent.json rename to dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json diff --git a/src/test/resources/createDataWithNormalChar.json b/dmi-service/src/test/resources/createDataWithNormalChar.json similarity index 100% rename from src/test/resources/createDataWithNormalChar.json rename to dmi-service/src/test/resources/createDataWithNormalChar.json diff --git a/src/test/resources/createDataWithSpecialChar.json b/dmi-service/src/test/resources/createDataWithSpecialChar.json similarity index 100% rename from src/test/resources/createDataWithSpecialChar.json rename to dmi-service/src/test/resources/createDataWithSpecialChar.json diff --git a/src/test/resources/deleteData.json b/dmi-service/src/test/resources/deleteData.json similarity index 100% rename from src/test/resources/deleteData.json rename to dmi-service/src/test/resources/deleteData.json diff --git a/src/test/resources/moduleResources.json b/dmi-service/src/test/resources/moduleResources.json similarity index 100% rename from src/test/resources/moduleResources.json rename to dmi-service/src/test/resources/moduleResources.json diff --git a/src/test/resources/patchData.json b/dmi-service/src/test/resources/patchData.json similarity index 100% rename from src/test/resources/patchData.json rename to dmi-service/src/test/resources/patchData.json diff --git a/src/test/resources/readData.json b/dmi-service/src/test/resources/readData.json similarity index 100% rename from src/test/resources/readData.json rename to dmi-service/src/test/resources/readData.json diff --git a/src/test/resources/updateData.json b/dmi-service/src/test/resources/updateData.json similarity index 100% rename from src/test/resources/updateData.json rename to dmi-service/src/test/resources/updateData.json diff --git a/pom.xml b/pom.xml index 58c330fa..63ca7140 100644 --- a/pom.xml +++ b/pom.xml @@ -28,658 +28,18 @@ 3.3.0 + pom ONAP - CPS http://www.onap.org/ + + dmi-service + org.onap.cps ncmp-dmi-plugin 1.6.0-SNAPSHOT ncmp-dmi-plugin DMI Plugin Service - - org.onap.cps.ncmp.dmi.Application - ${docker.pull.registry}/onap/integration-java17:12.0.0 - 3.4.9 - ${project.version}-${maven.build.timestamp} - 0.98 - yyyyMMdd'T'HHmmss'Z' - UTF-8 - - - - - org.springframework.boot - spring-boot-dependencies - 3.1.2 - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - 2022.0.3 - pom - import - - - com.google.code.gson - gson - 2.8.9 - - - io.swagger.core.v3 - swagger-annotations - 2.2.10 - - - io.cloudevents - cloudevents-json-jackson - 2.5.0 - - - io.cloudevents - cloudevents-kafka - 2.5.0 - - - io.cloudevents - cloudevents-spring - 2.5.0 - - - net.logstash.logback - logstash-logback-encoder - 7.0.1 - - - net.minidev - json-smart - 2.5.0 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.codehaus.groovy - groovy - 3.0.18 - - - org.spockframework - spock-core - 2.4-M1-groovy-3.0 - - - org.spockframework - spock-spring - 2.4-M1-groovy-3.0 - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.0.2 - - - org.testcontainers - testcontainers-bom - 1.18.3 - pom - import - - - org.codehaus.janino - janino - 3.1.10 - - - org.projectlombok - lombok - 1.18.24 - - - org.onap.cps - cps-ncmp-events - ${cps.version} - - - org.apache.httpcomponents.client5 - httpclient5 - 5.2.1 - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.kafka - spring-kafka - - - com.google.code.gson - gson - - - com.jayway.jsonpath - json-path - - - io.micrometer - micrometer-registry-prometheus - - - io.swagger.core.v3 - swagger-annotations - - - io.cloudevents - cloudevents-json-jackson - - - io.cloudevents - cloudevents-kafka - - - io.cloudevents - cloudevents-spring - - - net.logstash.logback - logstash-logback-encoder - - - net.minidev - json-smart - - - org.apache.httpcomponents - httpclient - - - org.codehaus.groovy - groovy - - - org.codehaus.janino - janino - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-http - - - org.onap.cps - cps-ncmp-events - - - org.projectlombok - lombok - - - org.apache.httpcomponents.client5 - httpclient5 - - - - org.spockframework - spock-core - test - - - org.spockframework - spock-spring - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - org.springframework.kafka - spring-kafka-test - test - - - org.springframework.security - spring-security-test - test - - - org.testcontainers - spock - test - - - org.testcontainers - kafka - test - - - - - - src/main/resources - true - - - target/generated-sources/license - - third-party-licenses.txt - - - - target/generated-resources/licenses - - *.* - - third-party-licenses - - - - - org.openapitools - openapi-generator-maven-plugin - 6.6.0 - - - dmi-code-gen - - generate - - - ${project.basedir}/openapi/openapi.yml - spring - false - org.onap.cps.ncmp.dmi.rest.controller - org.onap.cps.ncmp.dmi.rest.api - org.onap.cps.ncmp.dmi.model - true - - src/gen/java - java11 - true - true - true - false - true - - - - - dmi-datajob-code-gen - - generate - - - ${project.basedir}/openapi/openapi-datajob.yml - spring - false - org.onap.cps.ncmp.dmi.datajobs.rest.controller - org.onap.cps.ncmp.dmi.datajobs.rest.api - org.onap.cps.ncmp.dmi.datajobs.model - true - - src/gen/java - java11 - true - true - true - false - true - - - - - openapi-yaml-gen - - generate - - compile - - ${project.basedir}/openapi/openapi.yml - openapi-yaml - - openapi/openapi.yaml - - - - - openapi-datajob-yaml-gen - - generate - - compile - - ${project.basedir}/openapi/openapi-datajob.yml - openapi-yaml - - openapi/openapi-datajob.yaml - - - - - - - maven-resources-plugin - - - copy-resources - compile - - copy-resources - - - ${project.basedir}/target/classes/static/api-docs - - - ${project.basedir}/target/generated-sources/openapi/openapi - - openapi*.yaml - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 3.1.2 - - - - build-info - repackage - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - compileTests - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${surefireArgLine} - - **/*Spec.java - - - **/IT*.java - - - - true - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - onap-license - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - - ${project.build.sourceDirectory} - - false - warning - true - - - - onap-java-style - - check - - process-sources - - onap-checkstyle/onap-java-style.xml - - ${project.build.sourceDirectory} - - true - true - true - false - warning - true - - - - cps-java-style - - check - - process-sources - - cps-java-style.xml - - ${project.build.sourceDirectory} - - true - true - true - true - warning - true - - - - - - ${project.groupId} - checkstyle - ${cps.version} - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.4.2 - - - analyze-compile - compile - - check - - - - - - ${project.groupId} - spotbugs - ${cps.version} - compile - - - - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.5.0 - - - Max - Low - true - spotbugs-exclude.xml - true - true - ${basedir}/target/spotbugs - - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - org/onap/cps/ncmp/dmi/model/* - org/onap/cps/ncmp/dmi/datajobs/model/* - - - - - default-prepare-agent - - prepare-agent - - - - coverage-check - - check - - - ${basedir}/target/code-coverage/jacoco-ut.exec - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${jacoco.minimum.coverage} - - - - - - - - report - verify - - report-aggregate - - - - **/code-coverage/jacoco-ut.exec - - - - - - - - - - com.google.cloud.tools - jib-maven-plugin - 3.3.2 - - - ${app} - USE_CURRENT_TIMESTAMP - - - ${base.image} - - - - latest - ${project.version}-latest - - ${docker.push.registry}/onap/${image.name}:${image.tag} - - - - - package - build - - dockerBuild - - - - deploy - buildAndPush - - build - - - - - - - - - - docker - - true - - - ncmp-dmi-plugin - - - - - com.google.cloud.tools - jib-maven-plugin - - - - - -- 2.16.6