Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbucket-pipelines committed Nov 28, 2024
2 parents d7aeb5c + cac409b commit 2fda850
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 170 deletions.
66 changes: 33 additions & 33 deletions bitbucket-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,21 @@ clone:
pipelines:
branches:
master:
- parallel:
steps:
- step:
name: Check
caches:
- maven
script:
# Only run for released version
- mvn -B -s .m2/settings.xml org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce -Drules=requireReleaseVersion
- mkdir -p target
- 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:
<<: *sigridPublish
- step:
name: Check
caches:
- maven
script:
# Only run for released version
- mvn -B -s .m2/settings.xml org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce -Drules=requireReleaseVersion
- mkdir -p target
- mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout > target/pom_version
- mvn dependency:tree > maven.tree
artifacts:
- target/pom_version
- maven.tree
- step:
<<: *sigridPublish
- step:
<<: *deploy
name: Deploy release to TST
Expand All @@ -128,24 +128,24 @@ pipelines:
trigger: manual
deployment: PRD_SOLID
develop:
- parallel:
steps:
- step:
name: Maven
caches:
- maven
- docker
script:
- export TESTCONTAINERS_RYUK_DISABLED=true
- export MAVEN_OPTS="-Xmx1024m"
- mvn -B -U clean deploy sonar:sonar -s .m2/settings.xml -Dbuild=bitbucket -Pdocker -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=${SONAR_PROJECT} -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD}
- mkdir -p target
- mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout > target/pom_version
artifacts:
- "**/*.jar"
- target/pom_version
- step:
<<: *sigridPublish
- step:
name: Maven
caches:
- maven
- docker
script:
- export TESTCONTAINERS_RYUK_DISABLED=true
- export MAVEN_OPTS="-Xmx1024m"
- mvn -B -U clean deploy sonar:sonar -s .m2/settings.xml -Dbuild=bitbucket -Pdocker -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=${SONAR_PROJECT} -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD}
- mkdir -p target
- mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout > target/pom_version
- mvn dependency:tree > maven.tree
artifacts:
- "**/*.jar"
- target/pom_version
- maven.tree
- step:
<<: *sigridPublish
- step:
<<: *deploy
name: Deploy to BETA
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
46 changes: 0 additions & 46 deletions deploy-application.sh
View file

This file was deleted.

56 changes: 0 additions & 56 deletions deploy-job.sh
View file

This file was deleted.

14 changes: 0 additions & 14 deletions deployment_template.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion interfaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion magdaconnector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
19 changes: 11 additions & 8 deletions magdaconnector/src/main/java/be/vlaanderen/vip/magda/client/MagdaConnectorImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ public MagdaResponse send(MagdaRequest magdaRequest, UUID requestId) throws Serv
legalLogging(magdaRequest, requestId, duration, uitzonderingen, antwoord.getSubjects());

final var antwoordUitzonderingen = antwoord.getResponseUitzonderingEntries();
var uitzonderingenMessage1 = messageForUitzonderingEntries(uitzonderingen, antwoordUitzonderingen);

magdaRequestLoggingEventBuilder(log, Level.INFO, magdaRequest)
.log("Result of request to MAGDA service with reference [{}] ({} ms): {}", requestId, duration.toMillis(), uitzonderingenMessage1);
if(antwoordUitzonderingen.isEmpty() && uitzonderingen.isEmpty()) {
logRequestResultMessage(Level.INFO, magdaRequest, requestId, duration, "Ok");
} else {
logRequestResultMessage(Level.WARN, magdaRequest, requestId, duration, messageForUitzonderingEntries(uitzonderingen, antwoordUitzonderingen));
}

if(!antwoord.isHasContents() && antwoordUitzonderingen.isEmpty() && uitzonderingen.isEmpty()) {
throw new UitzonderingenSectionInResponseException(magdaRequest.getSubject(), getLevel1UitzonderingEntry(response), magdaRequest.magdaServiceIdentification(), magdaRequest.getCorrelationId(), requestId);
Expand Down Expand Up @@ -159,11 +161,12 @@ private void logAllUitzonderingEntries(MagdaRequest magdaRequest, UUID requestId


private String messageForUitzonderingEntries(List<UitzonderingEntry> uitzonderingenEntries, List<UitzonderingEntry> responseUitzonderingEntries) {
var uitzonderingenMessage1 = "Ok";
if (!responseUitzonderingEntries.isEmpty() || !uitzonderingenEntries.isEmpty()) {
uitzonderingenMessage1 = formatUitzonderingEntries("Level 2: ", uitzonderingenEntries) + formatUitzonderingEntries("Level 3: ", responseUitzonderingEntries);
}
return uitzonderingenMessage1;
return formatUitzonderingEntries("Level 2: ", uitzonderingenEntries) + formatUitzonderingEntries("Level 3: ", responseUitzonderingEntries);
}

private void logRequestResultMessage(Level logLevel, MagdaRequest magdaRequest, UUID requestId, Duration duration, String message) {
magdaRequestLoggingEventBuilder(log, logLevel, magdaRequest)
.log("Result of request to MAGDA service with reference [{}] ({} ms): {}", requestId, duration.toMillis(), message);
}

private void legalLogging(MagdaRequest magdaRequest, UUID requestId, Duration duration, List<UitzonderingEntry> uitzonderingEntries, Set<SubjectIdentificationNumber> subjects) {
Expand Down
4 changes: 2 additions & 2 deletions magdamock-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<artifactId>magdamock-starter</artifactId>

Expand Down Expand Up @@ -66,7 +66,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>4.0.0.4121</version>
<version>5.0.0.4389</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion magdamock/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion magdaservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>be.vlaanderen.vip.mock</groupId>
<artifactId>magda</artifactId>
<version>2.53.0</version>
<version>2.54.0</version>
<name>magdaservice</name>
<description>MAGDA diensten Mock voor afnemers</description>
<properties>
Expand Down Expand Up @@ -38,8 +38,8 @@
<springdoc.api>1.8.0</springdoc.api>
<springfox-swagger2.version>3.0.0</springfox-swagger2.version>
<testrunner.version>0.2.0</testrunner.version>
<apache.httpcomponents.version>5.4</apache.httpcomponents.version>
<brave.version>5.17.1</brave.version>
<apache.httpcomponents.version>5.4.1</apache.httpcomponents.version>
<brave.version>6.0.3</brave.version>
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-aggregated/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.language>java</sonar.language>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion signing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tester/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>magda</artifactId>
<groupId>be.vlaanderen.vip.mock</groupId>
<version>2.53.0</version>
<version>2.54.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit 2fda850

Please sign in to comment.