Skip to content

Commit be5b935

Browse files
committed
Polishing
1 parent c92393b commit be5b935

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

spring-core/src/main/java/org/springframework/core/convert/support/AbstractConditionalEnumConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 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.
@@ -39,7 +39,7 @@ protected AbstractConditionalEnumConverter(ConversionService conversionService)
3939

4040
@Override
4141
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
42-
for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClass(sourceType.getType())) {
42+
for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClassAsSet(sourceType.getType())) {
4343
if (this.conversionService.canConvert(TypeDescriptor.valueOf(interfaceType), targetType)) {
4444
return false;
4545
}

spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2017 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.
@@ -152,8 +152,7 @@ private Class<?> determineCommonType(Class<?> oldType, Class<?> newType) {
152152
}
153153
nextType = nextType.getSuperclass();
154154
}
155-
Class<?>[] interfaces = ClassUtils.getAllInterfacesForClass(newType);
156-
for (Class<?> nextInterface : interfaces) {
155+
for (Class<?> nextInterface : ClassUtils.getAllInterfacesForClassAsSet(newType)) {
157156
if (nextInterface.isAssignableFrom(oldType)) {
158157
return nextInterface;
159158
}

src/asciidoc/integration.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3656,12 +3656,12 @@ metadata-driven management interfaces for your Spring-exposed MBeans.
36563656

36573657

36583658
[[jmx-interface-metadata-types]]
3659-
==== Source-Level metadata types
3659+
==== Source-level metadata types
36603660

36613661
The following source level metadata types are available for use in Spring JMX:
36623662

36633663
[[jmx-metadata-types]]
3664-
.Source-Level Metadata Types
3664+
.Source-level metadata types
36653665
|===
36663666
| Purpose| Annotation| Annotation Type
36673667

@@ -3686,7 +3686,7 @@ The following configuration parameters are available for use on these source-lev
36863686
metadata types:
36873687

36883688
[[jmx-metadata-parameters]]
3689-
.Source-Level metadata parameters
3689+
.Source-level metadata parameters
36903690
[cols="1,3,1"]
36913691
|===
36923692
| Parameter| Description| Applies to

0 commit comments

Comments
 (0)