Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDCSRM-185 Fix Dependabot test failures in rh-service #54

Merged
merged 1 commit into from
Apr 2, 2024
Merged

SDCSRM-185 Fix Dependabot test failures in rh-service #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
</parent>

<dependencyManagement>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>spring-cloud-gcp-dependencies</artifactId>
<version>5.0.0</version>
<version>5.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.23</version>
<version>9.37.3</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
Expand Down Expand Up @@ -169,7 +169,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.16.0</version>
<version>3.21.2</version>
<configuration>
<excludeFromFailureFile>exclude-pmd.properties</excludeFromFailureFile>
<failurePriority>3</failurePriority>
Expand Down Expand Up @@ -250,7 +250,7 @@
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.9.1</version>
<version>2.13</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/uk/gov/ons/ssdc/rhservice/crypto/EncodeJws.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.nimbusds.jose.Payload;
import com.nimbusds.jose.crypto.RSASSASigner;
import com.nimbusds.jose.jwk.RSAKey;
import com.nimbusds.jose.shaded.json.JSONObject;
import java.util.Map;
import org.springframework.stereotype.Service;
import uk.gov.ons.ssdc.rhservice.model.dto.Key;
Expand Down Expand Up @@ -53,7 +52,6 @@ private JWSHeader buildHeader(Key key) {
}

private Payload buildClaims(Map<String, Object> claims) {
JSONObject jsonObject = new JSONObject(claims);
return new Payload(jsonObject);
return new Payload(claims);
}
}
6 changes: 4 additions & 2 deletions src/main/java/uk/gov/ons/ssdc/rhservice/service/LaunchDataFieldSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ public void stampLaunchDataFieldsOnUAC(UacUpdateDTO uacUpdateDTO) {

private List<EqLaunchSettings> getEqLaunchSettingsFromCollectionExercise(
String collectionExerciseId, String collectionInstrumentUrl) {
return collectionExerciseRepository.readCollectionExerciseUpdate(collectionExerciseId)
return collectionExerciseRepository
.readCollectionExerciseUpdate(collectionExerciseId)
.orElseThrow(
() -> new RuntimeException("Collection Exercise not found: " + collectionExerciseId))
.getCollectionInstrumentRules().stream()
.getCollectionInstrumentRules()
.stream()
.filter(
collexInstrumentRule ->
collexInstrumentRule.getCollectionInstrumentUrl().equals(collectionInstrumentUrl))
Expand Down
Loading