Merge branch 'develop'

Informatievlaanderen · Mar 26, 2024 · 1d08bff · 1d08bff
2 parents b3a23d9 + 23d21fe
commit 1d08bff
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 20 deletions.
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -72,6 +72,12 @@ definitions:
         name: Publish to Sigrid
         script:
           - timeout 10m sigridci.py --customer $SIGRID_CI_ACCOUNT --system "Solid" --subsystem $(echo "magdamock.service"| sed -e "s/\./-/g") --source . --publish --include-history
+    - step: &dependencyTree
+        name: Dependency tree
+        caches:
+            - maven
+        script:
+            - mvn dependency:tree > maven.tree
     - step: &sigridCI
         image: softwareimprovementgroup/sigridci
         name: Sigrid CI
@@ -89,9 +95,6 @@ clone:
   depth: full
 
 pipelines:
-  default:
-    - step:
-        <<: *build
   branches:
     master:
       - parallel:
@@ -107,6 +110,8 @@ pipelines:
                   - mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout > target/pom_version
                 artifacts:
                   - target/pom_version
+            - step:
+                <<: *dependencyTree
             - step:
                 <<: *sigridPublish
       - step:
@@ -145,6 +150,8 @@ pipelines:
                 artifacts:
                   - "**/*.jar"
                   - target/pom_version
+            - step:
+                <<: *dependencyTree
             - step:
                 <<: *sigridPublish
       - step:
@@ -198,6 +205,8 @@ pipelines:
                   - mvn -B -U clean verify sonar:sonar -s .m2/settings.xml -Dbuild=bitbucket  -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=${SONAR_PROJECT} -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name="$BITBUCKET_BRANCH"
                 artifacts:
                   - "**/*.jar"
+            - step:
+                <<: *dependencyTree
             - step:
                 <<: *sigridCI
   custom:

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.12.0</version>
+        <version>2.13.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interfaces/pom.xml b/interfaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.12.0</version>
+    <version>2.13.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/interfaces/src/main/java/be/vlaanderen/vip/magda/exception/NoResponseException.java b/interfaces/src/main/java/be/vlaanderen/vip/magda/exception/NoResponseException.java
@@ -17,11 +17,13 @@ public class NoResponseException extends ServerException {
     private final UUID transactionID;
     private final UUID localTransactionID;
     private final String serviceName;
+    private final int statusCode;
 
-    public NoResponseException(String bericht, Throwable oorzaak, MagdaRequest magdaRequest) {
+    public NoResponseException(String bericht, Throwable oorzaak, MagdaRequest magdaRequest, int statusCode) {
         super(bericht, oorzaak);
         this.transactionID = magdaRequest.getCorrelationId();
         this.localTransactionID = magdaRequest.getRequestId();
         this.serviceName = magdaRequest.magdaServiceIdentification().getName();
+        this.statusCode = statusCode;
     }
 }
diff --git a/magdaconnector/pom.xml b/magdaconnector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.12.0</version>
+    <version>2.13.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/magdaconnector/src/main/java/be/vlaanderen/vip/magda/client/MagdaConnectorImpl.java b/magdaconnector/src/main/java/be/vlaanderen/vip/magda/client/MagdaConnectorImpl.java
@@ -79,7 +79,7 @@ public MagdaResponse send(MagdaRequest magdaRequest) throws ServerException {
         } catch (MagdaConnectionException e) {
             logNoResponse(magdaRequest);
 
-            throw new NoResponseException("No response", e, magdaRequest);
+            throw new NoResponseException("No response", e, magdaRequest, e.getStatusCode());
         } finally {
             CorrelationId.clear();
         }

diff --git a/magdaconnector/src/test/java/be/vlaanderen/vip/magda/client/MagdaConnectorImplTest.java b/magdaconnector/src/test/java/be/vlaanderen/vip/magda/client/MagdaConnectorImplTest.java
@@ -84,36 +84,39 @@ void sendDocumentReturnsNull() {
 
 			@Test
 			void requestFails() throws MagdaConnectionException {
-				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong"));
+				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong", 500));
 
 				var req = GeefBewijsRequest.builder()
 						.insz("test-insz")
 						.build();
 
-				assertThrows(NoResponseException.class, () -> connector.send(req));
+				NoResponseException noResponseException = assertThrows(NoResponseException.class, () -> connector.send(req));
+				assertEquals(noResponseException.getStatusCode(), 500);
 			}
 
 			@Test
 			void logsRequest() throws MagdaConnectionException {
-				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong"));
+				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong", 500));
 
 				var req = GeefBewijsRequest.builder()
 						.insz("test-insz")
 						.build();
 
-				assertThrows(NoResponseException.class, () -> connector.send(req));
+				NoResponseException noResponseException = assertThrows(NoResponseException.class, () -> connector.send(req));
+				assertEquals(noResponseException.getStatusCode(), 500);
 				verify(logService).logMagdaRequest(any());
 			}
 
 			@Test
 			void logsNoReply() throws MagdaConnectionException {
-				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong"));
+				when(connection.sendDocument(any())).thenThrow(new MagdaConnectionException("something went wrong", 500));
 
 				var req = GeefBewijsRequest.builder()
 						.insz("test-insz")
 						.build();
 
-				assertThrows(NoResponseException.class, () -> connector.send(req));
+				NoResponseException noResponseException = assertThrows(NoResponseException.class, () -> connector.send(req));
+				assertEquals(noResponseException.getStatusCode(), 500);
 				verify(logService).logUnansweredRequest(any());
 			}
 		}

diff --git a/magdamock-starter/pom.xml b/magdamock-starter/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>magda</artifactId>
 		<groupId>be.vlaanderen.vip.mock</groupId>
-		<version>2.12.0</version>
+		<version>2.13.0</version>
 	</parent>
 	<artifactId>magdamock-starter</artifactId>
 

diff --git a/magdamock/pom.xml b/magdamock/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.12.0</version>
+    <version>2.13.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/magdaservice/pom.xml b/magdaservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>magda</artifactId>
     <groupId>be.vlaanderen.vip.mock</groupId>
-    <version>2.12.0</version>
+    <version>2.13.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>be.vlaanderen.vip.mock</groupId>
 	<artifactId>magda</artifactId>
-	<version>2.12.0</version>
+	<version>2.13.0</version>
 	<name>magdaservice</name>
 	<description>MAGDA diensten Mock voor afnemers</description>
 	<properties>

diff --git a/signing/pom.xml b/signing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.12.0</version>
+        <version>2.13.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/tester/pom.xml b/tester/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>magda</artifactId>
         <groupId>be.vlaanderen.vip.mock</groupId>
-        <version>2.12.0</version>
+        <version>2.13.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>