Skip to content

Commit 1790f23

Browse files
committed
Fix Checkstyle violations
* Upgrade to Spring Security `6.0.0-M5`
1 parent ed6f261 commit 1790f23

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ ext {
103103
springGraphqlVersion = '1.0.0'
104104
springKafkaVersion = '3.0.0-M4'
105105
springRetryVersion = '1.3.3'
106-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4'
106+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M5'
107107
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'
108108
springWsVersion = '4.0.0-M2'
109109
testcontainersVersion = '1.17.1'

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 the original author or authors.
2+
* Copyright 2021-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@
1919
import org.testcontainers.containers.MySQLContainer;
2020
import org.testcontainers.junit.jupiter.Container;
2121
import org.testcontainers.junit.jupiter.Testcontainers;
22-
import org.testcontainers.utility.DockerImageName;
23-
24-
import org.springframework.integration.test.util.TestUtils;
2522

2623
/**
2724
* The base contract for JUnit tests based on the container for MqSQL.

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 the original author or authors.
2+
* Copyright 2021-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
2020
import org.testcontainers.junit.jupiter.Container;
2121
import org.testcontainers.junit.jupiter.Testcontainers;
2222

23-
import org.springframework.integration.test.util.TestUtils;
24-
2523
/**
2624
*
2725
* @author Artem Bilan

spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
2121
import java.util.HashMap;
2222
import java.util.List;
2323
import java.util.Map;
24-
import java.util.Optional;
2524
import java.util.Properties;
2625
import java.util.Set;
2726
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
@@ -375,16 +374,7 @@ public static void revertLogLevels(String methodName, LevelsContainer container)
375374
ctx.updateLoggers();
376375
}
377376

378-
public static class LevelsContainer {
379-
380-
private final Map<Class<?>, Level> classLevels;
381-
382-
private final Map<String, Level> categoryLevels;
383-
384-
public LevelsContainer(Map<Class<?>, Level> classLevels, Map<String, Level> categoryLevels) {
385-
this.classLevels = classLevels;
386-
this.categoryLevels = categoryLevels;
387-
}
377+
public record LevelsContainer(Map<Class<?>, Level> classLevels, Map<String, Level> categoryLevels) {
388378

389379
}
390380

0 commit comments

Comments
 (0)