root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2014-12-07 20:52:18 +01:00
parent 03d4e1bc22
commit bb1d1e916e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
View File

@ -254,7 +254,7 @@ public abstract class YamlProcessor {
* contain the same values as the {@link MatchCallback} Properties. * contain the same values as the {@link MatchCallback} Properties.
* @param source the source map * @param source the source map
* @return a flattened map * @return a flattened map
* @since 4.2.3 * @since 4.1.3
*/ */
protected final Map<String, Object> getFlattenedMap(Map<String, Object> source) { protected final Map<String, Object> getFlattenedMap(Map<String, Object> source) {
Map<String, Object> result = new LinkedHashMap<String, Object>(); Map<String, Object> result = new LinkedHashMap<String, Object>();

4
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
View File

@ -235,10 +235,10 @@ class ConfigurationClassEnhancer {
@Override @Override
public boolean isMatch(Method candidateMethod) { public boolean isMatch(Method candidateMethod) {
return candidateMethod.getName().equals("setBeanFactory") && return (candidateMethod.getName().equals("setBeanFactory") &&
candidateMethod.getParameterTypes().length == 1 && candidateMethod.getParameterTypes().length == 1 &&
candidateMethod.getParameterTypes()[0].equals(BeanFactory.class) && candidateMethod.getParameterTypes()[0].equals(BeanFactory.class) &&
BeanFactoryAware.class.isAssignableFrom(candidateMethod.getDeclaringClass()); BeanFactoryAware.class.isAssignableFrom(candidateMethod.getDeclaringClass()));
} }
} }

7
spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -211,9 +211,8 @@ public abstract class BridgeMethodResolver {
if (bridgeMethod == bridgedMethod) { if (bridgeMethod == bridgedMethod) {
return true; return true;
} }
return Arrays.equals(bridgeMethod.getParameterTypes(), bridgedMethod.getParameterTypes()) && return (Arrays.equals(bridgeMethod.getParameterTypes(), bridgedMethod.getParameterTypes()) &&
bridgeMethod.getReturnType().equals(bridgedMethod.getReturnType()); bridgeMethod.getReturnType().equals(bridgedMethod.getReturnType()));
} }
} }