From 69d3e898143e82d7404d66bcc532f1eb02acf8f6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 20 Jul 2019 15:05:49 +0200 Subject: [PATCH] Polishing --- .../java/org/springframework/util/RouteMatcher.java | 10 ++++++---- .../springframework/core/ResolvableTypeTests.java | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/RouteMatcher.java b/spring-core/src/main/java/org/springframework/util/RouteMatcher.java index 22d384895a..bf03b7b146 100644 --- a/spring-core/src/main/java/org/springframework/util/RouteMatcher.java +++ b/spring-core/src/main/java/org/springframework/util/RouteMatcher.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.util; import java.util.Comparator; @@ -23,13 +24,14 @@ import org.springframework.lang.Nullable; /** * Contract for matching routes to patterns. * - *

Equivalent to {@link PathMatcher}, but enables use of parsed - * representations of routes and patterns for efficiency reasons in scenarios - * where routes from incoming messages are continuously matched against a - * large number of message handler patterns. + *

Equivalent to {@link PathMatcher}, but enables use of parsed representations + * of routes and patterns for efficiency reasons in scenarios where routes from + * incoming messages are continuously matched against a large number of message + * handler patterns. * * @author Rossen Stoyanchev * @since 5.2 + * @see PathMatcher */ public interface RouteMatcher { diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 2aa22920ac..b3168b883c 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -147,28 +147,28 @@ public class ResolvableTypeTests { } @Test - public void forInstanceMustNotBeNull() { + public void forInstanceMustNotBeNull() throws Exception { assertThatIllegalArgumentException().isThrownBy(() -> ResolvableType.forInstance(null)) .withMessageContaining("Instance must not be null"); } @Test - public void forInstanceNoProvider() { + public void forInstanceNoProvider() throws Exception { ResolvableType type = ResolvableType.forInstance(new Object()); assertThat(type.getType()).isEqualTo(Object.class); assertThat(type.resolve()).isEqualTo(Object.class); } @Test - public void forInstanceProvider() { + public void forInstanceProvider() throws Exception { ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<>(String.class)); assertThat(type.getRawClass()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.getGeneric().resolve()).isEqualTo(String.class); } @Test - public void forInstanceProviderNull() { + public void forInstanceProviderNull() throws Exception { ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType(null)); assertThat(type.getType()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.resolve()).isEqualTo(MyGenericInterfaceType.class); @@ -1348,6 +1348,7 @@ public class ResolvableTypeTests { return new ResolvableTypeAssert(type); } + @SuppressWarnings("unused") private HashMap> myMap; @@ -1356,7 +1357,6 @@ public class ResolvableTypeTests { static class ExtendsList extends ArrayList { } - @SuppressWarnings("serial") static class ExtendsMap extends HashMap { } @@ -1615,6 +1615,7 @@ public class ResolvableTypeTests { Set set; } + private static class ResolvableTypeAssert extends AbstractAssert{ public ResolvableTypeAssert(ResolvableType actual) { @@ -1648,7 +1649,6 @@ public class ResolvableTypeTests { } return type.getType() + ":" + type; } - } } -- GitLab