Merge branch 'hotfix' into 'main'

Hotfix

See merge request !254

pipeline.variables.sh

-PROJECT_VERSION_NUMBER="1.2.0"
+PROJECT_VERSION_NUMBER="1.2.1"
 

pom.xml

@@ -13,11 +13,11 @@
 
     <groupId>eu.europa.ec.simpl</groupId>
     <artifactId>simpl-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>pom</packaging>
 
     <properties>
-        <common.version>1.2.0</common.version>
+        <common.version>1.2.1</common.version>
         <java.version>21</java.version>
         <spring-cloud.version>2024.0.0</spring-cloud.version>
         <mapstruct.version>1.6.3</mapstruct.version>

simpl-api-iaa/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.simpl</groupId>
         <artifactId>simpl-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>simpl-api-iaa</artifactId>

simpl-commons-data/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.simpl</groupId>
         <artifactId>simpl-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>simpl-commons-data</artifactId>

simpl-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>eu.europa.ec.simpl</groupId>
         <artifactId>simpl-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>simpl-spring-boot-starter</artifactId>

simpl-spring-boot-starter/src/main/java/eu/europa/ec/simpl/common/exceptions/RestExceptionHandler.java

@@ -91,7 +91,8 @@ public class RestExceptionHandler extends ResponseEntityExceptionHandler {
     public ResponseEntity<ProblemDetail> handleClientException(HttpStatusCodeException e) {
         log.error("Client exception reported: ", e);
         var cause = tryParseProblem(e).orElse(ProblemDetail.forStatusAndDetail(e.getStatusCode(), e.getMessage()));
-        return ResponseEntity.status(e.getStatusCode()).body(new ClientProblemDetail(cause));
+        var clientProblem = new ClientProblemDetail(cause);
+        return ResponseEntity.status(clientProblem.getStatus()).body(clientProblem);
     }
 
     private Optional<ProblemDetail> tryParseProblem(HttpStatusCodeException httpException) {

simpl-spring-boot-starter/src/main/java/eu/europa/ec/simpl/common/exchanges/mtls/AuthorityExchange.java

@@ -13,7 +13,7 @@ import org.springframework.web.service.annotation.PostExchange;
 
 public interface AuthorityExchange extends ParticipantExchange {
 
-    @GetExchange("/identity-api/v1/mtls/whoami")
+    @GetExchange("/identityApi/v1/mtls/whoami")
     ParticipantDTO whoami();
 
     @PostExchange("/identity-api/mtls/token")

simpl-spring-boot-starter/src/test/java/eu/europa/ec/simpl/common/exceptions/RestExceptionHandlerTest.java

@@ -169,6 +169,8 @@ class RestExceptionHandlerTest {
         var result = mvc.perform(get("/test")).andReturn();
         var problem = objectMapper.readValue(result.getResponse().getContentAsString(), ClientProblemDetail.class);
 
+        assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value());
+
         assertThat(problem.getType()).isEqualTo(CLIENT_ERROR_TYPE);
         assertThat(problem.getStatus()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value());
 
@@ -186,6 +188,8 @@ class RestExceptionHandlerTest {
         var result = mvc.perform(get("/test")).andReturn();
         var problem = objectMapper.readValue(result.getResponse().getContentAsString(), ClientProblemDetail.class);
 
+        assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value());
+
         assertThat(problem.getType()).isEqualTo(CLIENT_ERROR_TYPE);
         assertThat(problem.getStatus()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value());
 

simpl-test-lib/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>eu.europa.ec.simpl</groupId>
         <artifactId>simpl-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>simpl-test-lib</artifactId>