Skip to content

Commit

Permalink
Polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoeller committed Jul 20, 2019
1 parent daf2911 commit 69d3e89
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
Expand Up @@ -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;
Expand All @@ -23,13 +24,14 @@
/**
* Contract for matching routes to patterns.
*
* <p>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.
* <p>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 {

Expand Down
Expand Up @@ -147,28 +147,28 @@ public void forRawClassAssignableFromTypeVariable() { // gh-23321
}

@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<String>(null));
assertThat(type.getType()).isEqualTo(MyGenericInterfaceType.class);
assertThat(type.resolve()).isEqualTo(MyGenericInterfaceType.class);
Expand Down Expand Up @@ -1348,6 +1348,7 @@ private static ResolvableTypeAssert assertThatResolvableType(ResolvableType type
return new ResolvableTypeAssert(type);
}


@SuppressWarnings("unused")
private HashMap<Integer, List<String>> myMap;

Expand All @@ -1356,7 +1357,6 @@ private static ResolvableTypeAssert assertThatResolvableType(ResolvableType type
static class ExtendsList extends ArrayList<CharSequence> {
}


@SuppressWarnings("serial")
static class ExtendsMap extends HashMap<String, Integer> {
}
Expand Down Expand Up @@ -1615,6 +1615,7 @@ public abstract class UnresolvedWithGenerics {
Set<Integer> set;
}


private static class ResolvableTypeAssert extends AbstractAssert<ResolvableTypeAssert, ResolvableType>{

public ResolvableTypeAssert(ResolvableType actual) {
Expand Down Expand Up @@ -1648,7 +1649,6 @@ private String decribe(ResolvableType type) {
}
return type.getType() + ":" + type;
}

}

}

0 comments on commit 69d3e89

Please sign in to comment.