diff --git a/build.gradle.kts b/build.gradle.kts index 4fcac3b..032f067 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ plugins { java - id("org.springframework.boot") version "3.3.5" - id("io.spring.dependency-management") version "1.1.6" + id("org.springframework.boot") version "3.4.1" + id("io.spring.dependency-management") version "1.1.7" jacoco - id("org.sonarqube") version "5.1.0.4882" + id("org.sonarqube") version "6.0.1.5171" id("com.github.ben-manes.versions") version "0.51.0" - id("org.openapi.generator") version "7.9.0" + id("org.openapi.generator") version "7.10.0" id("org.springdoc.openapi-gradle-plugin") version "1.9.0" } @@ -29,9 +29,9 @@ repositories { mavenCentral() } -val springDocOpenApiVersion = "2.6.0" +val springDocOpenApiVersion = "2.7.0" val openApiToolsVersion = "0.2.6" -val micrometerVersion = "1.4.0" +val micrometerVersion = "1.4.1" val postgresJdbcVersion = "42.7.4" dependencies { @@ -124,7 +124,7 @@ tasks.register("ope "interfaceOnly" to "true", "useTags" to "true", "generateConstructorWithAllArgs" to "false", - "generatedConstructorWithRequiredArgs" to "false", + "generatedConstructorWithRequiredArgs" to "true", "additionalModelTypeAnnotations" to "@lombok.Data @lombok.Builder @lombok.AllArgsConstructor" )) } diff --git a/gradle.lockfile b/gradle.lockfile index 2afa494..d4211e5 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -2,39 +2,39 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. aopalliance:aopalliance:1.0=compileClasspath -ch.qos.logback:logback-classic:1.5.11=compileClasspath -ch.qos.logback:logback-core:1.5.11=compileClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=compileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.2=compileClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath +ch.qos.logback:logback-classic:1.5.12=compileClasspath +ch.qos.logback:logback-core:1.5.12=compileClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath +com.fasterxml.jackson.core:jackson-core:2.18.2=compileClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.2=compileClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2=compileClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2=compileClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2=compileClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2=compileClasspath +com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath com.jayway.jsonpath:json-path:2.9.0=compileClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath io.micrometer:context-propagation:1.1.2=compileClasspath -io.micrometer:micrometer-commons:1.13.6=compileClasspath -io.micrometer:micrometer-core:1.13.6=compileClasspath -io.micrometer:micrometer-jakarta9:1.13.6=compileClasspath -io.micrometer:micrometer-observation:1.13.6=compileClasspath -io.micrometer:micrometer-tracing-bridge-otel:1.4.0=compileClasspath -io.micrometer:micrometer-tracing:1.3.5=compileClasspath +io.micrometer:micrometer-commons:1.14.2=compileClasspath +io.micrometer:micrometer-core:1.14.2=compileClasspath +io.micrometer:micrometer-jakarta9:1.14.2=compileClasspath +io.micrometer:micrometer-observation:1.14.2=compileClasspath +io.micrometer:micrometer-tracing-bridge-otel:1.4.1=compileClasspath +io.micrometer:micrometer-tracing:1.4.1=compileClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.9.0-alpha=compileClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.9.0=compileClasspath io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha=compileClasspath -io.opentelemetry:opentelemetry-api:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-context:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-extension-trace-propagators:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-sdk-common:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath -io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath -io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath -io.swagger.core.v3:swagger-core-jakarta:2.2.22=compileClasspath -io.swagger.core.v3:swagger-models-jakarta:2.2.22=compileClasspath +io.opentelemetry:opentelemetry-api:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-context:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-extension-trace-propagators:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-sdk-common:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.43.0=compileClasspath +io.opentelemetry:opentelemetry-sdk:1.43.0=compileClasspath +io.swagger.core.v3:swagger-annotations-jakarta:2.2.25=compileClasspath +io.swagger.core.v3:swagger-core-jakarta:2.2.25=compileClasspath +io.swagger.core.v3:swagger-models-jakarta:2.2.25=compileClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath jakarta.persistence:jakarta.persistence-api:3.1.0=compileClasspath @@ -42,55 +42,56 @@ jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath org.antlr:antlr4-runtime:4.13.0=compileClasspath -org.apache.commons:commons-lang3:3.14.0=compileClasspath -org.apache.logging.log4j:log4j-api:2.23.1=compileClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=compileClasspath -org.apache.tomcat.embed:tomcat-embed-core:10.1.31=compileClasspath -org.apache.tomcat.embed:tomcat-embed-el:10.1.31=compileClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.31=compileClasspath +org.apache.commons:commons-lang3:3.17.0=compileClasspath +org.apache.logging.log4j:log4j-api:2.24.3=compileClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.3=compileClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.34=compileClasspath +org.apache.tomcat.embed:tomcat-embed-el:10.1.34=compileClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.34=compileClasspath org.aspectj:aspectjweaver:1.9.22.1=compileClasspath org.atteo:evo-inflector:1.3=compileClasspath -org.hibernate.orm:hibernate-core:6.5.3.Final=compileClasspath +org.hibernate.orm:hibernate-core:6.6.4.Final=compileClasspath +org.jspecify:jspecify:1.0.0=compileClasspath org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath org.postgresql:postgresql:42.7.4=compileClasspath -org.projectlombok:lombok:1.18.34=compileClasspath +org.projectlombok:lombok:1.18.36=compileClasspath org.slf4j:jul-to-slf4j:2.0.16=compileClasspath org.slf4j:slf4j-api:2.0.16=compileClasspath -org.springdoc:springdoc-openapi-starter-common:2.6.0=compileClasspath -org.springdoc:springdoc-openapi-starter-webmvc-api:2.6.0=compileClasspath -org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0=compileClasspath -org.springframework.boot:spring-boot-actuator-autoconfigure:3.3.5=compileClasspath -org.springframework.boot:spring-boot-actuator:3.3.5=compileClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-actuator:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-aop:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-data-jpa:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-data-rest:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-jdbc:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-json:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter-web:3.3.5=compileClasspath -org.springframework.boot:spring-boot-starter:3.3.5=compileClasspath -org.springframework.boot:spring-boot:3.3.5=compileClasspath -org.springframework.data:spring-data-commons:3.3.5=compileClasspath -org.springframework.data:spring-data-jpa:3.3.5=compileClasspath -org.springframework.data:spring-data-rest-core:4.3.5=compileClasspath -org.springframework.data:spring-data-rest-webmvc:4.3.5=compileClasspath -org.springframework.hateoas:spring-hateoas:2.3.3=compileClasspath +org.springdoc:springdoc-openapi-starter-common:2.7.0=compileClasspath +org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0=compileClasspath +org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0=compileClasspath +org.springframework.boot:spring-boot-actuator-autoconfigure:3.4.1=compileClasspath +org.springframework.boot:spring-boot-actuator:3.4.1=compileClasspath +org.springframework.boot:spring-boot-autoconfigure:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-actuator:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-data-jpa:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-data-rest:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-jdbc:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-json:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter-web:3.4.1=compileClasspath +org.springframework.boot:spring-boot-starter:3.4.1=compileClasspath +org.springframework.boot:spring-boot:3.4.1=compileClasspath +org.springframework.data:spring-data-commons:3.4.1=compileClasspath +org.springframework.data:spring-data-jpa:3.4.1=compileClasspath +org.springframework.data:spring-data-rest-core:4.4.1=compileClasspath +org.springframework.data:spring-data-rest-webmvc:4.4.1=compileClasspath +org.springframework.hateoas:spring-hateoas:2.4.1=compileClasspath org.springframework.plugin:spring-plugin-core:3.0.0=compileClasspath -org.springframework:spring-aop:6.1.14=compileClasspath -org.springframework:spring-aspects:6.1.14=compileClasspath -org.springframework:spring-beans:6.1.14=compileClasspath -org.springframework:spring-context:6.1.14=compileClasspath -org.springframework:spring-core:6.1.14=compileClasspath -org.springframework:spring-expression:6.1.14=compileClasspath -org.springframework:spring-jcl:6.1.14=compileClasspath -org.springframework:spring-jdbc:6.1.14=compileClasspath -org.springframework:spring-orm:6.1.14=compileClasspath -org.springframework:spring-tx:6.1.14=compileClasspath -org.springframework:spring-web:6.1.14=compileClasspath -org.springframework:spring-webmvc:6.1.14=compileClasspath -org.webjars:swagger-ui:5.17.14=compileClasspath -org.yaml:snakeyaml:2.2=compileClasspath +org.springframework:spring-aop:6.2.1=compileClasspath +org.springframework:spring-aspects:6.2.1=compileClasspath +org.springframework:spring-beans:6.2.1=compileClasspath +org.springframework:spring-context:6.2.1=compileClasspath +org.springframework:spring-core:6.2.1=compileClasspath +org.springframework:spring-expression:6.2.1=compileClasspath +org.springframework:spring-jcl:6.2.1=compileClasspath +org.springframework:spring-jdbc:6.2.1=compileClasspath +org.springframework:spring-orm:6.2.1=compileClasspath +org.springframework:spring-tx:6.2.1=compileClasspath +org.springframework:spring-web:6.2.1=compileClasspath +org.springframework:spring-webmvc:6.2.1=compileClasspath +org.webjars:swagger-ui:5.18.2=compileClasspath +org.webjars:webjars-locator-lite:1.0.1=compileClasspath +org.yaml:snakeyaml:2.3=compileClasspath empty= diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/test/java/it/gov/pagopa/pu/organization/exception/ControllerExceptionHandlerTest.java b/src/test/java/it/gov/pagopa/pu/organization/exception/ControllerExceptionHandlerTest.java index 934ed5f..d4ae75f 100644 --- a/src/test/java/it/gov/pagopa/pu/organization/exception/ControllerExceptionHandlerTest.java +++ b/src/test/java/it/gov/pagopa/pu/organization/exception/ControllerExceptionHandlerTest.java @@ -6,9 +6,9 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; @@ -17,7 +17,7 @@ @Import({BrokerController.class}) class ControllerExceptionHandlerTest { - @MockBean + @MockitoBean private BrokerService brokerServiceMock; @Autowired