提交 69d3e898 编写于 作者: J Juergen Hoeller

Polishing

上级 daf29118
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.util; package org.springframework.util;
import java.util.Comparator; import java.util.Comparator;
...@@ -23,13 +24,14 @@ import org.springframework.lang.Nullable; ...@@ -23,13 +24,14 @@ import org.springframework.lang.Nullable;
/** /**
* Contract for matching routes to patterns. * Contract for matching routes to patterns.
* *
* <p>Equivalent to {@link PathMatcher}, but enables use of parsed * <p>Equivalent to {@link PathMatcher}, but enables use of parsed representations
* representations of routes and patterns for efficiency reasons in scenarios * of routes and patterns for efficiency reasons in scenarios where routes from
* where routes from incoming messages are continuously matched against a * incoming messages are continuously matched against a large number of message
* large number of message handler patterns. * handler patterns.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 5.2 * @since 5.2
* @see PathMatcher
*/ */
public interface RouteMatcher { public interface RouteMatcher {
......
...@@ -147,28 +147,28 @@ public class ResolvableTypeTests { ...@@ -147,28 +147,28 @@ public class ResolvableTypeTests {
} }
@Test @Test
public void forInstanceMustNotBeNull() { public void forInstanceMustNotBeNull() throws Exception {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->
ResolvableType.forInstance(null)) ResolvableType.forInstance(null))
.withMessageContaining("Instance must not be null"); .withMessageContaining("Instance must not be null");
} }
@Test @Test
public void forInstanceNoProvider() { public void forInstanceNoProvider() throws Exception {
ResolvableType type = ResolvableType.forInstance(new Object()); ResolvableType type = ResolvableType.forInstance(new Object());
assertThat(type.getType()).isEqualTo(Object.class); assertThat(type.getType()).isEqualTo(Object.class);
assertThat(type.resolve()).isEqualTo(Object.class); assertThat(type.resolve()).isEqualTo(Object.class);
} }
@Test @Test
public void forInstanceProvider() { public void forInstanceProvider() throws Exception {
ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<>(String.class)); ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<>(String.class));
assertThat(type.getRawClass()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.getRawClass()).isEqualTo(MyGenericInterfaceType.class);
assertThat(type.getGeneric().resolve()).isEqualTo(String.class); assertThat(type.getGeneric().resolve()).isEqualTo(String.class);
} }
@Test @Test
public void forInstanceProviderNull() { public void forInstanceProviderNull() throws Exception {
ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<String>(null)); ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<String>(null));
assertThat(type.getType()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.getType()).isEqualTo(MyGenericInterfaceType.class);
assertThat(type.resolve()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.resolve()).isEqualTo(MyGenericInterfaceType.class);
...@@ -1348,6 +1348,7 @@ public class ResolvableTypeTests { ...@@ -1348,6 +1348,7 @@ public class ResolvableTypeTests {
return new ResolvableTypeAssert(type); return new ResolvableTypeAssert(type);
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
private HashMap<Integer, List<String>> myMap; private HashMap<Integer, List<String>> myMap;
...@@ -1356,7 +1357,6 @@ public class ResolvableTypeTests { ...@@ -1356,7 +1357,6 @@ public class ResolvableTypeTests {
static class ExtendsList extends ArrayList<CharSequence> { static class ExtendsList extends ArrayList<CharSequence> {
} }
@SuppressWarnings("serial") @SuppressWarnings("serial")
static class ExtendsMap extends HashMap<String, Integer> { static class ExtendsMap extends HashMap<String, Integer> {
} }
...@@ -1615,6 +1615,7 @@ public class ResolvableTypeTests { ...@@ -1615,6 +1615,7 @@ public class ResolvableTypeTests {
Set<Integer> set; Set<Integer> set;
} }
private static class ResolvableTypeAssert extends AbstractAssert<ResolvableTypeAssert, ResolvableType>{ private static class ResolvableTypeAssert extends AbstractAssert<ResolvableTypeAssert, ResolvableType>{
public ResolvableTypeAssert(ResolvableType actual) { public ResolvableTypeAssert(ResolvableType actual) {
...@@ -1648,7 +1649,6 @@ public class ResolvableTypeTests { ...@@ -1648,7 +1649,6 @@ public class ResolvableTypeTests {
} }
return type.getType() + ":" + type; return type.getType() + ":" + type;
} }
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册