Skip to content

Commit 224932c

Browse files
committed
fix: upgrade to latest spring boot, remove deprecated classes
WE2-1209 Signed-off-by: Sven Mitt <svenzik@users.noreply.github.com>
1 parent 310e10f commit 224932c

5 files changed

Lines changed: 13 additions & 19 deletions

File tree

example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.5.3</version>
8+
<version>4.0.6</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>eu.webeid.example</groupId>

example/src/main/java/eu/webeid/example/config/SameSiteCookieConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package eu.webeid.example.config;
2424

2525
import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
26-
import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
26+
import org.springframework.boot.tomcat.TomcatContextCustomizer;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
2929
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

example/src/main/java/eu/webeid/example/security/ajax/AjaxAuthenticationSuccessHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
package eu.webeid.example.security.ajax;
2424

2525
import com.fasterxml.jackson.annotation.JsonProperty;
26-
import tools.jackson.core.JsonProcessingException;
2726
import tools.jackson.databind.ObjectMapper;
2827
import tools.jackson.databind.ObjectWriter;
2928
import jakarta.servlet.http.HttpServletRequest;
@@ -70,7 +69,7 @@ public static class AuthSuccessDTO {
7069
@JsonProperty("auth")
7170
private String auth;
7271

73-
public static String asJson(Authentication authentication) throws JsonProcessingException {
72+
public static String asJson(Authentication authentication) {
7473
final AuthSuccessDTO dto = new AuthSuccessDTO();
7574
dto.sub = authentication.getName();
7675
dto.auth = authentication.getAuthorities().toString();

example/src/test/java/eu/webeid/example/WebApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void validateOcspResponse(XadesSignature xadesSignature) {
110110
MvcResult result = HttpHelper.login(mvcBuilder, session, ObjectMother.mockAuthToken());
111111
session = (MockHttpSession) result.getRequest().getSession();
112112
MockHttpServletResponse response = result.getResponse();
113-
assertEquals("{\"sub\":\"JAAK-KRISTJAN JÕEORG\",\"auth\":\"[ROLE_USER]\"}", response.getContentAsString());
113+
assertEquals("{\"auth\":\"[ROLE_USER]\",\"sub\":\"JAAK-KRISTJAN JÕEORG\"}", response.getContentAsString());
114114

115115
/* Example how to test file upload.
116116
response = HttpHelper.upload(mvcBuilder, session, mockMultipartFile());

example/src/test/java/eu/webeid/example/testutil/ObjectMother.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
package eu.webeid.example.testutil;
2424

25-
import tools.jackson.core.JsonProcessingException;
2625
import tools.jackson.databind.ObjectMapper;
2726
import eu.webeid.example.service.dto.SignatureAlgorithmDTO;
2827
import eu.webeid.security.authtoken.WebEidAuthToken;
@@ -50,17 +49,13 @@ public class ObjectMother {
5049
private static final WebEidAuthToken VALID_AUTH_TOKEN;
5150

5251
static {
53-
try {
54-
VALID_AUTH_TOKEN = MAPPER.readValue(
55-
"{\"algorithm\":\"ES384\"," +
56-
"\"unverifiedCertificate\":\"MIIEBDCCA2WgAwIBAgIQY5OGshxoPMFg+Wfc0gFEaTAKBggqhkjOPQQDBDBgMQswCQYDVQQGEwJFRTEbMBkGA1UECgwSU0sgSUQgU29sdXRpb25zIEFTMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEbMBkGA1UEAwwSVEVTVCBvZiBFU1RFSUQyMDE4MB4XDTIxMDcyMjEyNDMwOFoXDTI2MDcwOTIxNTk1OVowfzELMAkGA1UEBhMCRUUxKjAoBgNVBAMMIUrDlUVPUkcsSkFBSy1LUklTVEpBTiwzODAwMTA4NTcxODEQMA4GA1UEBAwHSsOVRU9SRzEWMBQGA1UEKgwNSkFBSy1LUklTVEpBTjEaMBgGA1UEBRMRUE5PRUUtMzgwMDEwODU3MTgwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQmwEKsJTjaMHSaZj19hb9EJaJlwbKc5VFzmlGMFSJVk4dDy+eUxa5KOA7tWXqzcmhh5SYdv+MxcaQKlKWLMa36pfgv20FpEDb03GCtLqjLTRZ7649PugAQ5EmAqIic29CjggHDMIIBvzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIDiDBHBgNVHSAEQDA+MDIGCysGAQQBg5EhAQIBMCMwIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzAIBgYEAI96AQIwHwYDVR0RBBgwFoEUMzgwMDEwODU3MThAZWVzdGkuZWUwHQYDVR0OBBYEFPlp/ceABC52itoqppEmbf71TJz6MGEGCCsGAQUFBwEDBFUwUzBRBgYEAI5GAQUwRzBFFj9odHRwczovL3NrLmVlL2VuL3JlcG9zaXRvcnkvY29uZGl0aW9ucy1mb3ItdXNlLW9mLWNlcnRpZmljYXRlcy8TAkVOMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAfBgNVHSMEGDAWgBTAhJkpxE6fOwI09pnhClYACCk+ezBzBggrBgEFBQcBAQRnMGUwLAYIKwYBBQUHMAGGIGh0dHA6Ly9haWEuZGVtby5zay5lZS9lc3RlaWQyMDE4MDUGCCsGAQUFBzAChilodHRwOi8vYy5zay5lZS9UZXN0X29mX0VTVEVJRDIwMTguZGVyLmNydDAKBggqhkjOPQQDBAOBjAAwgYgCQgDCAgybz0u3W+tGI+AX+PiI5CrE9ptEHO5eezR1Jo4j7iGaO0i39xTGUB+NSC7P6AQbyE/ywqJjA1a62jTLcS9GHAJCARxN4NO4eVdWU3zVohCXm8WN3DWA7XUcn9TZiLGQ29P4xfQZOXJi/z4PNRRsR4plvSNB3dfyBvZn31HhC7my8woi\"," +
57-
"\"appVersion\":\"https://web-eid.eu/web-eid-app/releases/2.5.0+0\"," +
58-
"\"signature\":\"0Ov7ME6pTY1K2GXMj8Wxov/o2fGIMEds8OMY5dKdkB0nrqQX7fG1E5mnsbvyHpMDecMUH6Yg+p1HXdgB/lLqOcFZjt/OVXPjAAApC5d1YgRYATDcxsR1zqQwiNcHdmWn\"," +
59-
"\"format\":\"web-eid:1.0\"}",
60-
WebEidAuthToken.class);
61-
} catch (JsonProcessingException e) {
62-
throw new RuntimeException("Token parsing failed");
63-
}
52+
VALID_AUTH_TOKEN = MAPPER.readValue(
53+
"{\"algorithm\":\"ES384\"," +
54+
"\"unverifiedCertificate\":\"MIIEBDCCA2WgAwIBAgIQY5OGshxoPMFg+Wfc0gFEaTAKBggqhkjOPQQDBDBgMQswCQYDVQQGEwJFRTEbMBkGA1UECgwSU0sgSUQgU29sdXRpb25zIEFTMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEbMBkGA1UEAwwSVEVTVCBvZiBFU1RFSUQyMDE4MB4XDTIxMDcyMjEyNDMwOFoXDTI2MDcwOTIxNTk1OVowfzELMAkGA1UEBhMCRUUxKjAoBgNVBAMMIUrDlUVPUkcsSkFBSy1LUklTVEpBTiwzODAwMTA4NTcxODEQMA4GA1UEBAwHSsOVRU9SRzEWMBQGA1UEKgwNSkFBSy1LUklTVEpBTjEaMBgGA1UEBRMRUE5PRUUtMzgwMDEwODU3MTgwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQmwEKsJTjaMHSaZj19hb9EJaJlwbKc5VFzmlGMFSJVk4dDy+eUxa5KOA7tWXqzcmhh5SYdv+MxcaQKlKWLMa36pfgv20FpEDb03GCtLqjLTRZ7649PugAQ5EmAqIic29CjggHDMIIBvzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIDiDBHBgNVHSAEQDA+MDIGCysGAQQBg5EhAQIBMCMwIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzAIBgYEAI96AQIwHwYDVR0RBBgwFoEUMzgwMDEwODU3MThAZWVzdGkuZWUwHQYDVR0OBBYEFPlp/ceABC52itoqppEmbf71TJz6MGEGCCsGAQUFBwEDBFUwUzBRBgYEAI5GAQUwRzBFFj9odHRwczovL3NrLmVlL2VuL3JlcG9zaXRvcnkvY29uZGl0aW9ucy1mb3ItdXNlLW9mLWNlcnRpZmljYXRlcy8TAkVOMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAfBgNVHSMEGDAWgBTAhJkpxE6fOwI09pnhClYACCk+ezBzBggrBgEFBQcBAQRnMGUwLAYIKwYBBQUHMAGGIGh0dHA6Ly9haWEuZGVtby5zay5lZS9lc3RlaWQyMDE4MDUGCCsGAQUFBzAChilodHRwOi8vYy5zay5lZS9UZXN0X29mX0VTVEVJRDIwMTguZGVyLmNydDAKBggqhkjOPQQDBAOBjAAwgYgCQgDCAgybz0u3W+tGI+AX+PiI5CrE9ptEHO5eezR1Jo4j7iGaO0i39xTGUB+NSC7P6AQbyE/ywqJjA1a62jTLcS9GHAJCARxN4NO4eVdWU3zVohCXm8WN3DWA7XUcn9TZiLGQ29P4xfQZOXJi/z4PNRRsR4plvSNB3dfyBvZn31HhC7my8woi\"," +
55+
"\"appVersion\":\"https://web-eid.eu/web-eid-app/releases/2.5.0+0\"," +
56+
"\"signature\":\"0Ov7ME6pTY1K2GXMj8Wxov/o2fGIMEds8OMY5dKdkB0nrqQX7fG1E5mnsbvyHpMDecMUH6Yg+p1HXdgB/lLqOcFZjt/OVXPjAAApC5d1YgRYATDcxsR1zqQwiNcHdmWn\"," +
57+
"\"format\":\"web-eid:1.0\"}",
58+
WebEidAuthToken.class);
6459
}
6560

6661
public static final String VALID_CHALLENGE_NONCE = "12345678123456781234567812345678912356789123";
@@ -71,7 +66,7 @@ public static AuthTokenDTO mockAuthToken() {
7166
return authToken;
7267
}
7368

74-
public static String toJson(Object object) throws JsonProcessingException {
69+
public static String toJson(Object object) {
7570
return MAPPER.writeValueAsString(object);
7671
}
7772

@@ -89,7 +84,7 @@ public static String mockSignatureInBase64(String digestToSign) {
8984
return signDigest(DatatypeConverter.parseBase64Binary(digestToSign));
9085
}
9186

92-
public static <T> T jsonStringToBean(String jsonString, Class<T> valueType) throws JsonProcessingException {
87+
public static <T> T jsonStringToBean(String jsonString, Class<T> valueType) {
9388
return MAPPER.readValue(jsonString, valueType);
9489
}
9590

0 commit comments

Comments
 (0)