Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-10-24 14:34:56 +02:00
parent c92393b168
commit be5b9354a9
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ abstract class AbstractConditionalEnumConverter implements ConditionalConverter
@Override
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClass(sourceType.getType())) {
for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClassAsSet(sourceType.getType())) {
if (this.conversionService.canConvert(TypeDescriptor.valueOf(interfaceType), targetType)) {
return false;
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -152,8 +152,7 @@ public class Projection extends SpelNodeImpl {
}
nextType = nextType.getSuperclass();
}
Class<?>[] interfaces = ClassUtils.getAllInterfacesForClass(newType);
for (Class<?> nextInterface : interfaces) {
for (Class<?> nextInterface : ClassUtils.getAllInterfacesForClassAsSet(newType)) {
if (nextInterface.isAssignableFrom(oldType)) {
return nextInterface;
}

6
src/asciidoc/integration.adoc
View File

@@ -3656,12 +3656,12 @@ metadata-driven management interfaces for your Spring-exposed MBeans.
[[jmx-interface-metadata-types]]
==== Source-Level metadata types
==== Source-level metadata types
The following source level metadata types are available for use in Spring JMX:
[[jmx-metadata-types]]
.Source-Level Metadata Types
.Source-level metadata types
|===
| Purpose| Annotation| Annotation Type
@@ -3686,7 +3686,7 @@ The following configuration parameters are available for use on these source-lev
metadata types:
[[jmx-metadata-parameters]]
.Source-Level metadata parameters
.Source-level metadata parameters
[cols="1,3,1"]
|===
| Parameter| Description| Applies to