From d59b5eff6118663cdf8e57ed2c61c9b4900f3c29 Mon Sep 17 00:00:00 2001 From: egernug Date: Thu, 19 Oct 2023 11:23:13 +0100 Subject: Upgrade of DMI-Plugin to Spring Boot 3.1.2 Issue-ID: CPS-1790 Signed-off-by: egernug Change-Id: I3eaf8307660ce8d8d33ad98cabb891bcdd663713 --- pom.xml | 118 +++++++++++++-------- .../onap/cps/ncmp/dmi/config/DmiPluginConfig.java | 4 +- .../cps/ncmp/dmi/config/WebSecurityConfig.java | 9 +- .../org/onap/cps/ncmp/dmi/service/DmiService.java | 4 +- .../onap/cps/ncmp/dmi/service/DmiServiceImpl.java | 7 +- .../ncmp/dmi/service/operation/SdncOperations.java | 4 +- .../cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy | 4 +- 7 files changed, 93 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index f2ae66d6..98b0051c 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ org.onap.cps.ncmp.dmi.Application ${docker.pull.registry}/onap/integration-java17:12.0.0 - 3.3.6 + 3.3.8 ${project.version}-${maven.build.timestamp} 0.98 yyyyMMdd'T'HHmmss'Z' @@ -48,6 +48,20 @@ + + 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 @@ -84,35 +98,29 @@ 4.5.13 - org.springframework.boot - spring-boot-dependencies - 2.7.6 - pom - import + org.codehaus.groovy + groovy + 3.0.18 org.spockframework - spock-bom - 2.0-M5-groovy-3.0 - pom - import + spock-core + 2.4-M1-groovy-3.0 - org.springdoc - springdoc-openapi-ui - 1.6.6 + org.spockframework + spock-spring + 2.4-M1-groovy-3.0 - org.springframework.cloud - spring-cloud-dependencies - 2021.0.3 - pom - import + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.0.2 org.testcontainers testcontainers-bom - 1.17.3 + 1.18.3 pom import @@ -121,14 +129,48 @@ janino 3.1.7 + + 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 @@ -169,6 +211,7 @@ org.apache.httpcomponents httpclient + org.codehaus.groovy groovy @@ -178,36 +221,24 @@ janino - org.onap.cps - cps-ncmp-events + org.eclipse.jetty + jetty-server - org.projectlombok - lombok + org.eclipse.jetty + jetty-http - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springdoc - springdoc-openapi-ui - - - org.springframework.boot - spring-boot-starter-security + org.onap.cps + cps-ncmp-events - org.springframework.boot - spring-boot-starter-actuator + org.projectlombok + lombok - org.springframework.kafka - spring-kafka + org.apache.httpcomponents.client5 + httpclient5 @@ -295,6 +326,7 @@ java11 true true + true false true @@ -339,7 +371,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.6.4 + 3.1.2 @@ -492,6 +524,7 @@ org.jacoco jacoco-maven-plugin + 0.8.10 org/onap/cps/ncmp/dmi/model/* @@ -545,6 +578,7 @@ com.google.cloud.tools jib-maven-plugin + 3.3.2 ${app} diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java b/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java index 6106c6af..fb22b358 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/config/DmiPluginConfig.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2021-2022 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package org.onap.cps.ncmp.dmi.config; import lombok.Getter; -import org.springdoc.core.GroupedOpenApi; +import org.springdoc.core.models.GroupedOpenApi; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java b/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java index 1eb9523d..11d2ae53 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/config/WebSecurityConfig.java @@ -20,6 +20,8 @@ package org.onap.cps.ncmp.dmi.config; +import static org.springframework.security.config.Customizer.withDefaults; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -77,13 +79,12 @@ public class WebSecurityConfig { @SuppressWarnings("squid:S4502") public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception { http - .httpBasic() - .and() + .httpBasic(withDefaults()) .authorizeRequests() - .antMatchers(permitUris).permitAll() + .requestMatchers(permitUris).permitAll() .anyRequest().authenticated() .and() - .csrf().disable(); + .csrf((csrf) -> csrf.disable()); return http.build(); } diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java b/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java index e5b08d9a..f0826a81 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/service/DmiService.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * Modifications Copyright (C) 2022 Bell Canada * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,8 +21,8 @@ package org.onap.cps.ncmp.dmi.service; +import jakarta.validation.constraints.NotNull; import java.util.List; -import javax.validation.constraints.NotNull; import org.onap.cps.ncmp.dmi.exception.DmiException; import org.onap.cps.ncmp.dmi.model.DataAccessRequest; import org.onap.cps.ncmp.dmi.model.ModuleSet; diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java b/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java index a9a13a38..6acbe09b 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/service/DmiServiceImpl.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * Modifications Copyright (C) 2021-2022 Bell Canada * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -106,7 +106,7 @@ public class DmiServiceImpl implements DmiService { } else { log.error("Error occurred when getting module resources from SDNC for the given cmHandle {}", cmHandle); throw new HttpClientRequestException( - cmHandle, responseEntity.getBody(), responseEntity.getStatusCode()); + cmHandle, responseEntity.getBody(), (HttpStatus) responseEntity.getStatusCode()); } } return yangResources; @@ -171,7 +171,8 @@ public class DmiServiceImpl implements DmiService { if (responseEntity.getStatusCode().is2xxSuccessful()) { return responseEntity.getBody(); } else { - throw new HttpClientRequestException(cmHandle, responseEntity.getBody(), responseEntity.getStatusCode()); + throw new HttpClientRequestException(cmHandle, responseEntity.getBody(), + (HttpStatus) responseEntity.getStatusCode()); } } diff --git a/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java b/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java index c2a4a7ed..fd94e634 100644 --- a/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java +++ b/src/main/java/org/onap/cps/ncmp/dmi/service/operation/SdncOperations.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2021-2022 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * Modifications Copyright (C) 2021-2022 Bell Canada * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -115,7 +115,7 @@ public class SdncOperations { } throw new SdncException( String.format("SDNC failed to get Modules Schema for node %s", nodeId), - modulesResponseEntity.getStatusCode(), modulesResponseEntity.getBody()); + (HttpStatus) modulesResponseEntity.getStatusCode(), modulesResponseEntity.getBody()); } /** diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy index b391f8c0..c09403d7 100644 --- a/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy +++ b/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiPluginConfigSpec.groovy @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2021-2022 Nordix Foundation + * Copyright (C) 2021-2023 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ package org.onap.cps.ncmp.dmi.config -import org.springdoc.core.GroupedOpenApi +import org.springdoc.core.models.GroupedOpenApi import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ContextConfiguration -- cgit 1.2.3-korg