diff options
author | egernug <gerard.nugent@est.tech> | 2024-06-21 12:53:06 +0100 |
---|---|---|
committer | egernug <gerard.nugent@est.tech> | 2024-06-24 16:14:08 +0100 |
commit | 5e4eb8c3bd9886e4c3ee2089b54236a01a99566b (patch) | |
tree | 1f0870f83ea9a79c90ae34deffad8618000d144c | |
parent | 92de0b14a9fca76ce2da53c9533c16d7c17eab5e (diff) |
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 <gerard.nugent@est.tech>
-rw-r--r-- | dmi-service/openapi/components.yml (renamed from openapi/components.yml) | 0 | ||||
-rw-r--r-- | dmi-service/openapi/openapi-datajob.yml (renamed from openapi/openapi-datajob.yml) | 0 | ||||
-rw-r--r-- | dmi-service/openapi/openapi.yml (renamed from openapi/openapi.yml) | 0 | ||||
-rw-r--r-- | dmi-service/pom.xml | 660 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/Application.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/Application.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfig.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/CloudEventConstructionException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/CmHandleRegistrationException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/DmiException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/DmiExceptionHandler.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/HttpClientRequestException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/InvalidDatastoreException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/ModuleResourceNotFoundException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/ModulesNotFoundException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/exception/SdncException.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutor.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventCreator.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/async/DmiAsyncRequestResponseEventProducer.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcCloudEventCreator.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventProducer.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventSimulationController.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumer.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapper.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/cmsubscription/model/CmNotificationSubscriptionStatus.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapper.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/rest/controller/handlers/DatastoreType.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/YangResourceExtractor.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/client/NcmpRestClient.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClient.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/model/CmHandleOperation.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/model/CreatedCmHandle.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleReference.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/model/ModuleSchema.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java (renamed from src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/resources/application.yml (renamed from src/main/resources/application.yml) | 0 | ||||
-rw-r--r-- | dmi-service/src/main/resources/logback-spring.xml (renamed from src/main/resources/logback-spring.xml) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/api/kafka/MessagingBaseSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/config/kafka/KafkaConfigSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/async/AsyncTaskExecutorIntegrationSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/avc/AvcEventExecutorIntegrationSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiInEventConsumerSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmNotificationSubscriptionDmiOutEventToCloudEventMapperSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/notifications/mapper/CloudEventMapperSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/ControllerSecuritySpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/service/YangResourceExtractorSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/service/client/NcmpRestClientSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/service/client/SdncRestconfClientSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy (renamed from src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java (renamed from src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java (renamed from src/test/java/org/onap/cps/ncmp/dmi/rest/controller/TestController.java) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/ModuleSchema.json (renamed from src/test/resources/ModuleSchema.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/application.yml (renamed from src/test/resources/application.yml) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json (renamed from src/test/resources/cmNotificationSubscriptionCreationEvent.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/createDataWithNormalChar.json (renamed from src/test/resources/createDataWithNormalChar.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/createDataWithSpecialChar.json (renamed from src/test/resources/createDataWithSpecialChar.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/deleteData.json (renamed from src/test/resources/deleteData.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/moduleResources.json (renamed from src/test/resources/moduleResources.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/patchData.json (renamed from src/test/resources/patchData.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/readData.json (renamed from src/test/resources/readData.json) | 0 | ||||
-rw-r--r-- | dmi-service/src/test/resources/updateData.json (renamed from src/test/resources/updateData.json) | 0 | ||||
-rw-r--r-- | pom.xml | 648 |
73 files changed, 664 insertions, 644 deletions
diff --git a/openapi/components.yml b/dmi-service/openapi/components.yml index 4a6d1729..4a6d1729 100644 --- a/openapi/components.yml +++ b/dmi-service/openapi/components.yml diff --git a/openapi/openapi-datajob.yml b/dmi-service/openapi/openapi-datajob.yml index 989218d9..989218d9 100644 --- a/openapi/openapi-datajob.yml +++ b/dmi-service/openapi/openapi-datajob.yml diff --git a/openapi/openapi.yml b/dmi-service/openapi/openapi.yml index 6dbc19f3..6dbc19f3 100644 --- a/openapi/openapi.yml +++ b/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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.cps</groupId> + <artifactId>ncmp-dmi-plugin</artifactId> + <version>1.6.0-SNAPSHOT</version> + </parent> + + <artifactId>dmi-service</artifactId> + + <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> + <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> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>3.1.2</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>2022.0.3</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.9</version> + </dependency> + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> + <version>2.2.10</version> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-json-jackson</artifactId> + <version>2.5.0</version> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-kafka</artifactId> + <version>2.5.0</version> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-spring</artifactId> + <version>2.5.0</version> + </dependency> + <dependency> + <groupId>net.logstash.logback</groupId> + <artifactId>logstash-logback-encoder</artifactId> + <version>7.0.1</version> + </dependency> + <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <version>2.5.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.13</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>3.0.18</version> + </dependency> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-core</artifactId> + <version>2.4-M1-groovy-3.0</version> + </dependency> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-spring</artifactId> + <version>2.4-M1-groovy-3.0</version> + </dependency> + <dependency> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-bom</artifactId> + <version>1.18.3</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + <version>3.1.10</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.24</version> + </dependency> + <dependency> + <groupId>org.onap.cps</groupId> + <artifactId>cps-ncmp-events</artifactId> + <version>${cps.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <version>5.2.1</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> + <dependency> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.kafka</groupId> + <artifactId>spring-kafka</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + </dependency> + <dependency> + <groupId>io.micrometer</groupId> + <artifactId>micrometer-registry-prometheus</artifactId> + </dependency> + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-json-jackson</artifactId> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-kafka</artifactId> + </dependency> + <dependency> + <groupId>io.cloudevents</groupId> + <artifactId>cloudevents-spring</artifactId> + </dependency> + <dependency> + <groupId>net.logstash.logback</groupId> + <artifactId>logstash-logback-encoder</artifactId> + </dependency> + <dependency> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </dependency> + <dependency> + <groupId>org.onap.cps</groupId> + <artifactId>cps-ncmp-events</artifactId> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + </dependency> + <!-- T E S T - D E P E N D E N C I E S --> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.spockframework</groupId> + <artifactId>spock-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.kafka</groupId> + <artifactId>spring-kafka-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>spock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>kafka</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>target/generated-sources/license</directory> + <includes> + <include>third-party-licenses.txt</include> + </includes> + </resource> + <resource> + <directory>target/generated-resources/licenses</directory> + <includes> + <include>*.*</include> + </includes> + <targetPath>third-party-licenses</targetPath> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.openapitools</groupId> + <artifactId>openapi-generator-maven-plugin</artifactId> + <version>6.6.0</version> + <executions> + <execution> + <id>dmi-code-gen</id> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <inputSpec>${project.basedir}/openapi/openapi.yml</inputSpec> + <generatorName>spring</generatorName> + <generateSupportingFiles>false</generateSupportingFiles> + <invokerPackage>org.onap.cps.ncmp.dmi.rest.controller</invokerPackage> + <apiPackage>org.onap.cps.ncmp.dmi.rest.api</apiPackage> + <modelPackage>org.onap.cps.ncmp.dmi.model</modelPackage> + <generateAliasAsModel>true</generateAliasAsModel> + <configOptions> + <sourceFolder>src/gen/java</sourceFolder> + <dateLibrary>java11</dateLibrary> + <interfaceOnly>true</interfaceOnly> + <useTags>true</useTags> + <useSpringBoot3>true</useSpringBoot3> + <openApiNullable>false</openApiNullable> + <skipDefaultInterface>true</skipDefaultInterface> + </configOptions> + </configuration> + </execution> + <execution> + <id>dmi-datajob-code-gen</id> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <inputSpec>${project.basedir}/openapi/openapi-datajob.yml</inputSpec> + <generatorName>spring</generatorName> + <generateSupportingFiles>false</generateSupportingFiles> + <invokerPackage>org.onap.cps.ncmp.dmi.datajobs.rest.controller</invokerPackage> + <apiPackage>org.onap.cps.ncmp.dmi.datajobs.rest.api</apiPackage> + <modelPackage>org.onap.cps.ncmp.dmi.datajobs.model</modelPackage> + <generateAliasAsModel>true</generateAliasAsModel> + <configOptions> + <sourceFolder>src/gen/java</sourceFolder> + <dateLibrary>java11</dateLibrary> + <interfaceOnly>true</interfaceOnly> + <useTags>true</useTags> + <useSpringBoot3>true</useSpringBoot3> + <openApiNullable>false</openApiNullable> + <skipDefaultInterface>true</skipDefaultInterface> + </configOptions> + </configuration> + </execution> + <execution> + <id>openapi-yaml-gen</id> + <goals> + <goal>generate</goal> + </goals> + <phase>compile</phase> + <configuration> + <inputSpec>${project.basedir}/openapi/openapi.yml</inputSpec> + <generatorName>openapi-yaml</generatorName> + <configOptions> + <outputFile>openapi/openapi.yaml</outputFile> + </configOptions> + </configuration> + </execution> + <execution> + <id>openapi-datajob-yaml-gen</id> + <goals> + <goal>generate</goal> + </goals> + <phase>compile</phase> + <configuration> + <inputSpec>${project.basedir}/openapi/openapi-datajob.yml</inputSpec> + <generatorName>openapi-yaml</generatorName> + <configOptions> + <outputFile>openapi/openapi-datajob.yaml</outputFile> + </configOptions> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources</id> + <phase>compile</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/target/classes/static/api-docs</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/target/generated-sources/openapi/openapi</directory> + <includes> + <include>openapi*.yaml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>3.1.2</version> + <executions> + <execution> + <goals> + <goal>build-info</goal> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>compileTests</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefireArgLine}</argLine> + <includes> + <include>**/*Spec.java</include> + </includes> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + <environmentVariables> + <!-- + Disable privileged container usage to cleanup the test containers; + these are removed automatically on jvm termination; + see https://www.testcontainers.org/features/configuration/#disabling-ryuk + --> + <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED> + </environmentVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <id>onap-license</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <configLocation>onap-checkstyle/check-license.xml</configLocation> + <includeResources>false</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>false</includeTestResources> + <sourceDirectories> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + </sourceDirectories> + <consoleOutput>false</consoleOutput> + <violationSeverity>warning</violationSeverity> + <failOnViolation>true</failOnViolation> + </configuration> + </execution> + <execution> + <id>onap-java-style</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> + <sourceDirectories> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + </sourceDirectories> + <includeResources>true</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>true</includeTestResources> + <consoleOutput>false</consoleOutput> + <violationSeverity>warning</violationSeverity> + <failOnViolation>true</failOnViolation> + </configuration> + </execution> + <execution> + <id>cps-java-style</id> + <goals> + <goal>check</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <configLocation>cps-java-style.xml</configLocation> + <sourceDirectories> + <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + </sourceDirectories> + <includeResources>true</includeResources> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <includeTestResources>true</includeTestResources> + <consoleOutput>true</consoleOutput> + <violationSeverity>warning</violationSeverity> + <failOnViolation>true</failOnViolation> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>checkstyle</artifactId> + <version>${cps.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <version>4.4.2</version> + <executions> + <execution> + <id>analyze-compile</id> + <phase>compile</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spotbugs</artifactId> + <version>${cps.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + <configuration> + <plugins> + <plugin> + <groupId>jp.skypencil.findbugs.slf4j</groupId> + <artifactId>bug-pattern</artifactId> + <version>1.5.0</version> + </plugin> + </plugins> + <effort>Max</effort> + <threshold>Low</threshold> + <failOnError>true</failOnError> + <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile> + <addSourceDirs>true</addSourceDirs> + <xmlOutput>true</xmlOutput> + <xmlOutputDirectory>${basedir}/target/spotbugs</xmlOutputDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.10</version> + <configuration> + <excludes> + <exclude>org/onap/cps/ncmp/dmi/model/*</exclude> + <exclude>org/onap/cps/ncmp/dmi/datajobs/model/*</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>coverage-check</id> + <goals> + <goal>check</goal> + </goals> + <configuration> + <dataFile>${basedir}/target/code-coverage/jacoco-ut.exec</dataFile> + <rules> + <rule> + <element>BUNDLE</element> + <limits> + <limit> + <counter>INSTRUCTION</counter> + <value>COVEREDRATIO</value> + <minimum>${jacoco.minimum.coverage}</minimum> + </limit> + </limits> + </rule> + </rules> + </configuration> + </execution> + <execution> + <id>report</id> + <phase>verify</phase> + <goals> + <goal>report-aggregate</goal> + </goals> + <configuration> + <dataFileIncludes> + <fileInclude>**/code-coverage/jacoco-ut.exec</fileInclude> + </dataFileIncludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>com.google.cloud.tools</groupId> + <artifactId>jib-maven-plugin</artifactId> + <version>3.3.2</version> + <configuration> + <container> + <mainClass>${app}</mainClass> + <creationTime>USE_CURRENT_TIMESTAMP</creationTime> + </container> + <from> + <image>${base.image}</image> + </from> + <to> + <tags> + <tag>latest</tag> + <tag>${project.version}-latest</tag> + </tags> + <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image> + </to> + </configuration> + <executions> + <execution> + <phase>package</phase> + <id>build</id> + <goals> + <goal>dockerBuild</goal> + </goals> + </execution> + <execution> + <phase>deploy</phase> + <id>buildAndPush</id> + <goals> + <goal>build</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <image.name>ncmp-dmi-plugin</image.name> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.google.cloud.tools</groupId> + <artifactId>jib-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project>
\ 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 index 69d21ba1..69d21ba1 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/Application.java +++ b/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 index 83ef6f89..83ef6f89 100644 --- 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 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 index fb22b358..fb22b358 100644 --- 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 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 index ac92cb4a..ac92cb4a 100644 --- 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 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 index 25ee92ae..25ee92ae 100644 --- 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 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 index bbc1c20d..bbc1c20d 100644 --- 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 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 index f61c156a..f61c156a 100644 --- 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 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 index 1874389e..1874389e 100644 --- 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 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 index c099a1cc..c099a1cc 100644 --- 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 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 index 49db7d8b..49db7d8b 100644 --- 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 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 index b4b0249f..b4b0249f 100644 --- 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 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 index aa5b0cb7..aa5b0cb7 100644 --- 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 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 index 65db2712..65db2712 100644 --- 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 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 index ded54d91..ded54d91 100644 --- 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 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 index a83485a9..a83485a9 100644 --- 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 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 index 6a1c6d1d..6a1c6d1d 100644 --- 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 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 index 1e6c84b1..1e6c84b1 100644 --- 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 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 index 00fea330..00fea330 100644 --- 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 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 index b8bd277d..b8bd277d 100644 --- 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 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 index 075dcf20..075dcf20 100644 --- 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 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 index c5fb8fbe..c5fb8fbe 100644 --- 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 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 index 3a9838b0..3a9838b0 100644 --- 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 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 index 51205da2..51205da2 100644 --- 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 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 index 40b1297f..40b1297f 100644 --- 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 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 index 8f196cfc..8f196cfc 100644 --- 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 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 index cad5e726..cad5e726 100644 --- 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 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 index 3f280403..3f280403 100644 --- 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 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 index f0826a81..f0826a81 100644 --- 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 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 index 6acbe09b..6acbe09b 100644 --- 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 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 index d41240b9..d41240b9 100644 --- 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 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 index 94783f3b..94783f3b 100644 --- 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 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 index 179707ab..179707ab 100644 --- 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 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 index 82eac92a..82eac92a 100644 --- 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 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 index 6ab6a01e..6ab6a01e 100644 --- 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 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 index 75c37dff..75c37dff 100644 --- 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 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 index c77e0e41..c77e0e41 100644 --- 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 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 index fd94e634..fd94e634 100644 --- 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 diff --git a/src/main/resources/application.yml b/dmi-service/src/main/resources/application.yml index 003aa191..003aa191 100644 --- a/src/main/resources/application.yml +++ b/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 index 355209b4..355209b4 100644 --- a/src/main/resources/logback-spring.xml +++ b/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 index 13dd043d..13dd043d 100644 --- 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 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 index 9d80b71f..9d80b71f 100644 --- 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 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 index c09403d7..c09403d7 100644 --- 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 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 index a3bf52b3..a3bf52b3 100644 --- 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 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 index c55f53c1..c55f53c1 100644 --- 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 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 index 12ca05cf..12ca05cf 100644 --- 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 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 index a7557bb9..a7557bb9 100644 --- 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 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 index f1f476f6..f1f476f6 100644 --- 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 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 index 8ca629f1..8ca629f1 100644 --- 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 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 index 0b404776..0b404776 100644 --- 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 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 index 3f5d4a80..3f5d4a80 100644 --- 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 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 index a519de7b..a519de7b 100644 --- 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 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 index 8531d35f..8531d35f 100644 --- 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 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 index 656cfcb5..656cfcb5 100644 --- 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 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 index 4d7e27e2..4d7e27e2 100644 --- 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 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 index f334f780..f334f780 100644 --- 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 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 index 9dcb72e6..9dcb72e6 100644 --- 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 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 index c10d91a5..c10d91a5 100644 --- a/src/test/java/org/onap/cps/ncmp/dmi/TestUtils.java +++ b/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 index 5240e239..5240e239 100644 --- 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 diff --git a/src/test/resources/ModuleSchema.json b/dmi-service/src/test/resources/ModuleSchema.json index 50c67154..50c67154 100644 --- a/src/test/resources/ModuleSchema.json +++ b/dmi-service/src/test/resources/ModuleSchema.json diff --git a/src/test/resources/application.yml b/dmi-service/src/test/resources/application.yml index ddc2b45f..ddc2b45f 100644 --- a/src/test/resources/application.yml +++ b/dmi-service/src/test/resources/application.yml diff --git a/src/test/resources/cmNotificationSubscriptionCreationEvent.json b/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json index 3b780976..3b780976 100644 --- a/src/test/resources/cmNotificationSubscriptionCreationEvent.json +++ b/dmi-service/src/test/resources/cmNotificationSubscriptionCreationEvent.json diff --git a/src/test/resources/createDataWithNormalChar.json b/dmi-service/src/test/resources/createDataWithNormalChar.json index 31cdf1c5..31cdf1c5 100644 --- a/src/test/resources/createDataWithNormalChar.json +++ b/dmi-service/src/test/resources/createDataWithNormalChar.json diff --git a/src/test/resources/createDataWithSpecialChar.json b/dmi-service/src/test/resources/createDataWithSpecialChar.json index 1e7622ee..1e7622ee 100644 --- a/src/test/resources/createDataWithSpecialChar.json +++ b/dmi-service/src/test/resources/createDataWithSpecialChar.json diff --git a/src/test/resources/deleteData.json b/dmi-service/src/test/resources/deleteData.json index 2233fa01..2233fa01 100644 --- a/src/test/resources/deleteData.json +++ b/dmi-service/src/test/resources/deleteData.json diff --git a/src/test/resources/moduleResources.json b/dmi-service/src/test/resources/moduleResources.json index 23adfcba..23adfcba 100644 --- a/src/test/resources/moduleResources.json +++ b/dmi-service/src/test/resources/moduleResources.json diff --git a/src/test/resources/patchData.json b/dmi-service/src/test/resources/patchData.json index e5466eaf..e5466eaf 100644 --- a/src/test/resources/patchData.json +++ b/dmi-service/src/test/resources/patchData.json diff --git a/src/test/resources/readData.json b/dmi-service/src/test/resources/readData.json index 53f6d2ed..53f6d2ed 100644 --- a/src/test/resources/readData.json +++ b/dmi-service/src/test/resources/readData.json diff --git a/src/test/resources/updateData.json b/dmi-service/src/test/resources/updateData.json index 7cbf4f0c..7cbf4f0c 100644 --- a/src/test/resources/updateData.json +++ b/dmi-service/src/test/resources/updateData.json @@ -28,658 +28,18 @@ <version>3.3.0</version> <relativePath/> </parent> + <packaging>pom</packaging> <organization> <name>ONAP - CPS</name> <url>http://www.onap.org/</url> </organization> + <modules> + <module>dmi-service</module> + </modules> <groupId>org.onap.cps</groupId> <artifactId>ncmp-dmi-plugin</artifactId> <version>1.6.0-SNAPSHOT</version> <name>ncmp-dmi-plugin</name> <description>DMI Plugin Service</description> - <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> - <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> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>3.1.2</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-dependencies</artifactId> - <version>2022.0.3</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.8.9</version> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - <version>2.2.10</version> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-json-jackson</artifactId> - <version>2.5.0</version> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-kafka</artifactId> - <version>2.5.0</version> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-spring</artifactId> - <version>2.5.0</version> - </dependency> - <dependency> - <groupId>net.logstash.logback</groupId> - <artifactId>logstash-logback-encoder</artifactId> - <version>7.0.1</version> - </dependency> - <dependency> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - <version>2.5.0</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.13</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <version>3.0.18</version> - </dependency> - <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-core</artifactId> - <version>2.4-M1-groovy-3.0</version> - </dependency> - <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-spring</artifactId> - <version>2.4-M1-groovy-3.0</version> - </dependency> - <dependency> - <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-bom</artifactId> - <version>1.18.3</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - <version>3.1.10</version> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>1.18.24</version> - </dependency> - <dependency> - <groupId>org.onap.cps</groupId> - <artifactId>cps-ncmp-events</artifactId> - <version>${cps.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents.client5</groupId> - <artifactId>httpclient5</artifactId> - <version>5.2.1</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - </dependency> - <dependency> - <groupId>org.springdoc</groupId> - <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.kafka</groupId> - <artifactId>spring-kafka</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - <dependency> - <groupId>com.jayway.jsonpath</groupId> - <artifactId>json-path</artifactId> - </dependency> - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> - </dependency> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</artifactId> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-json-jackson</artifactId> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-kafka</artifactId> - </dependency> - <dependency> - <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-spring</artifactId> - </dependency> - <dependency> - <groupId>net.logstash.logback</groupId> - <artifactId>logstash-logback-encoder</artifactId> - </dependency> - <dependency> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - <dependency> - <groupId>org.onap.cps</groupId> - <artifactId>cps-ncmp-events</artifactId> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents.client5</groupId> - <artifactId>httpclient5</artifactId> - </dependency> - <!-- T E S T - D E P E N D E N C I E S --> - <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.spockframework</groupId> - <artifactId>spock-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.kafka</groupId> - <artifactId>spring-kafka-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>spock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>kafka</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - <resource> - <directory>target/generated-sources/license</directory> - <includes> - <include>third-party-licenses.txt</include> - </includes> - </resource> - <resource> - <directory>target/generated-resources/licenses</directory> - <includes> - <include>*.*</include> - </includes> - <targetPath>third-party-licenses</targetPath> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.openapitools</groupId> - <artifactId>openapi-generator-maven-plugin</artifactId> - <version>6.6.0</version> - <executions> - <execution> - <id>dmi-code-gen</id> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <inputSpec>${project.basedir}/openapi/openapi.yml</inputSpec> - <generatorName>spring</generatorName> - <generateSupportingFiles>false</generateSupportingFiles> - <invokerPackage>org.onap.cps.ncmp.dmi.rest.controller</invokerPackage> - <apiPackage>org.onap.cps.ncmp.dmi.rest.api</apiPackage> - <modelPackage>org.onap.cps.ncmp.dmi.model</modelPackage> - <generateAliasAsModel>true</generateAliasAsModel> - <configOptions> - <sourceFolder>src/gen/java</sourceFolder> - <dateLibrary>java11</dateLibrary> - <interfaceOnly>true</interfaceOnly> - <useTags>true</useTags> - <useSpringBoot3>true</useSpringBoot3> - <openApiNullable>false</openApiNullable> - <skipDefaultInterface>true</skipDefaultInterface> - </configOptions> - </configuration> - </execution> - <execution> - <id>dmi-datajob-code-gen</id> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <inputSpec>${project.basedir}/openapi/openapi-datajob.yml</inputSpec> - <generatorName>spring</generatorName> - <generateSupportingFiles>false</generateSupportingFiles> - <invokerPackage>org.onap.cps.ncmp.dmi.datajobs.rest.controller</invokerPackage> - <apiPackage>org.onap.cps.ncmp.dmi.datajobs.rest.api</apiPackage> - <modelPackage>org.onap.cps.ncmp.dmi.datajobs.model</modelPackage> - <generateAliasAsModel>true</generateAliasAsModel> - <configOptions> - <sourceFolder>src/gen/java</sourceFolder> - <dateLibrary>java11</dateLibrary> - <interfaceOnly>true</interfaceOnly> - <useTags>true</useTags> - <useSpringBoot3>true</useSpringBoot3> - <openApiNullable>false</openApiNullable> - <skipDefaultInterface>true</skipDefaultInterface> - </configOptions> - </configuration> - </execution> - <execution> - <id>openapi-yaml-gen</id> - <goals> - <goal>generate</goal> - </goals> - <phase>compile</phase> - <configuration> - <inputSpec>${project.basedir}/openapi/openapi.yml</inputSpec> - <generatorName>openapi-yaml</generatorName> - <configOptions> - <outputFile>openapi/openapi.yaml</outputFile> - </configOptions> - </configuration> - </execution> - <execution> - <id>openapi-datajob-yaml-gen</id> - <goals> - <goal>generate</goal> - </goals> - <phase>compile</phase> - <configuration> - <inputSpec>${project.basedir}/openapi/openapi-datajob.yml</inputSpec> - <generatorName>openapi-yaml</generatorName> - <configOptions> - <outputFile>openapi/openapi-datajob.yaml</outputFile> - </configOptions> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources</id> - <phase>compile</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}/target/classes/static/api-docs</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/target/generated-sources/openapi/openapi</directory> - <includes> - <include>openapi*.yaml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>3.1.2</version> - <executions> - <execution> - <goals> - <goal>build-info</goal> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>compileTests</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefireArgLine}</argLine> - <includes> - <include>**/*Spec.java</include> - </includes> - <excludes> - <exclude>**/IT*.java</exclude> - </excludes> - <environmentVariables> - <!-- - Disable privileged container usage to cleanup the test containers; - these are removed automatically on jvm termination; - see https://www.testcontainers.org/features/configuration/#disabling-ryuk - --> - <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED> - </environmentVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <id>onap-license</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/check-license.xml</configLocation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>false</includeTestResources> - <sourceDirectories> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> - </sourceDirectories> - <consoleOutput>false</consoleOutput> - <violationSeverity>warning</violationSeverity> - <failOnViolation>true</failOnViolation> - </configuration> - </execution> - <execution> - <id>onap-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <sourceDirectories> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <consoleOutput>false</consoleOutput> - <violationSeverity>warning</violationSeverity> - <failOnViolation>true</failOnViolation> - </configuration> - </execution> - <execution> - <id>cps-java-style</id> - <goals> - <goal>check</goal> - </goals> - <phase>process-sources</phase> - <configuration> - <configLocation>cps-java-style.xml</configLocation> - <sourceDirectories> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> - </sourceDirectories> - <includeResources>true</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <includeTestResources>true</includeTestResources> - <consoleOutput>true</consoleOutput> - <violationSeverity>warning</violationSeverity> - <failOnViolation>true</failOnViolation> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>checkstyle</artifactId> - <version>${cps.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>4.4.2</version> - <executions> - <execution> - <id>analyze-compile</id> - <phase>compile</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>spotbugs</artifactId> - <version>${cps.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - <configuration> - <plugins> - <plugin> - <groupId>jp.skypencil.findbugs.slf4j</groupId> - <artifactId>bug-pattern</artifactId> - <version>1.5.0</version> - </plugin> - </plugins> - <effort>Max</effort> - <threshold>Low</threshold> - <failOnError>true</failOnError> - <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile> - <addSourceDirs>true</addSourceDirs> - <xmlOutput>true</xmlOutput> - <xmlOutputDirectory>${basedir}/target/spotbugs</xmlOutputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.10</version> - <configuration> - <excludes> - <exclude>org/onap/cps/ncmp/dmi/model/*</exclude> - <exclude>org/onap/cps/ncmp/dmi/datajobs/model/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>coverage-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <dataFile>${basedir}/target/code-coverage/jacoco-ut.exec</dataFile> - <rules> - <rule> - <element>BUNDLE</element> - <limits> - <limit> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>${jacoco.minimum.coverage}</minimum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - <execution> - <id>report</id> - <phase>verify</phase> - <goals> - <goal>report-aggregate</goal> - </goals> - <configuration> - <dataFileIncludes> - <fileInclude>**/code-coverage/jacoco-ut.exec</fileInclude> - </dataFileIncludes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <version>3.3.2</version> - <configuration> - <container> - <mainClass>${app}</mainClass> - <creationTime>USE_CURRENT_TIMESTAMP</creationTime> - </container> - <from> - <image>${base.image}</image> - </from> - <to> - <tags> - <tag>latest</tag> - <tag>${project.version}-latest</tag> - </tags> - <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image> - </to> - </configuration> - <executions> - <execution> - <phase>package</phase> - <id>build</id> - <goals> - <goal>dockerBuild</goal> - </goals> - </execution> - <execution> - <phase>deploy</phase> - <id>buildAndPush</id> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - <profiles> - <profile> - <id>docker</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <image.name>ncmp-dmi-plugin</image.name> - </properties> - <build> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> |