Skip to content

Commit c3c2bcd

Browse files
committed
Ignore Serialization in Test Components
Since we don't need to ensure the serializability of test components across versions, we can ignore missing version UIDs when those test components aren't about testing Java serialization. Issue gh-17038
1 parent 39fdcea commit c3c2bcd

File tree

5 files changed

+6
-20
lines changed

5 files changed

+6
-20
lines changed

config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -740,17 +740,11 @@ void shouldBeAbleToDeserializeClassFromCurrentVersion(Path filePath) {
740740
}
741741
}
742742

743-
static Stream<Path> getCurrentSerializedFiles() throws IOException {
743+
static Stream<Path> getCurrentSerializedFiles() throws Exception {
744744
assertThat(currentVersionFolder.toFile().exists())
745745
.as("Make sure that the " + currentVersionFolder + " exists and is not empty")
746746
.isTrue();
747-
try (Stream<Path> files = Files.list(currentVersionFolder)) {
748-
if (files.findFirst().isEmpty()) {
749-
fail("Please make sure to run SpringSecurityCoreVersionSerializableTests#serializeCurrentVersionClasses for the "
750-
+ getPreviousVersion() + " version");
751-
}
752-
}
753-
return Files.list(currentVersionFolder);
747+
return getClassesToSerialize().map((clazz) -> currentVersionFolder.resolve(clazz.getName() + ".serialized"));
754748
}
755749

756750
@ParameterizedTest

config/src/test/java/org/springframework/security/config/annotation/method/configuration/Authz.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public Mono<AuthorizationResult> checkReactiveResult(boolean result) {
5555
return Mono.just(checkResult(result));
5656
}
5757

58+
@SuppressWarnings("serial")
5859
public static class AuthzResult extends AuthorizationDecision {
5960

6061
public AuthzResult(boolean granted) {

core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,15 @@
1616

1717
package org.springframework.security.access.annotation;
1818

19-
import java.io.Serial;
2019
import java.util.ArrayList;
2120
import java.util.List;
2221

2322
/**
2423
* @author Joe Scalise
2524
*/
25+
@SuppressWarnings("serial")
2626
public class BusinessServiceImpl<E extends Entity> implements BusinessService {
2727

28-
@Serial
29-
private static final long serialVersionUID = -4249394090237180795L;
30-
3128
@Override
3229
@Secured({ "ROLE_USER" })
3330
public void someUserMethod1() {

core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,16 @@
1616

1717
package org.springframework.security.access.annotation;
1818

19-
import java.io.Serial;
2019
import java.util.ArrayList;
2120
import java.util.List;
2221

2322
import org.springframework.security.access.prepost.PostFilter;
2423
import org.springframework.security.access.prepost.PreAuthorize;
2524
import org.springframework.security.access.prepost.PreFilter;
2625

26+
@SuppressWarnings("serial")
2727
public class ExpressionProtectedBusinessServiceImpl implements BusinessService {
2828

29-
@Serial
30-
private static final long serialVersionUID = -3320014879907436606L;
31-
3229
@Override
3330
public void someAdminMethod() {
3431
}

core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.security.access.annotation;
1818

19-
import java.io.Serial;
2019
import java.util.ArrayList;
2120
import java.util.List;
2221

@@ -27,11 +26,9 @@
2726
* @author Luke Taylor
2827
*/
2928
@PermitAll
29+
@SuppressWarnings("serial")
3030
public class Jsr250BusinessServiceImpl implements BusinessService {
3131

32-
@Serial
33-
private static final long serialVersionUID = -7550211450382764339L;
34-
3532
@Override
3633
@RolesAllowed("ROLE_USER")
3734
public void someUserMethod1() {

0 commit comments

Comments
 (0)