diff --git a/build.gradle b/build.gradle index c7be907647..ee59933d03 100644 --- a/build.gradle +++ b/build.gradle @@ -26,27 +26,21 @@ configure(allprojects) { project -> apply plugin: "test-source-set-dependencies" apply from: "${gradleScriptDir}/ide.gradle" - [compileJava, compileTestJava]*.options*.compilerArgs = [ - "-Xlint:serial", - "-Xlint:varargs", - "-Xlint:cast", - "-Xlint:classfile", - "-Xlint:dep-ann", - "-Xlint:divzero", - "-Xlint:empty", - "-Xlint:finally", - "-Xlint:overrides", - "-Xlint:path", - "-Xlint:processing", - "-Xlint:static", - "-Xlint:try", - "-Xlint:-options", // intentionally disabled - "-Xlint:-fallthrough", // intentionally disabled - "-Xlint:-rawtypes", // TODO enable and fix warnings - "-Xlint:-deprecation", // TODO enable and fix warnings - "-Xlint:-unchecked" // TODO enable and fix warnings + compileJava.options*.compilerArgs = [ + "-Xlint:serial", "-Xlint:varargs", "-Xlint:cast", "-Xlint:classfile", + "-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", + "-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static", + "-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation", + "-Xlint:unchecked", "-Xlint:-options", "-Werror" ] + compileTestJava.options*.compilerArgs = [ + "-Xlint:serial", "-Xlint:varargs", "-Xlint:cast", "-Xlint:classfile", + "-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", + "-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static", + "-Xlint:try", "-Xlint:-fallthrough", "-Xlint:-rawtypes", "-Xlint:-deprecation", + "-Xlint:-unchecked", "-Xlint:-options"] + compileJava { sourceCompatibility=1.6 targetCompatibility=1.6 diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java index ffefed7eee..b8f7526619 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java @@ -39,6 +39,6 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher { * asking is the subject on one or more introductions; {@code false} otherwise * @return whether or not this method matches statically */ - boolean matches(Method method, Class targetClass, boolean hasIntroductions); + boolean matches(Method method, Class targetClass, boolean hasIntroductions); } diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java index 6ba69a833d..9f68b07424 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java @@ -34,6 +34,6 @@ public interface IntroductionInfo { * Return the additional interfaces introduced by this Advisor or Advice. * @return the introduced interfaces */ - Class[] getInterfaces(); + Class[] getInterfaces(); } diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java index 1d622196f7..4777e757ba 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java @@ -35,7 +35,7 @@ class TrueClassFilter implements ClassFilter, Serializable { } @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { return true; } diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java index b4722cdf00..0b82427e8b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java @@ -41,12 +41,12 @@ class TrueMethodMatcher implements MethodMatcher, Serializable { } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return true; } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { // Should never be invoked as isRuntime returns false. throw new UnsupportedOperationException(); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java index 31e1106d62..0fdd073546 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java @@ -119,9 +119,9 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence /** Non-null if after returning advice binds the return value */ private String returningName = null; - private Class discoveredReturningType = Object.class; + private Class discoveredReturningType = Object.class; - private Class discoveredThrowingType = Object.class; + private Class discoveredThrowingType = Object.class; /** * Index for thisJoinPoint argument (currently only @@ -253,7 +253,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence if (argumentNames != null) { if (aspectJAdviceMethod.getParameterTypes().length == argumentNames.length + 1) { // May need to add implicit join point arg name... - Class firstArgType = aspectJAdviceMethod.getParameterTypes()[0]; + Class firstArgType = aspectJAdviceMethod.getParameterTypes()[0]; if (firstArgType == JoinPoint.class || firstArgType == ProceedingJoinPoint.class || firstArgType == JoinPoint.StaticPart.class) { @@ -292,7 +292,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence } } - protected Class getDiscoveredReturningType() { + protected Class getDiscoveredReturningType() { return this.discoveredReturningType; } @@ -326,7 +326,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence } } - protected Class getDiscoveredThrowingType() { + protected Class getDiscoveredThrowingType() { return this.discoveredThrowingType; } @@ -364,7 +364,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence } int numUnboundArgs = this.adviceInvocationArgumentCount; - Class[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes(); + Class[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes(); if (maybeBindJoinPoint(parameterTypes[0]) || maybeBindProceedingJoinPoint(parameterTypes[0])) { numUnboundArgs--; } @@ -380,7 +380,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence this.argumentsIntrospected = true; } - private boolean maybeBindJoinPoint(Class candidateParameterType) { + private boolean maybeBindJoinPoint(Class candidateParameterType) { if (candidateParameterType.equals(JoinPoint.class)) { this.joinPointArgumentIndex = 0; return true; @@ -390,7 +390,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence } } - private boolean maybeBindProceedingJoinPoint(Class candidateParameterType) { + private boolean maybeBindProceedingJoinPoint(Class candidateParameterType) { if (candidateParameterType.equals(ProceedingJoinPoint.class)) { if (!supportsProceedingJoinPoint()) { throw new IllegalArgumentException("ProceedingJoinPoint is only supported for around advice"); @@ -407,7 +407,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence return false; } - private boolean maybeBindJoinPointStaticPart(Class candidateParameterType) { + private boolean maybeBindJoinPointStaticPart(Class candidateParameterType) { if (candidateParameterType.equals(JoinPoint.StaticPart.class)) { this.joinPointStaticPartArgumentIndex = 0; return true; @@ -509,8 +509,8 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence numParametersToRemove++; } String[] pointcutParameterNames = new String[this.argumentNames.length - numParametersToRemove]; - Class[] pointcutParameterTypes = new Class[pointcutParameterNames.length]; - Class[] methodParameterTypes = this.aspectJAdviceMethod.getParameterTypes(); + Class[] pointcutParameterTypes = new Class[pointcutParameterNames.length]; + Class[] methodParameterTypes = this.aspectJAdviceMethod.getParameterTypes(); int index = 0; for (int i = 0; i < this.argumentNames.length; i++) { @@ -679,7 +679,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return !this.adviceMethod.equals(method); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java index 0fbeed07b8..c4a8159b01 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java @@ -21,7 +21,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -29,7 +28,6 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.weaver.tools.PointcutParser; import org.aspectj.weaver.tools.PointcutPrimitive; - import org.springframework.core.ParameterNameDiscoverer; import org.springframework.util.StringUtils; @@ -142,9 +140,8 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov singleValuedAnnotationPcds.add("@withincode"); singleValuedAnnotationPcds.add("@annotation"); - Set pointcutPrimitives = PointcutParser.getAllSupportedPointcutPrimitives(); - for (Iterator iterator = pointcutPrimitives.iterator(); iterator.hasNext();) { - PointcutPrimitive primitive = (PointcutPrimitive) iterator.next(); + Set pointcutPrimitives = PointcutParser.getAllSupportedPointcutPrimitives(); + for (PointcutPrimitive primitive : pointcutPrimitives) { nonReferencePointcutTokens.add(primitive.getName()); } nonReferencePointcutTokens.add("&&"); @@ -173,7 +170,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov */ private String pointcutExpression; - private Class[] argumentTypes; + private Class[] argumentTypes; private String[] parameterNameBindings; @@ -311,7 +308,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true} */ @Override - public String[] getParameterNames(Constructor ctor) { + public String[] getParameterNames(Constructor ctor) { if (this.raiseExceptions) { throw new UnsupportedOperationException("An advice method can never be a constructor"); } @@ -731,7 +728,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov * Return {@code true} if the given argument type is a subclass * of the given supertype. */ - private boolean isSubtypeOf(Class supertype, int argumentNumber) { + private boolean isSubtypeOf(Class supertype, int argumentNumber) { return supertype.isAssignableFrom(this.argumentTypes[argumentNumber]); } @@ -759,7 +756,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov * Find the argument index with the given type, and bind the given * {@code varName} in that position. */ - private void findAndBind(Class argumentType, String varName) { + private void findAndBind(Class argumentType, String varName) { for (int i = 0; i < this.argumentTypes.length; i++) { if (isUnbound(i) && isSubtypeOf(argumentType, i)) { bindParameterName(i, varName); diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java index a7bef4b213..486b261275 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java @@ -70,8 +70,7 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements * is only invoked if the thrown exception is a subtype of the given throwing type. */ private boolean shouldInvokeOnThrowing(Throwable t) { - Class throwingType = getDiscoveredThrowingType(); - return throwingType.isAssignableFrom(t.getClass()); + return getDiscoveredThrowingType().isAssignableFrom(t.getClass()); } } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index fa9cc2f523..8cb21661cb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -98,11 +98,11 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class); - private Class pointcutDeclarationScope; + private Class pointcutDeclarationScope; private String[] pointcutParameterNames = new String[0]; - private Class[] pointcutParameterTypes = new Class[0]; + private Class[] pointcutParameterTypes = new Class[0]; private BeanFactory beanFactory; @@ -123,7 +123,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut * @param paramNames the parameter names for the pointcut * @param paramTypes the parameter types for the pointcut */ - public AspectJExpressionPointcut(Class declarationScope, String[] paramNames, Class[] paramTypes) { + public AspectJExpressionPointcut(Class declarationScope, String[] paramNames, Class[] paramTypes) { this.pointcutDeclarationScope = declarationScope; if (paramNames.length != paramTypes.length) { throw new IllegalStateException( @@ -137,7 +137,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut /** * Set the declaration scope for the pointcut. */ - public void setPointcutDeclarationScope(Class pointcutDeclarationScope) { + public void setPointcutDeclarationScope(Class pointcutDeclarationScope) { this.pointcutDeclarationScope = pointcutDeclarationScope; } @@ -151,7 +151,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut /** * Set the parameter types for the pointcut. */ - public void setParameterTypes(Class[] types) { + public void setParameterTypes(Class[] types) { this.pointcutParameterTypes = types; } @@ -248,7 +248,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut } @Override - public boolean matches(Class targetClass) { + public boolean matches(Class targetClass) { checkReadyToMatch(); try { return this.pointcutExpression.couldMatchJoinPointsInType(targetClass); @@ -272,7 +272,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut } @Override - public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) { + public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) { checkReadyToMatch(); Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass); ShadowMatch shadowMatch = getShadowMatch(targetMethod, method); @@ -293,7 +293,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return matches(method, targetClass, false); } @@ -304,7 +304,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { checkReadyToMatch(); ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method); ShadowMatch originalShadowMatch = getShadowMatch(method, method); @@ -377,7 +377,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut return !(getRuntimeTestWalker(shadowMatch).testsSubtypeSensitiveVars()); } - private boolean matchesTarget(ShadowMatch shadowMatch, Class targetClass) { + private boolean matchesTarget(ShadowMatch shadowMatch, Class targetClass) { return getRuntimeTestWalker(shadowMatch).testTargetInstanceOfResidue(targetClass); } @@ -542,11 +542,15 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut } @Override + @SuppressWarnings("rawtypes") + @Deprecated public boolean couldMatchJoinPointsInType(Class someClass) { return (contextMatch(someClass) == FuzzyBoolean.YES); } @Override + @SuppressWarnings("rawtypes") + @Deprecated public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) { return (contextMatch(someClass) == FuzzyBoolean.YES); } @@ -566,7 +570,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut return false; } - private FuzzyBoolean contextMatch(Class targetType) { + private FuzzyBoolean contextMatch(Class targetType) { String advisedBeanName = getCurrentProxiedBeanName(); if (advisedBeanName == null) { // no proxy creation in progress // abstain; can't return YES, since that will make pointcut with negation fail diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java index 5354360cd4..9430c3de44 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java @@ -44,7 +44,7 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv this.pointcut.setLocation(location); } - public void setParameterTypes(Class[] types) { + public void setParameterTypes(Class[] types) { this.pointcut.setParameterTypes(types); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java index 0d1a84247b..3272b92221 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java @@ -34,7 +34,7 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor; */ public class DeclareParentsAdvisor implements IntroductionAdvisor { - private final Class introducedInterface; + private final Class introducedInterface; private final ClassFilter typePatternClassFilter; @@ -47,7 +47,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor { * @param typePattern type pattern the introduction is restricted to * @param defaultImpl the default implementation class */ - public DeclareParentsAdvisor(Class interfaceType, String typePattern, Class defaultImpl) { + public DeclareParentsAdvisor(Class interfaceType, String typePattern, Class defaultImpl) { this(interfaceType, typePattern, defaultImpl, new DelegatePerTargetObjectIntroductionInterceptor(defaultImpl, interfaceType)); } @@ -58,7 +58,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor { * @param typePattern type pattern the introduction is restricted to * @param delegateRef the delegate implementation object */ - public DeclareParentsAdvisor(Class interfaceType, String typePattern, Object delegateRef) { + public DeclareParentsAdvisor(Class interfaceType, String typePattern, Object delegateRef) { this(interfaceType, typePattern, delegateRef.getClass(), new DelegatingIntroductionInterceptor(delegateRef)); } @@ -71,14 +71,14 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor { * @param implementationClass implementation class * @param advice delegation advice */ - private DeclareParentsAdvisor(Class interfaceType, String typePattern, Class implementationClass, Advice advice) { + private DeclareParentsAdvisor(Class interfaceType, String typePattern, Class implementationClass, Advice advice) { this.introducedInterface = interfaceType; ClassFilter typePatternFilter = new TypePatternClassFilter(typePattern); // Excludes methods implemented. ClassFilter exclusion = new ClassFilter() { @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { return !(introducedInterface.isAssignableFrom(clazz)); } }; @@ -109,8 +109,8 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor { } @Override - public Class[] getInterfaces() { - return new Class[] {this.introducedInterface}; + public Class[] getInterfaces() { + return new Class[] {this.introducedInterface}; } } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java index d746228024..d0f93ef87c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java @@ -189,7 +189,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override - public Class getDeclaringType() { + public Class getDeclaringType() { return methodInvocation.getMethod().getDeclaringClass(); } @@ -199,7 +199,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override - public Class getReturnType() { + public Class getReturnType() { return methodInvocation.getMethod().getReturnType(); } @@ -209,7 +209,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override - public Class[] getParameterTypes() { + public Class[] getParameterTypes() { return methodInvocation.getMethod().getParameterTypes(); } @@ -222,7 +222,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override - public Class[] getExceptionTypes() { + public Class[] getExceptionTypes() { return methodInvocation.getMethod().getExceptionTypes(); } @@ -256,7 +256,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, sb.append("."); sb.append(getMethod().getName()); sb.append("("); - Class[] parametersTypes = getParameterTypes(); + Class[] parametersTypes = getParameterTypes(); appendTypes(sb, parametersTypes, includeReturnTypeAndArgs, useLongReturnAndArgumentTypeName); sb.append(")"); return sb.toString(); @@ -297,7 +297,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, private class SourceLocationImpl implements SourceLocation { @Override - public Class getWithinType() { + public Class getWithinType() { if (methodInvocation.getThis() == null) { throw new UnsupportedOperationException("No source location joinpoint available: target is null"); } @@ -315,6 +315,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, } @Override + @Deprecated public int getColumn() { throw new UnsupportedOperationException(); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java index 7d52c03615..e8e38e0179 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java @@ -87,12 +87,12 @@ class RuntimeTestWalker { new SubtypeSensitiveVarTypeTestVisitor().testsSubtypeSensitiveVars(this.runtimeTest)); } - public boolean testThisInstanceOfResidue(Class thisClass) { + public boolean testThisInstanceOfResidue(Class thisClass) { return (this.runtimeTest != null && new ThisInstanceOfResidueTestVisitor(thisClass).thisInstanceOfMatches(this.runtimeTest)); } - public boolean testTargetInstanceOfResidue(Class targetClass) { + public boolean testTargetInstanceOfResidue(Class targetClass) { return (this.runtimeTest != null && new TargetInstanceOfResidueTestVisitor(targetClass).targetInstanceOfMatches(this.runtimeTest)); } @@ -169,11 +169,11 @@ class RuntimeTestWalker { private static abstract class InstanceOfResidueTestVisitor extends TestVisitorAdapter { - private Class matchClass; + private Class matchClass; private boolean matches; private int matchVarType; - public InstanceOfResidueTestVisitor(Class matchClass, boolean defaultMatches, int matchVarType) { + public InstanceOfResidueTestVisitor(Class matchClass, boolean defaultMatches, int matchVarType) { this.matchClass = matchClass; this.matches = defaultMatches; this.matchVarType = matchVarType; @@ -192,7 +192,7 @@ class RuntimeTestWalker { return; } try { - Class typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader()); + Class typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader()); // Don't use ReflectionType.isAssignableFrom() as it won't be aware of (Spring) mixins this.matches = typeClass.isAssignableFrom(this.matchClass); } @@ -208,7 +208,7 @@ class RuntimeTestWalker { */ private static class TargetInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor { - public TargetInstanceOfResidueTestVisitor(Class targetClass) { + public TargetInstanceOfResidueTestVisitor(Class targetClass) { super(targetClass, false, TARGET_VAR); } @@ -223,7 +223,7 @@ class RuntimeTestWalker { */ private static class ThisInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor { - public ThisInstanceOfResidueTestVisitor(Class thisClass) { + public ThisInstanceOfResidueTestVisitor(Class thisClass) { super(thisClass, true, THIS_VAR); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java index dfb36d6a72..f1275daea4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java @@ -29,14 +29,14 @@ import org.springframework.util.Assert; */ public class SimpleAspectInstanceFactory implements AspectInstanceFactory { - private final Class aspectClass; + private final Class aspectClass; /** * Create a new SimpleAspectInstanceFactory for the given aspect class. * @param aspectClass the aspect class */ - public SimpleAspectInstanceFactory(Class aspectClass) { + public SimpleAspectInstanceFactory(Class aspectClass) { Assert.notNull(aspectClass, "Aspect class must not be null"); this.aspectClass = aspectClass; } @@ -44,7 +44,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory { /** * Return the specified aspect class (never {@code null}). */ - public final Class getAspectClass() { + public final Class getAspectClass() { return this.aspectClass; } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java index f2893fc583..9d2bc141c6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java @@ -94,7 +94,7 @@ public class TypePatternClassFilter implements ClassFilter { * @throws IllegalStateException if no {@link #setTypePattern(String)} has been set */ @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { if (this.aspectJTypePatternMatcher == null) { throw new IllegalStateException("No 'typePattern' has been set via ctor/setter."); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java index b9b49b3b1f..65b5cba813 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java @@ -37,11 +37,9 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.AjType; import org.aspectj.lang.reflect.AjTypeSystem; import org.aspectj.lang.reflect.PerClauseKind; - import org.springframework.aop.aspectj.AspectJExpressionPointcut; import org.springframework.aop.framework.AopConfigException; import org.springframework.core.ParameterNameDiscoverer; -import org.springframework.core.PrioritizedParameterNameDiscoverer; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.StringUtils; @@ -67,11 +65,11 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac * (there should only be one anyway...) */ @SuppressWarnings("unchecked") - protected static AspectJAnnotation findAspectJAnnotationOnMethod(Method method) { - Class[] classesToLookFor = new Class[] { + protected static AspectJAnnotation findAspectJAnnotationOnMethod(Method method) { + Class[] classesToLookFor = new Class[] { Before.class, Around.class, After.class, AfterReturning.class, AfterThrowing.class, Pointcut.class}; - for (Class c : classesToLookFor) { - AspectJAnnotation foundAnnotation = findAnnotation(method, c); + for (Class c : classesToLookFor) { + AspectJAnnotation foundAnnotation = findAnnotation(method, (Class) c); if (foundAnnotation != null) { return foundAnnotation; } @@ -156,7 +154,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac * formal parameters for the pointcut. */ protected AspectJExpressionPointcut createPointcutExpression( - Method annotatedMethod, Class declarationScope, String[] pointcutParameterNames) { + Method annotatedMethod, Class declarationScope, String[] pointcutParameterNames) { Class [] pointcutParameterTypes = new Class[0]; if (pointcutParameterNames != null) { @@ -210,8 +208,8 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac private static final String[] EXPRESSION_PROPERTIES = new String[] {"value", "pointcut"}; - private static Map annotationTypes = - new HashMap(); + private static Map, AspectJAnnotationType> annotationTypes = + new HashMap, AspectJAnnotationType>(); static { annotationTypes.put(Pointcut.class,AspectJAnnotationType.AtPointcut); @@ -245,7 +243,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac } private AspectJAnnotationType determineAnnotationType(A annotation) { - for (Class type : annotationTypes.keySet()) { + for (Class type : annotationTypes.keySet()) { if (type.isInstance(annotation)) { return annotationTypes.get(type); } @@ -307,7 +305,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac if (method.getParameterTypes().length == 0) { return new String[0]; } - AspectJAnnotation annotation = findAspectJAnnotationOnMethod(method); + AspectJAnnotation annotation = findAspectJAnnotationOnMethod(method); if (annotation == null) { return null; } @@ -325,7 +323,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac } @Override - public String[] getParameterNames(Constructor ctor) { + public String[] getParameterNames(Constructor ctor) { throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice"); } } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java index 9eff81682b..3abd9d860a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java @@ -89,7 +89,7 @@ public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorA } @Override - protected boolean isInfrastructureClass(Class beanClass) { + protected boolean isInfrastructureClass(Class beanClass) { // Previously we setProxyTargetClass(true) in the constructor, but that has too // broad an impact. Instead we now override isInfrastructureClass to avoid proxying // aspects. I'm not entirely happy with that as there is no good reason not diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java index b160ded0b8..c174cee97f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java @@ -50,7 +50,7 @@ import org.springframework.util.ClassUtils; public class AspectJProxyFactory extends ProxyCreatorSupport { /** Cache for singleton aspect instances */ - private static final Map aspectCache = new HashMap(); + private static final Map, Object> aspectCache = new HashMap, Object>(); private final AspectJAdvisorFactory aspectFactory = new ReflectiveAspectJAdvisorFactory(); @@ -76,7 +76,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { * Create a new {@code AspectJProxyFactory}. * No target, only interfaces. Must add interceptors. */ - public AspectJProxyFactory(Class[] interfaces) { + public AspectJProxyFactory(Class[] interfaces) { setInterfaces(interfaces); } @@ -89,7 +89,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { * @param aspectInstance the AspectJ aspect instance */ public void addAspect(Object aspectInstance) { - Class aspectClass = aspectInstance.getClass(); + Class aspectClass = aspectInstance.getClass(); String aspectName = aspectClass.getName(); AspectMetadata am = createAspectMetadata(aspectClass, aspectName); if (am.getAjType().getPerClause().getKind() != PerClauseKind.SINGLETON) { @@ -104,7 +104,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { * Add an aspect of the supplied type to the end of the advice chain. * @param aspectClass the AspectJ aspect class */ - public void addAspect(Class aspectClass) { + public void addAspect(Class aspectClass) { String aspectName = aspectClass.getName(); AspectMetadata am = createAspectMetadata(aspectClass, aspectName); MetadataAwareAspectInstanceFactory instanceFactory = createAspectInstanceFactory(am, aspectClass, aspectName); @@ -128,7 +128,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { /** * Create an {@link AspectMetadata} instance for the supplied aspect type. */ - private AspectMetadata createAspectMetadata(Class aspectClass, String aspectName) { + private AspectMetadata createAspectMetadata(Class aspectClass, String aspectName) { AspectMetadata am = new AspectMetadata(aspectClass, aspectName); if (!am.getAjType().isAspect()) { throw new IllegalArgumentException("Class [" + aspectClass.getName() + "] is not a valid aspect type"); @@ -142,7 +142,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { * a {@link PrototypeAspectInstanceFactory} is returned. */ private MetadataAwareAspectInstanceFactory createAspectInstanceFactory( - AspectMetadata am, Class aspectClass, String aspectName) { + AspectMetadata am, Class aspectClass, String aspectName) { MetadataAwareAspectInstanceFactory instanceFactory = null; if (am.getAjType().getPerClause().getKind() == PerClauseKind.SINGLETON) { @@ -161,7 +161,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport { * Get the singleton aspect instance for the supplied aspect type. An instance * is created if one cannot be found in the instance cache. */ - private Object getSingletonAspectInstance(Class aspectClass) { + private Object getSingletonAspectInstance(Class aspectClass) { synchronized (aspectCache) { Object instance = aspectCache.get(aspectClass); if (instance != null) { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java index ccf2aa610b..06e49632d8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java @@ -45,7 +45,7 @@ public class AspectMetadata { /** * AspectJ reflection information (AspectJ 5 / Java 5 specific). */ - private final AjType ajType; + private final AjType ajType; /** * Spring AOP pointcut corresponding to the per clause of the @@ -71,9 +71,9 @@ public class AspectMetadata { this.aspectName = aspectName; Class currClass = aspectClass; - AjType ajType = null; + AjType ajType = null; while (!currClass.equals(Object.class)) { - AjType ajTypeToCheck = AjTypeSystem.getAjType(currClass); + AjType ajTypeToCheck = AjTypeSystem.getAjType(currClass); if (ajTypeToCheck.isAspect()) { ajType = ajTypeToCheck; break; @@ -124,14 +124,14 @@ public class AspectMetadata { /** * Return AspectJ reflection information. */ - public AjType getAjType() { + public AjType getAjType() { return this.ajType; } /** * Return the aspect class. */ - public Class getAspectClass() { + public Class getAspectClass() { return this.ajType.getJavaClass(); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java index 1ca4bc8a28..15d4eee5f0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java @@ -66,7 +66,7 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst * @param name the name of the bean * @param type the type that should be introspected by AspectJ */ - public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name, Class type) { + public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name, Class type) { this.beanFactory = beanFactory; this.name = name; this.aspectMetadata = new AspectMetadata(type, name); diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java index c3c6de3365..5c9a7e7448 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectJAdvisorsBuilder.java @@ -96,7 +96,7 @@ public class BeanFactoryAspectJAdvisorsBuilder { // We must be careful not to instantiate beans eagerly as in this // case they would be cached by the Spring container but would not // have been weaved - Class beanType = this.beanFactory.getType(beanName); + Class beanType = this.beanFactory.getType(beanName); if (beanType == null) { continue; } @@ -134,7 +134,7 @@ public class BeanFactoryAspectJAdvisorsBuilder { } if (aspectNames.isEmpty()) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } List advisors = new LinkedList(); for (String aspectName : aspectNames) { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java index e2dc0893da..200936f140 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java @@ -249,14 +249,14 @@ class InstantiationModelAwarePointcutAdvisorImpl } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { // We're either instantiated and matching on declared pointcut, or uninstantiated matching on either pointcut return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass)) || this.preInstantiationPointcut.getMethodMatcher().matches(method, targetClass); } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { // This can match only on declared pointcut. return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass)); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java index 35ed1e2847..2fe16a309c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java @@ -190,7 +190,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto return null; } AspectJExpressionPointcut ajexp = - new AspectJExpressionPointcut(candidateAspectClass, new String[0], new Class[0]); + new AspectJExpressionPointcut(candidateAspectClass, new String[0], new Class[0]); ajexp.setExpression(aspectJAnnotation.getPointcutExpression()); return ajexp; } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java index 8f281a3e3a..cc8dbf92c4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java @@ -40,7 +40,7 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan * @param aspectClass the aspect class * @param aspectName the aspect name */ - public SimpleMetadataAwareAspectInstanceFactory(Class aspectClass, String aspectName) { + public SimpleMetadataAwareAspectInstanceFactory(Class aspectClass, String aspectName) { super(aspectClass); this.metadata = new AspectMetadata(aspectClass, aspectName); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index f25f2d1811..edf729eb62 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -46,7 +46,7 @@ import org.springframework.util.ClassUtils; @SuppressWarnings("serial") public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator { - private static final Comparator DEFAULT_PRECEDENCE_COMPARATOR = new AspectJPrecedenceComparator(); + private static final Comparator DEFAULT_PRECEDENCE_COMPARATOR = new AspectJPrecedenceComparator(); /** @@ -98,7 +98,7 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx } @Override - protected boolean shouldSkip(Class beanClass, String beanName) { + protected boolean shouldSkip(Class beanClass, String beanName) { // TODO: Consider optimization by caching the list of the aspect names List candidateAdvisors = findCandidateAdvisors(); for (Advisor advisor : candidateAdvisors) { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java index 25d84db560..20b34371a8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java @@ -48,7 +48,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 2.0 */ -class AspectJPrecedenceComparator implements Comparator { +class AspectJPrecedenceComparator implements Comparator { private static final int HIGHER_PRECEDENCE = -1; private static final int SAME_PRECEDENCE = 0; @@ -76,18 +76,10 @@ class AspectJPrecedenceComparator implements Comparator { @Override - public int compare(Object o1, Object o2) { - if (!(o1 instanceof Advisor && o2 instanceof Advisor)) { - throw new IllegalArgumentException( - "AspectJPrecedenceComparator can only compare the order of Advisors, " + - "but was passed [" + o1 + "] and [" + o2 + "]"); - } - - Advisor advisor1 = (Advisor) o1; - Advisor advisor2 = (Advisor) o2; - int advisorPrecedence = this.advisorComparator.compare(advisor1, advisor2); - if (advisorPrecedence == SAME_PRECEDENCE && declaredInSameAspect(advisor1, advisor2)) { - advisorPrecedence = comparePrecedenceWithinAspect(advisor1, advisor2); + public int compare(Advisor o1, Advisor o2) { + int advisorPrecedence = this.advisorComparator.compare(o1, o2); + if (advisorPrecedence == SAME_PRECEDENCE && declaredInSameAspect(o1, o2)) { + advisorPrecedence = comparePrecedenceWithinAspect(o1, o2); } return advisorPrecedence; } diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java index 3da1f13f0a..d3f199c501 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java @@ -54,7 +54,7 @@ public abstract class AopConfigUtils { /** * Stores the auto proxy creator classes in escalation order. */ - private static final List APC_PRIORITY_LIST = new ArrayList(); + private static final List> APC_PRIORITY_LIST = new ArrayList>(); /** * Setup the escalation list. @@ -105,7 +105,7 @@ public abstract class AopConfigUtils { } - private static BeanDefinition registerOrEscalateApcAsRequired(Class cls, BeanDefinitionRegistry registry, Object source) { + private static BeanDefinition registerOrEscalateApcAsRequired(Class cls, BeanDefinitionRegistry registry, Object source) { Assert.notNull(registry, "BeanDefinitionRegistry must not be null"); if (registry.containsBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME)) { BeanDefinition apcDefinition = registry.getBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME); @@ -126,13 +126,13 @@ public abstract class AopConfigUtils { return beanDefinition; } - private static int findPriorityForClass(Class clazz) { + private static int findPriorityForClass(Class clazz) { return APC_PRIORITY_LIST.indexOf(clazz); } private static int findPriorityForClass(String className) { for (int i = 0; i < APC_PRIORITY_LIST.size(); i++) { - Class clazz = APC_PRIORITY_LIST.get(i); + Class clazz = APC_PRIORITY_LIST.get(i); if (clazz.getName().equals(className)) { return i; } diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java index c7cb6735d6..ea2b526f9f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java @@ -405,7 +405,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser { /** * Gets the advice implementation class corresponding to the supplied {@link Element}. */ - private Class getAdviceClass(Element adviceElement, ParserContext parserContext) { + private Class getAdviceClass(Element adviceElement, ParserContext parserContext) { String elementName = parserContext.getDelegate().getLocalName(adviceElement); if (BEFORE.equals(elementName)) { return AspectJMethodBeforeAdvice.class; diff --git a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java index abb26930cb..4acf03040e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java @@ -66,7 +66,7 @@ public class MethodLocatingFactoryBean implements FactoryBean, BeanFacto throw new IllegalArgumentException("Property 'methodName' is required"); } - Class beanClass = beanFactory.getType(this.targetBeanName); + Class beanClass = beanFactory.getType(this.targetBeanName); if (beanClass == null) { throw new IllegalArgumentException("Can't determine type of bean with name '" + this.targetBeanName + "'"); } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java index 1ef225f22f..af1b10443e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java @@ -49,7 +49,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig */ private int order = Ordered.LOWEST_PRECEDENCE; - private final Map eligibleBeans = new ConcurrentHashMap(64); + private final Map, Boolean> eligibleBeans = new ConcurrentHashMap, Boolean>(64); /** diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java index 37efc36e85..ed95bd96de 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java @@ -58,7 +58,6 @@ import org.springframework.util.CollectionUtils; * @author Juergen Hoeller * @see org.springframework.aop.framework.AopProxy */ -@SuppressWarnings("unchecked") public class AdvisedSupport extends ProxyConfig implements Advised { /** use serialVersionUID from Spring 2.0 for interoperability */ @@ -88,7 +87,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * Interfaces to be implemented by the proxy. Held in List to keep the order * of registration, to create JDK proxy with specified order of interfaces. */ - private List interfaces = new ArrayList(); + private List> interfaces = new ArrayList>(); /** * List of Advisors. If an Advice is added, it will be wrapped @@ -114,7 +113,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * Create a AdvisedSupport instance with the given parameters. * @param interfaces the proxied interfaces */ - public AdvisedSupport(Class[] interfaces) { + public AdvisedSupport(Class[] interfaces) { this(); setInterfaces(interfaces); } @@ -202,7 +201,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { public void setInterfaces(Class... interfaces) { Assert.notNull(interfaces, "Interfaces must not be null"); this.interfaces.clear(); - for (Class ifc : interfaces) { + for (Class ifc : interfaces) { addInterface(ifc); } } @@ -235,12 +234,12 @@ public class AdvisedSupport extends ProxyConfig implements Advised { @Override public Class[] getProxiedInterfaces() { - return this.interfaces.toArray(new Class[this.interfaces.size()]); + return this.interfaces.toArray(new Class[this.interfaces.size()]); } @Override public boolean isInterfaceProxied(Class intf) { - for (Class proxyIntf : this.interfaces) { + for (Class proxyIntf : this.interfaces) { if (intf.isAssignableFrom(proxyIntf)) { return true; } @@ -355,8 +354,8 @@ public class AdvisedSupport extends ProxyConfig implements Advised { private void validateIntroductionAdvisor(IntroductionAdvisor advisor) { advisor.validateInterfaces(); // If the advisor passed validation, we can make the change. - Class[] ifcs = advisor.getInterfaces(); - for (Class ifc : ifcs) { + Class[] ifcs = advisor.getInterfaces(); + for (Class ifc : ifcs) { addInterface(ifc); } } @@ -463,7 +462,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * @param adviceClass the advice class to check * @return the count of the interceptors of this class or subclasses */ - public int countAdvicesOfType(Class adviceClass) { + public int countAdvicesOfType(Class adviceClass) { int count = 0; if (adviceClass != null) { for (Advisor advisor : this.advisors) { @@ -483,7 +482,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * @param targetClass the target class * @return List of MethodInterceptors (may also include InterceptorAndDynamicMethodMatchers) */ - public List getInterceptorsAndDynamicInterceptionAdvice(Method method, Class targetClass) { + public List getInterceptorsAndDynamicInterceptionAdvice(Method method, Class targetClass) { MethodCacheKey cacheKey = new MethodCacheKey(method); List cached = this.methodCache.get(cacheKey); if (cached == null) { @@ -521,7 +520,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { copyFrom(other); this.targetSource = targetSource; this.advisorChainFactory = other.advisorChainFactory; - this.interfaces = new ArrayList(other.interfaces); + this.interfaces = new ArrayList>(other.interfaces); for (Advisor advisor : advisors) { if (advisor instanceof IntroductionAdvisor) { validateIntroductionAdvisor((IntroductionAdvisor) advisor); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java index 53bb3b19c5..a912aa9a88 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisorChainFactory.java @@ -36,6 +36,6 @@ public interface AdvisorChainFactory { * @return List of MethodInterceptors (may also include InterceptorAndDynamicMethodMatchers) */ List getInterceptorsAndDynamicInterceptionAdvice( - Advised config, Method method, Class targetClass); + Advised config, Method method, Class targetClass); } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java index 5ac4ed7f66..5eb802b310 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java @@ -78,13 +78,13 @@ public abstract class AopProxyUtils { * @see Advised * @see org.springframework.aop.SpringProxy */ - public static Class[] completeProxiedInterfaces(AdvisedSupport advised) { - Class[] specifiedInterfaces = advised.getProxiedInterfaces(); + public static Class[] completeProxiedInterfaces(AdvisedSupport advised) { + Class[] specifiedInterfaces = advised.getProxiedInterfaces(); if (specifiedInterfaces.length == 0) { // No user-specified interfaces: check whether target class is an interface. - Class targetClass = advised.getTargetClass(); + Class targetClass = advised.getTargetClass(); if (targetClass != null && targetClass.isInterface()) { - specifiedInterfaces = new Class[] {targetClass}; + specifiedInterfaces = new Class[] {targetClass}; } } boolean addSpringProxy = !advised.isInterfaceProxied(SpringProxy.class); @@ -96,7 +96,7 @@ public abstract class AopProxyUtils { if (addAdvised) { nonUserIfcCount++; } - Class[] proxiedInterfaces = new Class[specifiedInterfaces.length + nonUserIfcCount]; + Class[] proxiedInterfaces = new Class[specifiedInterfaces.length + nonUserIfcCount]; System.arraycopy(specifiedInterfaces, 0, proxiedInterfaces, 0, specifiedInterfaces.length); if (addSpringProxy) { proxiedInterfaces[specifiedInterfaces.length] = SpringProxy.class; @@ -115,8 +115,8 @@ public abstract class AopProxyUtils { * in the original order (never {@code null} or empty) * @see Advised */ - public static Class[] proxiedUserInterfaces(Object proxy) { - Class[] proxyInterfaces = proxy.getClass().getInterfaces(); + public static Class[] proxiedUserInterfaces(Object proxy) { + Class[] proxyInterfaces = proxy.getClass().getInterfaces(); int nonUserIfcCount = 0; if (proxy instanceof SpringProxy) { nonUserIfcCount++; @@ -124,7 +124,7 @@ public abstract class AopProxyUtils { if (proxy instanceof Advised) { nonUserIfcCount++; } - Class[] userInterfaces = new Class[proxyInterfaces.length - nonUserIfcCount]; + Class[] userInterfaces = new Class[proxyInterfaces.length - nonUserIfcCount]; System.arraycopy(proxyInterfaces, 0, userInterfaces, 0, userInterfaces.length); Assert.notEmpty(userInterfaces, "JDK proxy must implement one or more interfaces"); return userInterfaces; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java index 5b04ad9375..c11da8b7a9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java @@ -187,7 +187,7 @@ class CglibAopProxy implements AopProxy, Serializable { enhancer.setInterfaces(AopProxyUtils.completeProxiedInterfaces(this.advised)); Callback[] callbacks = getCallbacks(rootClass); - Class[] types = new Class[callbacks.length]; + Class[] types = new Class[callbacks.length]; for (int x = 0; x < types.length; x++) { types[x] = callbacks[x].getClass(); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java index 3eef11bd9b..d99607cae1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java @@ -48,7 +48,7 @@ public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializ @Override public List getInterceptorsAndDynamicInterceptionAdvice( - Advised config, Method method, Class targetClass) { + Advised config, Method method, Class targetClass) { // This is somewhat tricky... we have to process introductions first, // but we need to preserve order in the ultimate list. @@ -94,7 +94,7 @@ public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializ /** * Determine whether the Advisors contain matching introductions. */ - private static boolean hasMatchingIntroductions(Advised config, Class targetClass) { + private static boolean hasMatchingIntroductions(Advised config, Class targetClass) { for (int i = 0; i < config.getAdvisors().length; i++) { Advisor advisor = config.getAdvisors()[i]; if (advisor instanceof IntroductionAdvisor) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java index 65a4c2e971..286e9b4e82 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java @@ -51,7 +51,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable { @Override public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException { if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) { - Class targetClass = config.getTargetClass(); + Class targetClass = config.getTargetClass(); if (targetClass == null) { throw new AopConfigException("TargetSource cannot determine target class: " + "Either an interface or a target is required for proxy creation."); @@ -72,7 +72,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable { * (or no proxy interfaces specified at all). */ private boolean hasNoUserSuppliedProxyInterfaces(AdvisedSupport config) { - Class[] interfaces = config.getProxiedInterfaces(); + Class[] interfaces = config.getProxiedInterfaces(); return (interfaces.length == 0 || (interfaces.length == 1 && SpringProxy.class.equals(interfaces[0]))); } } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java index ad36cd8934..fff1068295 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java @@ -116,7 +116,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa if (logger.isDebugEnabled()) { logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource()); } - Class[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised); + Class[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised); findDefinedEqualsAndHashCodeMethods(proxiedInterfaces); return Proxy.newProxyInstance(classLoader, proxiedInterfaces, this); } @@ -126,8 +126,8 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa * on the supplied set of interfaces. * @param proxiedInterfaces the interfaces to introspect */ - private void findDefinedEqualsAndHashCodeMethods(Class[] proxiedInterfaces) { - for (Class proxiedInterface : proxiedInterfaces) { + private void findDefinedEqualsAndHashCodeMethods(Class[] proxiedInterfaces) { + for (Class proxiedInterface : proxiedInterfaces) { Method[] methods = proxiedInterface.getDeclaredMethods(); for (Method method : methods) { if (AopUtils.isEqualsMethod(method)) { @@ -156,7 +156,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa boolean setProxyContext = false; TargetSource targetSource = this.advised.targetSource; - Class targetClass = null; + Class targetClass = null; Object target = null; try { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java index bd82707401..d7bdf7896a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java @@ -32,6 +32,7 @@ import org.springframework.objenesis.ObjenesisStd; * @author Oliver Gierke * @since 4.0 */ +@SuppressWarnings("serial") class ObjenesisCglibAopProxy extends CglibAopProxy { private static final Log logger = LogFactory.getLog(ObjenesisCglibAopProxy.class); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 7e62678340..d7b5c33a21 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -133,7 +133,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport * @see #setInterfaces * @see AbstractSingletonProxyFactoryBean#setProxyInterfaces */ - public void setProxyInterfaces(Class[] proxyInterfaces) throws ClassNotFoundException { + public void setProxyInterfaces(Class[] proxyInterfaces) throws ClassNotFoundException { setInterfaces(proxyInterfaces); } @@ -267,7 +267,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport return this.singletonInstance.getClass(); } } - Class[] ifcs = getProxiedInterfaces(); + Class[] ifcs = getProxiedInterfaces(); if (ifcs.length == 1) { return ifcs[0]; } @@ -297,7 +297,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport * @return the merged interface as Class * @see java.lang.reflect.Proxy#getProxyClass */ - protected Class createCompositeInterface(Class[] interfaces) { + protected Class createCompositeInterface(Class[] interfaces) { return ClassUtils.createCompositeInterface(interfaces, this.proxyClassLoader); } @@ -311,7 +311,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport this.targetSource = freshTargetSource(); if (this.autodetectInterfaces && getProxiedInterfaces().length == 0 && !isProxyTargetClass()) { // Rely on AOP infrastructure to tell us what interfaces to proxy. - Class targetClass = getTargetClass(); + Class targetClass = getTargetClass(); if (targetClass == null) { throw new FactoryBeanNotInitializedException("Cannot determine target class for proxy"); } @@ -401,7 +401,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport * @return {@code true} if it's an Advisor or Advice */ private boolean isNamedBeanAnAdvisorOrAdvice(String beanName) { - Class namedBeanClass = this.beanFactory.getType(beanName); + Class namedBeanClass = this.beanFactory.getType(beanName); if (namedBeanClass != null) { return (Advisor.class.isAssignableFrom(namedBeanClass) || Advice.class.isAssignableFrom(namedBeanClass)); } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java index 8556823d92..62efcb77ae 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java @@ -68,7 +68,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea protected Object[] arguments; - private final Class targetClass; + private final Class targetClass; /** * Lazily initialized map of user-specific attributes for this invocation. @@ -79,7 +79,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea * List of MethodInterceptor and InterceptorAndDynamicMethodMatcher * that need dynamic checks. */ - protected final List interceptorsAndDynamicMethodMatchers; + protected final List interceptorsAndDynamicMethodMatchers; /** * Index from 0 of the current interceptor we're invoking. @@ -103,7 +103,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea */ protected ReflectiveMethodInvocation( Object proxy, Object target, Method method, Object[] arguments, - Class targetClass, List interceptorsAndDynamicMethodMatchers) { + Class targetClass, List interceptorsAndDynamicMethodMatchers) { this.proxy = proxy; this.target = target; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java index de2767be2c..564e3b80d0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java @@ -61,7 +61,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice { private final Object throwsAdvice; /** Methods on throws advice, keyed by exception class */ - private final Map exceptionHandlerMap = new HashMap(); + private final Map, Method> exceptionHandlerMap = new HashMap, Method>(); /** @@ -104,7 +104,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice { * @return a handler for the given exception type */ private Method getExceptionHandler(Throwable exception) { - Class exceptionClass = exception.getClass(); + Class exceptionClass = exception.getClass(); if (logger.isTraceEnabled()) { logger.trace("Trying to find handler for exception of type [" + exceptionClass.getName() + "]"); } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java index 035442282d..9aa9fe0d50 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java @@ -65,8 +65,8 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC @Override - protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { - List advisors = findEligibleAdvisors(beanClass, beanName); + protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { + List advisors = findEligibleAdvisors(beanClass, beanName); if (advisors.isEmpty()) { return DO_NOT_PROXY; } @@ -83,7 +83,7 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC * @see #sortAdvisors * @see #extendAdvisors */ - protected List findEligibleAdvisors(Class beanClass, String beanName) { + protected List findEligibleAdvisors(Class beanClass, String beanName) { List candidateAdvisors = findCandidateAdvisors(); List eligibleAdvisors = findAdvisorsThatCanApply(candidateAdvisors, beanClass, beanName); extendAdvisors(eligibleAdvisors); @@ -111,7 +111,7 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC * @see ProxyCreationContext#getCurrentProxiedBeanName() */ protected List findAdvisorsThatCanApply( - List candidateAdvisors, Class beanClass, String beanName) { + List candidateAdvisors, Class beanClass, String beanName) { ProxyCreationContext.setCurrentProxiedBeanName(beanName); try { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java index e91f9db74a..a11180d07e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java @@ -73,7 +73,7 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator { * Identify as bean to proxy if the bean name is in the configured list of names. */ @Override - protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { + protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { if (this.beanNames != null) { for (String mappedName : this.beanNames) { if (FactoryBean.class.isAssignableFrom(beanClass)) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java index a32f3a3f2c..ab4fe292aa 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java @@ -60,7 +60,7 @@ public class LazyInitTargetSourceCreator extends AbstractBeanFactoryBasedTargetS @Override protected AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource( - Class beanClass, String beanName) { + Class beanClass, String beanName) { if (getBeanFactory() instanceof ConfigurableListableBeanFactory) { BeanDefinition definition = diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java index d972b95cf1..dc37b8099f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java @@ -41,7 +41,7 @@ public class QuickTargetSourceCreator extends AbstractBeanFactoryBasedTargetSour @Override protected final AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource( - Class beanClass, String beanName) { + Class beanClass, String beanName) { if (beanName.startsWith(PREFIX_COMMONS_POOL)) { CommonsPoolTargetSource cpts = new CommonsPoolTargetSource(); diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java index 0159d307a1..1bd6a6d5e1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java @@ -98,7 +98,7 @@ public abstract class AbstractMonitoringInterceptor extends AbstractTraceInterce protected String createInvocationTraceName(MethodInvocation invocation) { StringBuilder sb = new StringBuilder(getPrefix()); Method method = invocation.getMethod(); - Class clazz = method.getDeclaringClass(); + Class clazz = method.getDeclaringClass(); if (this.logTargetClassInvocation && clazz.isInstance(invocation.getThis())) { clazz = invocation.getThis().getClass(); } diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java index 1ba6dca904..00ae0a2d81 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java @@ -142,7 +142,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser * @return the target class for the given object * @see #setHideProxyClassNames */ - protected Class getClassForLogging(Object target) { + protected Class getClassForLogging(Object target) { return (this.hideProxyClassNames ? AopUtils.getTargetClass(target) : target.getClass()); } diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java index b04d2b2d06..5801d40550 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java @@ -151,7 +151,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor { /** * The {@code Set} of allowed placeholders. */ - private static final Set ALLOWED_PLACEHOLDERS = + private static final Set ALLOWED_PLACEHOLDERS = new Constants(CustomizableTraceInterceptor.class).getValues("PLACEHOLDER_"); @@ -395,7 +395,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor { * @param output the {@code StringBuffer} containing the output */ private void appendArgumentTypes(MethodInvocation methodInvocation, Matcher matcher, StringBuffer output) { - Class[] argumentTypes = methodInvocation.getMethod().getParameterTypes(); + Class[] argumentTypes = methodInvocation.getMethod().getParameterTypes(); String[] argumentTypeShortNames = new String[argumentTypes.length]; for (int i = 0; i < argumentTypeShortNames.length; i++) { argumentTypeShortNames[i] = ClassUtils.getShortName(argumentTypes[i]); diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java index a0c6fee7b6..9de90e4576 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java @@ -91,7 +91,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean beanType = beanFactory.getType(this.targetBeanName); if (beanType == null) { throw new IllegalStateException("Cannot create scoped proxy for bean '" + this.targetBeanName + "': Target type could not be determined at the time of proxy creation."); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java index c5aa32ada5..ed60145424 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java @@ -125,7 +125,7 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo * plus the name of the method. */ @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) || matchesPattern(method.getDeclaringClass().getName() + "." + method.getName())); } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java index fdd985191e..c99e219cc2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java @@ -215,7 +215,7 @@ public abstract class AopUtils { introductionAwareMethodMatcher = (IntroductionAwareMethodMatcher) methodMatcher; } - Set classes = new HashSet(ClassUtils.getAllInterfacesForClassAsSet(targetClass)); + Set> classes = new HashSet>(ClassUtils.getAllInterfacesForClassAsSet(targetClass)); classes.add(targetClass); for (Class clazz : classes) { Method[] methods = clazz.getMethods(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java index bde74d3a27..2c2b49597f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java @@ -97,7 +97,7 @@ public abstract class ClassFilters { } @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { for (int i = 0; i < this.filters.length; i++) { if (this.filters[i].matches(clazz)) { return true; @@ -132,7 +132,7 @@ public abstract class ClassFilters { } @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { for (int i = 0; i < this.filters.length; i++) { if (!this.filters[i].matches(clazz)) { return false; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java index bc1e153bdf..d41a36c250 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java @@ -39,7 +39,7 @@ import org.springframework.util.ObjectUtils; @SuppressWarnings("serial") public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher, Serializable { - private Class clazz; + private Class clazz; private String methodName; @@ -50,7 +50,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher * Construct a new pointcut that matches all control flows below that class. * @param clazz the clazz */ - public ControlFlowPointcut(Class clazz) { + public ControlFlowPointcut(Class clazz) { this(clazz, null); } @@ -61,7 +61,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher * @param clazz the clazz * @param methodName the name of the method */ - public ControlFlowPointcut(Class clazz, String methodName) { + public ControlFlowPointcut(Class clazz, String methodName) { Assert.notNull(clazz, "Class must not be null"); this.clazz = clazz; this.methodName = methodName; @@ -72,7 +72,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher * Subclasses can override this for greater filtering (and performance). */ @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { return true; } @@ -81,7 +81,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher * some candidate classes. */ @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return true; } @@ -91,7 +91,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { ++this.evaluations; ControlFlow cflow = ControlFlowFactory.createControlFlow(); return (this.methodName != null) ? cflow.under(this.clazz, this.methodName) : cflow.under(this.clazz); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java index 11bdcf5207..1353388aaa 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java @@ -43,7 +43,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil private final Advice advice; - private final Set interfaces = new HashSet(); + private final Set> interfaces = new HashSet>(); private int order = Integer.MAX_VALUE; @@ -68,11 +68,11 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil Assert.notNull(advice, "Advice must not be null"); this.advice = advice; if (introductionInfo != null) { - Class[] introducedInterfaces = introductionInfo.getInterfaces(); + Class[] introducedInterfaces = introductionInfo.getInterfaces(); if (introducedInterfaces.length == 0) { throw new IllegalArgumentException("IntroductionAdviceSupport implements no interfaces"); } - for (Class ifc : introducedInterfaces) { + for (Class ifc : introducedInterfaces) { addInterface(ifc); } } @@ -83,7 +83,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil * @param advice the Advice to apply * @param intf the interface to introduce */ - public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class intf) { + public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class intf) { Assert.notNull(advice, "Advice must not be null"); this.advice = advice; addInterface(intf); @@ -94,7 +94,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil * Add the specified interface to the list of interfaces to introduce. * @param intf the interface to introduce */ - public void addInterface(Class intf) { + public void addInterface(Class intf) { Assert.notNull(intf, "Interface must not be null"); if (!intf.isInterface()) { throw new IllegalArgumentException("Specified class [" + intf.getName() + "] must be an interface"); @@ -103,13 +103,13 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil } @Override - public Class[] getInterfaces() { - return this.interfaces.toArray(new Class[this.interfaces.size()]); + public Class[] getInterfaces() { + return this.interfaces.toArray(new Class[this.interfaces.size()]); } @Override public void validateInterfaces() throws IllegalArgumentException { - for (Class ifc : this.interfaces) { + for (Class ifc : this.interfaces) { if (this.advice instanceof DynamicIntroductionAdvice && !((DynamicIntroductionAdvice) this.advice).implementsInterface(ifc)) { throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " + @@ -145,7 +145,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil } @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { return true; } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java index a17e2734f5..0684d74472 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java @@ -59,12 +59,12 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction */ private final Map delegateMap = new WeakHashMap(); - private Class defaultImplType; + private Class defaultImplType; - private Class interfaceType; + private Class interfaceType; - public DelegatePerTargetObjectIntroductionInterceptor(Class defaultImplType, Class interfaceType) { + public DelegatePerTargetObjectIntroductionInterceptor(Class defaultImplType, Class interfaceType) { this.defaultImplType = defaultImplType; this.interfaceType = interfaceType; // cCeate a new delegate now (but don't store it in the map). diff --git a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java index e10c0c9921..05a3f722d6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java @@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils; @SuppressWarnings("serial") public class IntroductionInfoSupport implements IntroductionInfo, Serializable { - protected final Set publishedInterfaces = new HashSet(); + protected final Set> publishedInterfaces = new HashSet>(); private transient Map rememberedMethods = new ConcurrentHashMap(32); @@ -55,13 +55,13 @@ public class IntroductionInfoSupport implements IntroductionInfo, Serializable { *

Does nothing if the interface is not implemented by the delegate. * @param intf the interface to suppress */ - public void suppressInterface(Class intf) { + public void suppressInterface(Class intf) { this.publishedInterfaces.remove(intf); } @Override - public Class[] getInterfaces() { - return this.publishedInterfaces.toArray(new Class[this.publishedInterfaces.size()]); + public Class[] getInterfaces() { + return this.publishedInterfaces.toArray(new Class[this.publishedInterfaces.size()]); } /** @@ -69,8 +69,8 @@ public class IntroductionInfoSupport implements IntroductionInfo, Serializable { * @param ifc the interface to check * @return whether the interface is part of this introduction */ - public boolean implementsInterface(Class ifc) { - for (Class pubIfc : this.publishedInterfaces) { + public boolean implementsInterface(Class ifc) { + for (Class pubIfc : this.publishedInterfaces) { if (ifc.isInterface() && ifc.isAssignableFrom(pubIfc)) { return true; } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java index de0268fb6a..cddacd8888 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java @@ -88,7 +88,7 @@ public abstract class MethodMatchers { * asking is the subject on one or more introductions; {@code false} otherwise * @return whether or not this method matches statically */ - public static boolean matches(MethodMatcher mm, Method method, Class targetClass, boolean hasIntroductions) { + public static boolean matches(MethodMatcher mm, Method method, Class targetClass, boolean hasIntroductions) { Assert.notNull(mm, "MethodMatcher must not be null"); return ((mm instanceof IntroductionAwareMethodMatcher && ((IntroductionAwareMethodMatcher) mm).matches(method, targetClass, hasIntroductions)) || @@ -114,22 +114,22 @@ public abstract class MethodMatchers { } @Override - public boolean matches(Method method, Class targetClass, boolean hasIntroductions) { + public boolean matches(Method method, Class targetClass, boolean hasIntroductions) { return (matchesClass1(targetClass) && MethodMatchers.matches(this.mm1, method, targetClass, hasIntroductions)) || (matchesClass2(targetClass) && MethodMatchers.matches(this.mm2, method, targetClass, hasIntroductions)); } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return (matchesClass1(targetClass) && this.mm1.matches(method, targetClass)) || (matchesClass2(targetClass) && this.mm2.matches(method, targetClass)); } - protected boolean matchesClass1(Class targetClass) { + protected boolean matchesClass1(Class targetClass) { return true; } - protected boolean matchesClass2(Class targetClass) { + protected boolean matchesClass2(Class targetClass) { return true; } @@ -139,7 +139,7 @@ public abstract class MethodMatchers { } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { return this.mm1.matches(method, targetClass, args) || this.mm2.matches(method, targetClass, args); } @@ -183,12 +183,12 @@ public abstract class MethodMatchers { } @Override - protected boolean matchesClass1(Class targetClass) { + protected boolean matchesClass1(Class targetClass) { return this.cf1.matches(targetClass); } @Override - protected boolean matchesClass2(Class targetClass) { + protected boolean matchesClass2(Class targetClass) { return this.cf2.matches(targetClass); } @@ -230,13 +230,13 @@ public abstract class MethodMatchers { } @Override - public boolean matches(Method method, Class targetClass, boolean hasIntroductions) { + public boolean matches(Method method, Class targetClass, boolean hasIntroductions) { return MethodMatchers.matches(this.mm1, method, targetClass, hasIntroductions) && MethodMatchers.matches(this.mm2, method, targetClass, hasIntroductions); } @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return this.mm1.matches(method, targetClass) && this.mm2.matches(method, targetClass); } @@ -246,7 +246,7 @@ public abstract class MethodMatchers { } @Override - public boolean matches(Method method, Class targetClass, Object[] args) { + public boolean matches(Method method, Class targetClass, Object[] args) { // Because a dynamic intersection may be composed of a static and dynamic part, // we must avoid calling the 3-arg matches method on a dynamic matcher, as // it will probably be an unsupported operation. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java index 26ffedaf5a..3c99b06e5e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java @@ -78,7 +78,7 @@ public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut impleme @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { for (String mappedName : this.mappedNames) { if (mappedName.equals(method.getName()) || isMatch(method.getName(), mappedName)) { return true; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java index 957f5d319e..df6e57bfa4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java @@ -71,7 +71,7 @@ public abstract class Pointcuts { * @param args arguments to the method * @return whether there's a runtime match */ - public static boolean matches(Pointcut pointcut, Method method, Class targetClass, Object[] args) { + public static boolean matches(Pointcut pointcut, Method method, Class targetClass, Object[] args) { Assert.notNull(pointcut, "Pointcut must not be null"); if (pointcut == Pointcut.TRUE) { return true; @@ -97,7 +97,7 @@ public abstract class Pointcuts { public static SetterPointcut INSTANCE = new SetterPointcut(); @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return method.getName().startsWith("set") && method.getParameterTypes().length == 1 && method.getReturnType() == Void.TYPE; @@ -118,7 +118,7 @@ public abstract class Pointcuts { public static GetterPointcut INSTANCE = new GetterPointcut(); @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { return method.getName().startsWith("get") && method.getParameterTypes().length == 0; } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java index c232b2826b..364ff6282e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java @@ -27,16 +27,16 @@ import org.springframework.aop.ClassFilter; @SuppressWarnings("serial") public class RootClassFilter implements ClassFilter, Serializable { - private Class clazz; + private Class clazz; - // TODO inheritance - public RootClassFilter(Class clazz) { + public RootClassFilter(Class clazz) { this.clazz = clazz; } + @Override - public boolean matches(Class candidate) { + public boolean matches(Class candidate) { return clazz.isAssignableFrom(candidate); } diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java index aacf645c3f..a4dbc8200d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java @@ -60,7 +60,7 @@ public class AnnotationClassFilter implements ClassFilter { @Override - public boolean matches(Class clazz) { + public boolean matches(Class clazz) { return (this.checkInherited ? (AnnotationUtils.findAnnotation(clazz, this.annotationType) != null) : clazz.isAnnotationPresent(this.annotationType)); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java index 9b557473ff..e651639e01 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java @@ -48,7 +48,7 @@ public class AnnotationMethodMatcher extends StaticMethodMatcher { @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { if (method.isAnnotationPresent(this.annotationType)) { return true; } diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java index 0928b54b89..1d917b6a1b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java @@ -97,7 +97,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource *

Default is to detect the type automatically, through a {@code getType} * call on the BeanFactory (or even a full {@code getBean} call as fallback). */ - public void setTargetClass(Class targetClass) { + public void setTargetClass(Class targetClass) { this.targetClass = targetClass; } diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java index c0bef77145..7fafe60c0a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java @@ -53,6 +53,9 @@ import org.springframework.beans.factory.DisposableBean; public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBasedTargetSource implements PoolingConfig, DisposableBean { + private static final long serialVersionUID = 1L; + + /** The maximum size of the pool */ private int maxSize = -1; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java index 4880d5119b..2dd7ed7987 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java @@ -45,6 +45,9 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; */ public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFactoryBasedTargetSource { + private static final long serialVersionUID = 1L; + + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { super.setBeanFactory(beanFactory); diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java index 826917a561..0e9ef50057 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java @@ -50,7 +50,7 @@ public class EmptyTargetSource implements TargetSource, Serializable { * @param targetClass the target Class (may be {@code null}) * @see #getTargetClass() */ - public static EmptyTargetSource forClass(Class targetClass) { + public static EmptyTargetSource forClass(Class targetClass) { return forClass(targetClass, true); } @@ -60,7 +60,7 @@ public class EmptyTargetSource implements TargetSource, Serializable { * @param isStatic whether the TargetSource should be marked as static * @see #getTargetClass() */ - public static EmptyTargetSource forClass(Class targetClass, boolean isStatic) { + public static EmptyTargetSource forClass(Class targetClass, boolean isStatic) { return (targetClass == null && isStatic ? INSTANCE : new EmptyTargetSource(targetClass, isStatic)); } @@ -69,7 +69,7 @@ public class EmptyTargetSource implements TargetSource, Serializable { // Instance implementation //--------------------------------------------------------------------- - private final Class targetClass; + private final Class targetClass; private final boolean isStatic; @@ -81,7 +81,7 @@ public class EmptyTargetSource implements TargetSource, Serializable { * @param targetClass the target class to expose (may be {@code null}) * @param isStatic whether the TargetSource is marked as static */ - private EmptyTargetSource(Class targetClass, boolean isStatic) { + private EmptyTargetSource(Class targetClass, boolean isStatic) { this.targetClass = targetClass; this.isStatic = isStatic; } diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java index 9d4cbf82a9..95dff09cc0 100644 --- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java +++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java @@ -46,6 +46,11 @@ public class NopInterceptor implements MethodInterceptor { ++count; } + @Override + public int hashCode() { + return 0; + } + @Override public boolean equals(Object other) { if (!(other instanceof NopInterceptor)) { @@ -57,4 +62,5 @@ public class NopInterceptor implements MethodInterceptor { return this.count == ((NopInterceptor) other).count; } + } diff --git a/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java index eb2dddef97..805dabd41a 100644 --- a/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java +++ b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java @@ -28,7 +28,11 @@ import org.springframework.util.ObjectUtils; @SuppressWarnings("serial") public class SerializablePerson implements Person, Serializable { + private static final long serialVersionUID = 1L; + + private String name; + private int age; @Override @@ -59,6 +63,11 @@ public class SerializablePerson implements Person, Serializable { return o; } + @Override + public int hashCode() { + return 0; + } + @Override public boolean equals(Object other) { if (!(other instanceof SerializablePerson)) { diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java index 8be616c7dd..7fea8958fe 100644 --- a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java @@ -112,7 +112,7 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl // Redefined with public visibility. @Override - public Class getPropertyType(String propertyPath) { + public Class getPropertyType(String propertyPath) { return null; } diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java index ef170a1baa..8b7b521724 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java @@ -26,7 +26,7 @@ package org.springframework.beans; @SuppressWarnings("serial") public class BeanInstantiationException extends FatalBeanException { - private Class beanClass; + private Class beanClass; /** @@ -34,7 +34,7 @@ public class BeanInstantiationException extends FatalBeanException { * @param beanClass the offending bean class * @param msg the detail message */ - public BeanInstantiationException(Class beanClass, String msg) { + public BeanInstantiationException(Class beanClass, String msg) { this(beanClass, msg, null); } @@ -44,7 +44,7 @@ public class BeanInstantiationException extends FatalBeanException { * @param msg the detail message * @param cause the root cause */ - public BeanInstantiationException(Class beanClass, String msg, Throwable cause) { + public BeanInstantiationException(Class beanClass, String msg, Throwable cause) { super("Could not instantiate bean class [" + beanClass.getName() + "]: " + msg, cause); this.beanClass = beanClass; } @@ -52,7 +52,7 @@ public class BeanInstantiationException extends FatalBeanException { /** * Return the offending bean class. */ - public Class getBeanClass() { + public Class getBeanClass() { return beanClass; } diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index 0a605478c1..018cf240d3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -336,7 +336,7 @@ public abstract class BeanUtils { String methodName = signature.substring(0, firstParen); String[] parameterTypeNames = StringUtils.commaDelimitedListToStringArray(signature.substring(firstParen + 1, lastParen)); - Class[] parameterTypes = new Class[parameterTypeNames.length]; + Class[] parameterTypes = new Class[parameterTypeNames.length]; for (int i = 0; i < parameterTypeNames.length; i++) { String parameterTypeName = parameterTypeNames[i].trim(); try { diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java index 628ee8e78a..08bfa0bc7b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java @@ -59,7 +59,7 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor { * @return the type of the wrapped bean instance, * or {@code null} if no wrapped object has been set */ - Class getWrappedClass(); + Class getWrappedClass(); /** * Obtain the PropertyDescriptors for the wrapped object diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index 464323cbb9..9f4b581a0e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java @@ -37,7 +37,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.core.CollectionFactory; import org.springframework.core.GenericCollectionTypeResolver; import org.springframework.core.convert.ConversionException; @@ -225,7 +224,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } @Override - public final Class getWrappedClass() { + public final Class getWrappedClass() { return (this.object != null ? this.object.getClass() : null); } @@ -248,7 +247,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra * Return the class of the root object at the top of the path of this BeanWrapper. * @see #getNestedPath */ - public final Class getRootClass() { + public final Class getRootClass() { return (this.rootObject != null ? this.rootObject.getClass() : null); } @@ -310,7 +309,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra * Needs to be called when the target object changes. * @param clazz the class to introspect */ - protected void setIntrospectionClass(Class clazz) { + protected void setIntrospectionClass(Class clazz) { if (this.cachedIntrospectionResults != null && !clazz.equals(this.cachedIntrospectionResults.getBeanClass())) { this.cachedIntrospectionResults = null; @@ -360,7 +359,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } @Override - public Class getPropertyType(String propertyName) throws BeansException { + public Class getPropertyType(String propertyName) throws BeansException { try { PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName); if (pd != null) { @@ -374,7 +373,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } // Check to see if there is a custom editor, // which might give an indication on the desired target type. - Class editorType = guessPropertyTypeFromEditors(propertyName); + Class editorType = guessPropertyTypeFromEditors(propertyName); if (editorType != null) { return editorType; } @@ -710,7 +709,8 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra return nestedBw.getPropertyValue(tokens); } - private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException { + @SuppressWarnings("unchecked") + private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException { String propertyName = tokens.canonicalName; String actualName = tokens.actualName; PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName); @@ -779,20 +779,20 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } else if (value instanceof List) { int index = Integer.parseInt(key); - List list = (List) value; + List list = (List) value; growCollectionIfNecessary(list, index, indexedPropertyName, pd, i + 1); value = list.get(index); } else if (value instanceof Set) { // Apply index to Iterator in case of a Set. - Set set = (Set) value; + Set set = (Set) value; int index = Integer.parseInt(key); if (index < 0 || index >= set.size()) { throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName, "Cannot get element with index " + index + " from Set of size " + set.size() + ", accessed using property path '" + propertyName + "'"); } - Iterator it = set.iterator(); + Iterator it = set.iterator(); for (int j = 0; it.hasNext(); j++) { Object elem = it.next(); if (j == index) { @@ -802,7 +802,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } } else if (value instanceof Map) { - Map map = (Map) value; + Map map = (Map) value; Class mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType(pd.getReadMethod(), i + 1); // IMPORTANT: Do not pass full property name in here - property editors // must not kick in for map keys but rather only for map values. @@ -863,16 +863,14 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } } - @SuppressWarnings("unchecked") - private void growCollectionIfNecessary( - Collection collection, int index, String name, PropertyDescriptor pd, int nestingLevel) { - + private void growCollectionIfNecessary(Collection collection, int index, + String name, PropertyDescriptor pd, int nestingLevel) { if (!this.autoGrowNestedPaths) { return; } int size = collection.size(); if (index >= size && index < this.autoGrowCollectionLimit) { - Class elementType = GenericCollectionTypeResolver.getCollectionReturnType(pd.getReadMethod(), nestingLevel); + Class elementType = GenericCollectionTypeResolver.getCollectionReturnType(pd.getReadMethod(), nestingLevel); if (elementType != null) { for (int i = collection.size(); i < index + 1; i++) { collection.add(newValue(elementType, name)); @@ -958,7 +956,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } if (propValue.getClass().isArray()) { PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName); - Class requiredType = propValue.getClass().getComponentType(); + Class requiredType = propValue.getClass().getComponentType(); int arrayIndex = Integer.parseInt(key); Object oldValue = null; try { @@ -976,9 +974,9 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } else if (propValue instanceof List) { PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName); - Class requiredType = GenericCollectionTypeResolver.getCollectionReturnType( + Class requiredType = GenericCollectionTypeResolver.getCollectionReturnType( pd.getReadMethod(), tokens.keys.length); - List list = (List) propValue; + List list = (List) propValue; int index = Integer.parseInt(key); Object oldValue = null; if (isExtractOldValueForEditor() && index < list.size()) { @@ -1013,11 +1011,11 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra } else if (propValue instanceof Map) { PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName); - Class mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType( + Class mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType( pd.getReadMethod(), tokens.keys.length); - Class mapValueType = GenericCollectionTypeResolver.getMapValueReturnType( + Class mapValueType = GenericCollectionTypeResolver.getMapValueReturnType( pd.getReadMethod(), tokens.keys.length); - Map map = (Map) propValue; + Map map = (Map) propValue; // IMPORTANT: Do not pass full property name in here - property editors // must not kick in for map keys but rather only for map values. TypeDescriptor typeDescriptor = (mapKeyType != null ? diff --git a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java index f83f6acb4e..f57ce5c4e1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java +++ b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java @@ -32,7 +32,6 @@ import java.util.WeakHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -76,7 +75,7 @@ public class CachedIntrospectionResults { * Needs to be a WeakHashMap with WeakReferences as values to allow * for proper garbage collection in case of multiple class loaders. */ - static final Map classCache = new WeakHashMap(); + static final Map, Object> classCache = new WeakHashMap, Object>(); /** @@ -107,7 +106,7 @@ public class CachedIntrospectionResults { */ public static void clearClassLoader(ClassLoader classLoader) { synchronized (classCache) { - for (Iterator it = classCache.keySet().iterator(); it.hasNext();) { + for (Iterator> it = classCache.keySet().iterator(); it.hasNext();) { Class beanClass = it.next(); if (isUnderneathClassLoader(beanClass.getClassLoader(), classLoader)) { it.remove(); @@ -130,6 +129,7 @@ public class CachedIntrospectionResults { * @return the corresponding CachedIntrospectionResults * @throws BeansException in case of introspection failure */ + @SuppressWarnings("unchecked") static CachedIntrospectionResults forClass(Class beanClass) throws BeansException { CachedIntrospectionResults results; Object value; @@ -137,8 +137,8 @@ public class CachedIntrospectionResults { value = classCache.get(beanClass); } if (value instanceof Reference) { - Reference ref = (Reference) value; - results = (CachedIntrospectionResults) ref.get(); + Reference ref = (Reference) value; + results = ref.get(); } else { results = (CachedIntrospectionResults) value; diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java index 5151193e8f..26a8db336b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java @@ -34,7 +34,8 @@ public class ConversionNotSupportedException extends TypeMismatchException { * @param requiredType the required target type (or {@code null} if not known) * @param cause the root cause (may be {@code null}) */ - public ConversionNotSupportedException(PropertyChangeEvent propertyChangeEvent, Class requiredType, Throwable cause) { + public ConversionNotSupportedException(PropertyChangeEvent propertyChangeEvent, + Class requiredType, Throwable cause) { super(propertyChangeEvent, requiredType, cause); } @@ -44,7 +45,7 @@ public class ConversionNotSupportedException extends TypeMismatchException { * @param requiredType the required target type (or {@code null} if not known) * @param cause the root cause (may be {@code null}) */ - public ConversionNotSupportedException(Object value, Class requiredType, Throwable cause) { + public ConversionNotSupportedException(Object value, Class requiredType, Throwable cause) { super(value, requiredType, cause); } diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java index 96db41d162..d451ad41a1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java @@ -26,7 +26,7 @@ package org.springframework.beans; @SuppressWarnings("serial") public class InvalidPropertyException extends FatalBeanException { - private Class beanClass; + private Class beanClass; private String propertyName; @@ -37,7 +37,7 @@ public class InvalidPropertyException extends FatalBeanException { * @param propertyName the offending property * @param msg the detail message */ - public InvalidPropertyException(Class beanClass, String propertyName, String msg) { + public InvalidPropertyException(Class beanClass, String propertyName, String msg) { this(beanClass, propertyName, msg, null); } @@ -48,7 +48,7 @@ public class InvalidPropertyException extends FatalBeanException { * @param msg the detail message * @param cause the root cause */ - public InvalidPropertyException(Class beanClass, String propertyName, String msg, Throwable cause) { + public InvalidPropertyException(Class beanClass, String propertyName, String msg, Throwable cause) { super("Invalid property '" + propertyName + "' of bean class [" + beanClass.getName() + "]: " + msg, cause); this.beanClass = beanClass; this.propertyName = propertyName; @@ -57,7 +57,7 @@ public class InvalidPropertyException extends FatalBeanException { /** * Return the offending bean class. */ - public Class getBeanClass() { + public Class getBeanClass() { return beanClass; } diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java index bc495446ba..693dcffbc1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java @@ -86,7 +86,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable { // There is no replacement of existing property values. if (original != null) { this.propertyValueList = new ArrayList(original.size()); - for (Map.Entry entry : original.entrySet()) { + for (Map.Entry entry : original.entrySet()) { this.propertyValueList.add(new PropertyValue(entry.getKey().toString(), entry.getValue())); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java index 2001d09eed..dbf55e883d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java @@ -31,7 +31,7 @@ public class NotReadablePropertyException extends InvalidPropertyException { * @param beanClass the offending bean class * @param propertyName the offending property */ - public NotReadablePropertyException(Class beanClass, String propertyName) { + public NotReadablePropertyException(Class beanClass, String propertyName) { super(beanClass, propertyName, "Bean property '" + propertyName + "' is not readable or has an invalid getter method: " + "Does the return type of the getter match the parameter type of the setter?"); @@ -43,7 +43,7 @@ public class NotReadablePropertyException extends InvalidPropertyException { * @param propertyName the offending property * @param msg the detail message */ - public NotReadablePropertyException(Class beanClass, String propertyName, String msg) { + public NotReadablePropertyException(Class beanClass, String propertyName, String msg) { super(beanClass, propertyName, msg); } diff --git a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java index de734c28c3..b1a05a14a1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java @@ -35,7 +35,7 @@ public class NotWritablePropertyException extends InvalidPropertyException { * @param beanClass the offending bean class * @param propertyName the offending property name */ - public NotWritablePropertyException(Class beanClass, String propertyName) { + public NotWritablePropertyException(Class beanClass, String propertyName) { super(beanClass, propertyName, "Bean property '" + propertyName + "' is not writable or has an invalid setter method: " + "Does the return type of the getter match the parameter type of the setter?"); @@ -47,7 +47,7 @@ public class NotWritablePropertyException extends InvalidPropertyException { * @param propertyName the offending property name * @param msg the detail message */ - public NotWritablePropertyException(Class beanClass, String propertyName, String msg) { + public NotWritablePropertyException(Class beanClass, String propertyName, String msg) { super(beanClass, propertyName, msg); } @@ -58,7 +58,7 @@ public class NotWritablePropertyException extends InvalidPropertyException { * @param msg the detail message * @param cause the root cause */ - public NotWritablePropertyException(Class beanClass, String propertyName, String msg, Throwable cause) { + public NotWritablePropertyException(Class beanClass, String propertyName, String msg, Throwable cause) { super(beanClass, propertyName, msg, cause); } @@ -70,7 +70,7 @@ public class NotWritablePropertyException extends InvalidPropertyException { * @param possibleMatches suggestions for actual bean property names * that closely match the invalid property name */ - public NotWritablePropertyException(Class beanClass, String propertyName, String msg, String[] possibleMatches) { + public NotWritablePropertyException(Class beanClass, String propertyName, String msg, String[] possibleMatches) { super(beanClass, propertyName, msg); this.possibleMatches = possibleMatches; } diff --git a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java index f1ad856b3f..e01fafbfec 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java @@ -33,7 +33,7 @@ public class NullValueInNestedPathException extends InvalidPropertyException { * @param beanClass the offending bean class * @param propertyName the offending property */ - public NullValueInNestedPathException(Class beanClass, String propertyName) { + public NullValueInNestedPathException(Class beanClass, String propertyName) { super(beanClass, propertyName, "Value of nested property '" + propertyName + "' is null"); } @@ -43,7 +43,7 @@ public class NullValueInNestedPathException extends InvalidPropertyException { * @param propertyName the offending property * @param msg the detail message */ - public NullValueInNestedPathException(Class beanClass, String propertyName, String msg) { + public NullValueInNestedPathException(Class beanClass, String propertyName, String msg) { super(beanClass, propertyName, msg); } diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java index 621bae5325..00068ea4b6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java @@ -86,7 +86,7 @@ public interface PropertyAccessor { * @throws PropertyAccessException if the property was valid but the * accessor method failed */ - Class getPropertyType(String propertyName) throws BeansException; + Class getPropertyType(String propertyName) throws BeansException; /** * Return a type descriptor for the specified property: diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java index 1919a47122..bfa54687bb 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java @@ -130,7 +130,7 @@ public class PropertyBatchUpdateException extends BeansException { } @Override - public boolean contains(Class exType) { + public boolean contains(Class exType) { if (exType == null) { return false; } diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java index 82830a198c..e69b09b71a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java @@ -49,7 +49,7 @@ final class PropertyMatches { * @param propertyName the name of the property to find possible matches for * @param beanClass the bean class to search for matches */ - public static PropertyMatches forProperty(String propertyName, Class beanClass) { + public static PropertyMatches forProperty(String propertyName, Class beanClass) { return forProperty(propertyName, beanClass, DEFAULT_MAX_DISTANCE); } @@ -59,7 +59,7 @@ final class PropertyMatches { * @param beanClass the bean class to search for matches * @param maxDistance the maximum property distance allowed for matches */ - public static PropertyMatches forProperty(String propertyName, Class beanClass, int maxDistance) { + public static PropertyMatches forProperty(String propertyName, Class beanClass, int maxDistance) { return new PropertyMatches(propertyName, beanClass, maxDistance); } @@ -76,7 +76,7 @@ final class PropertyMatches { /** * Create a new PropertyMatches instance for the given property. */ - private PropertyMatches(String propertyName, Class beanClass, int maxDistance) { + private PropertyMatches(String propertyName, Class beanClass, int maxDistance) { this.propertyName = propertyName; this.possibleMatches = calculateMatches(BeanUtils.getPropertyDescriptors(beanClass), maxDistance); } diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java index d0a2641ecd..1f904c406c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java @@ -200,13 +200,13 @@ class TypeConverterDelegate { else if (convertedValue instanceof Collection) { // Convert elements to target type, if determined. convertedValue = convertToTypedCollection( - (Collection) convertedValue, propertyName, requiredType, typeDescriptor); + (Collection) convertedValue, propertyName, requiredType, typeDescriptor); standardConversion = true; } else if (convertedValue instanceof Map) { // Convert keys and values to respective target type, if determined. convertedValue = convertToTypedMap( - (Map) convertedValue, propertyName, requiredType, typeDescriptor); + (Map) convertedValue, propertyName, requiredType, typeDescriptor); standardConversion = true; } if (convertedValue.getClass().isArray() && Array.getLength(convertedValue) == 1) { @@ -220,8 +220,8 @@ class TypeConverterDelegate { else if (convertedValue instanceof String && !requiredType.isInstance(convertedValue)) { if (firstAttemptEx == null && !requiredType.isInterface() && !requiredType.isEnum()) { try { - Constructor strCtor = requiredType.getConstructor(String.class); - return (T) BeanUtils.instantiateClass(strCtor, convertedValue); + Constructor strCtor = requiredType.getConstructor(String.class); + return BeanUtils.instantiateClass(strCtor, convertedValue); } catch (NoSuchMethodException ex) { // proceed with field lookup @@ -331,7 +331,7 @@ class TypeConverterDelegate { * @param requiredType the type to find an editor for * @return the corresponding editor, or {@code null} if none */ - private PropertyEditor findDefaultEditor(Class requiredType) { + private PropertyEditor findDefaultEditor(Class requiredType) { PropertyEditor editor = null; if (requiredType != null) { // No custom editor -> check BeanWrapperImpl's default editors. @@ -434,10 +434,10 @@ class TypeConverterDelegate { private Object convertToTypedArray(Object input, String propertyName, Class componentType) { if (input instanceof Collection) { // Convert Collection elements to array elements. - Collection coll = (Collection) input; + Collection coll = (Collection) input; Object result = Array.newInstance(componentType, coll.size()); int i = 0; - for (Iterator it = coll.iterator(); it.hasNext(); i++) { + for (Iterator it = coll.iterator(); it.hasNext(); i++) { Object value = convertIfNecessary( buildIndexedPropertyName(propertyName, i), null, it.next(), componentType); Array.set(result, i, value); @@ -470,8 +470,8 @@ class TypeConverterDelegate { } @SuppressWarnings("unchecked") - private Collection convertToTypedCollection( - Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { + private Collection convertToTypedCollection( + Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { if (!Collection.class.isAssignableFrom(requiredType)) { return original; @@ -494,7 +494,7 @@ class TypeConverterDelegate { return original; } - Iterator it; + Iterator it; try { it = original.iterator(); if (it == null) { @@ -513,13 +513,13 @@ class TypeConverterDelegate { return original; } - Collection convertedCopy; + Collection convertedCopy; try { if (approximable) { convertedCopy = CollectionFactory.createApproximateCollection(original, original.size()); } else { - convertedCopy = (Collection) requiredType.newInstance(); + convertedCopy = (Collection) requiredType.newInstance(); } } catch (Throwable ex) { @@ -552,8 +552,8 @@ class TypeConverterDelegate { } @SuppressWarnings("unchecked") - private Map convertToTypedMap( - Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { + private Map convertToTypedMap( + Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { if (!Map.class.isAssignableFrom(requiredType)) { return original; @@ -577,7 +577,7 @@ class TypeConverterDelegate { return original; } - Iterator it; + Iterator it; try { it = original.entrySet().iterator(); if (it == null) { @@ -596,13 +596,13 @@ class TypeConverterDelegate { return original; } - Map convertedCopy; + Map convertedCopy; try { if (approximable) { convertedCopy = CollectionFactory.createApproximateMap(original, original.size()); } else { - convertedCopy = (Map) requiredType.newInstance(); + convertedCopy = (Map) requiredType.newInstance(); } } catch (Throwable ex) { @@ -614,7 +614,7 @@ class TypeConverterDelegate { } while (it.hasNext()) { - Map.Entry entry = (Map.Entry) it.next(); + Map.Entry entry = (Map.Entry) it.next(); Object key = entry.getKey(); Object value = entry.getValue(); String keyedPropertyName = buildKeyedPropertyName(propertyName, key); @@ -649,7 +649,7 @@ class TypeConverterDelegate { null); } - private boolean canCreateCopy(Class requiredType) { + private boolean canCreateCopy(Class requiredType) { return (!requiredType.isInterface() && !Modifier.isAbstract(requiredType.getModifiers()) && Modifier.isPublic(requiredType.getModifiers()) && ClassUtils.hasConstructor(requiredType)); } diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java index 83883a31a1..287d4b83b8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java @@ -37,7 +37,7 @@ public class TypeMismatchException extends PropertyAccessException { private transient Object value; - private Class requiredType; + private Class requiredType; /** @@ -45,7 +45,7 @@ public class TypeMismatchException extends PropertyAccessException { * @param propertyChangeEvent the PropertyChangeEvent that resulted in the problem * @param requiredType the required target type */ - public TypeMismatchException(PropertyChangeEvent propertyChangeEvent, Class requiredType) { + public TypeMismatchException(PropertyChangeEvent propertyChangeEvent, Class requiredType) { this(propertyChangeEvent, requiredType, null); } @@ -55,7 +55,7 @@ public class TypeMismatchException extends PropertyAccessException { * @param requiredType the required target type (or {@code null} if not known) * @param cause the root cause (may be {@code null}) */ - public TypeMismatchException(PropertyChangeEvent propertyChangeEvent, Class requiredType, Throwable cause) { + public TypeMismatchException(PropertyChangeEvent propertyChangeEvent, Class requiredType, Throwable cause) { super(propertyChangeEvent, "Failed to convert property value of type '" + ClassUtils.getDescriptiveType(propertyChangeEvent.getNewValue()) + "'" + @@ -73,7 +73,7 @@ public class TypeMismatchException extends PropertyAccessException { * @param value the offending value that couldn't be converted (may be {@code null}) * @param requiredType the required target type (or {@code null} if not known) */ - public TypeMismatchException(Object value, Class requiredType) { + public TypeMismatchException(Object value, Class requiredType) { this(value, requiredType, null); } @@ -83,7 +83,7 @@ public class TypeMismatchException extends PropertyAccessException { * @param requiredType the required target type (or {@code null} if not known) * @param cause the root cause (may be {@code null}) */ - public TypeMismatchException(Object value, Class requiredType, Throwable cause) { + public TypeMismatchException(Object value, Class requiredType, Throwable cause) { super("Failed to convert value of type '" + ClassUtils.getDescriptiveType(value) + "'" + (requiredType != null ? " to required type '" + ClassUtils.getQualifiedName(requiredType) + "'" : ""), cause); @@ -103,7 +103,7 @@ public class TypeMismatchException extends PropertyAccessException { /** * Return the required target type, if any. */ - public Class getRequiredType() { + public Class getRequiredType() { return this.requiredType; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java index 2ffe909a94..f0c2fa1dae 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java @@ -185,7 +185,7 @@ public class BeanCreationException extends FatalBeanException { } @Override - public boolean contains(Class exClass) { + public boolean contains(Class exClass) { if (super.contains(exClass)) { return true; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java index af47ab3f80..444d3a9b12 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java @@ -34,7 +34,7 @@ public class BeanIsNotAFactoryException extends BeanNotOfRequiredTypeException { * @param actualType the actual type returned, which did not match * the expected type */ - public BeanIsNotAFactoryException(String name, Class actualType) { + public BeanIsNotAFactoryException(String name, Class actualType) { super(name, FactoryBean.class, actualType); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java index 3b2914e6c9..bd6d33fbc4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java @@ -31,10 +31,10 @@ public class BeanNotOfRequiredTypeException extends BeansException { private String beanName; /** The required type */ - private Class requiredType; + private Class requiredType; /** The offending type */ - private Class actualType; + private Class actualType; /** @@ -44,7 +44,7 @@ public class BeanNotOfRequiredTypeException extends BeansException { * @param actualType the actual type returned, which did not match * the expected type */ - public BeanNotOfRequiredTypeException(String beanName, Class requiredType, Class actualType) { + public BeanNotOfRequiredTypeException(String beanName, Class requiredType, Class actualType) { super("Bean named '" + beanName + "' must be of type [" + requiredType.getName() + "], but was actually of type [" + actualType.getName() + "]"); this.beanName = beanName; @@ -63,14 +63,14 @@ public class BeanNotOfRequiredTypeException extends BeansException { /** * Return the expected type for the bean. */ - public Class getRequiredType() { + public Class getRequiredType() { return this.requiredType; } /** * Return the actual type of the instance found. */ - public Class getActualType() { + public Class getActualType() { return this.actualType; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java index 5a455420d3..f539e70180 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java @@ -69,7 +69,7 @@ public class UnsatisfiedDependencyException extends BeanCreationException { * @param msg the detail message */ public UnsatisfiedDependencyException( - String resourceDescription, String beanName, int ctorArgIndex, Class ctorArgType, String msg) { + String resourceDescription, String beanName, int ctorArgIndex, Class ctorArgType, String msg) { super(resourceDescription, beanName, "Unsatisfied dependency expressed through constructor argument with index " + @@ -86,7 +86,7 @@ public class UnsatisfiedDependencyException extends BeanCreationException { * @param ex the bean creation exception that indicated the unsatisfied dependency */ public UnsatisfiedDependencyException( - String resourceDescription, String beanName, int ctorArgIndex, Class ctorArgType, BeansException ex) { + String resourceDescription, String beanName, int ctorArgIndex, Class ctorArgType, BeansException ex) { this(resourceDescription, beanName, ctorArgIndex, ctorArgType, (ex != null ? ": " + ex.getMessage() : "")); initCause(ex); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 5b605b58d6..8db6d6fff0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -268,10 +268,10 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean if (requiredConstructor == null && defaultConstructor != null) { candidates.add(defaultConstructor); } - candidateConstructors = candidates.toArray(new Constructor[candidates.size()]); + candidateConstructors = candidates.toArray(new Constructor[candidates.size()]); } else { - candidateConstructors = new Constructor[0]; + candidateConstructors = new Constructor[0]; } this.candidateConstructorsCache.put(beanClass, candidateConstructors); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java index 2d6934de0c..51dd04a8d6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java @@ -50,7 +50,7 @@ public class CustomAutowireConfigurer implements BeanFactoryPostProcessor, BeanC private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered - private Set customQualifierTypes; + private Set customQualifierTypes; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -79,7 +79,7 @@ public class CustomAutowireConfigurer implements BeanFactoryPostProcessor, BeanC * does not require explicit registration. * @param customQualifierTypes the custom types to register */ - public void setCustomQualifierTypes(Set customQualifierTypes) { + public void setCustomQualifierTypes(Set customQualifierTypes) { this.customQualifierTypes = customQualifierTypes; } @@ -99,13 +99,13 @@ public class CustomAutowireConfigurer implements BeanFactoryPostProcessor, BeanC QualifierAnnotationAutowireCandidateResolver resolver = (QualifierAnnotationAutowireCandidateResolver) dlbf.getAutowireCandidateResolver(); for (Object value : this.customQualifierTypes) { - Class customType = null; + Class customType = null; if (value instanceof Class) { - customType = (Class) value; + customType = (Class) value; } else if (value instanceof String) { String className = (String) value; - customType = ClassUtils.resolveClassName(className, this.beanClassLoader); + customType = (Class) ClassUtils.resolveClassName(className, this.beanClassLoader); } else { throw new IllegalArgumentException( diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java index 222a2ccd51..9045f5c802 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java @@ -243,7 +243,7 @@ public class InitDestroyAnnotationBeanPostProcessor */ private class LifecycleMetadata { - private final Class targetClass; + private final Class targetClass; private final Collection initMethods; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java index 2dda2ca735..bc8a42f71b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java @@ -158,7 +158,7 @@ public abstract class AbstractFactoryBean */ @SuppressWarnings("unchecked") private T getEarlySingletonInstance() throws Exception { - Class[] ifcs = getEarlySingletonInterfaces(); + Class[] ifcs = getEarlySingletonInterfaces(); if (ifcs == null) { throw new FactoryBeanNotInitializedException( getClass().getName() + " does not support circular references"); @@ -225,9 +225,9 @@ public abstract class AbstractFactoryBean * or {@code null} to indicate a FactoryBeanNotInitializedException * @see org.springframework.beans.factory.FactoryBeanNotInitializedException */ - protected Class[] getEarlySingletonInterfaces() { - Class type = getObjectType(); - return (type != null && type.isInterface() ? new Class[] {type} : null); + protected Class[] getEarlySingletonInterfaces() { + Class type = getObjectType(); + return (type != null && type.isInterface() ? new Class[] {type} : null); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java index f637b891e1..6407d89d5a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java @@ -46,7 +46,7 @@ import org.springframework.beans.factory.SmartFactoryBean; * (which support placeholder parsing since Spring 2.5) */ @Deprecated -public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAware { +public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAware { private String targetBeanName; @@ -86,7 +86,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw } @Override - public Class getObjectType() { + public Class getObjectType() { if (this.beanFactory == null) { return null; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index f11795d22e..2681fd7c32 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -140,7 +140,6 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, Ordered @Override - @SuppressWarnings("unchecked") public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { if (this.propertyEditorRegistrars != null) { for (PropertyEditorRegistrar propertyEditorRegistrar : this.propertyEditorRegistrars) { @@ -149,7 +148,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, Ordered } if (this.customEditors != null) { for (Map.Entry, Class> entry : this.customEditors.entrySet()) { - Class requiredType = entry.getKey(); + Class requiredType = entry.getKey(); Class propertyEditorClass = entry.getValue(); beanFactory.registerCustomEditor(requiredType, propertyEditorClass); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java index 0d5a281925..446de9a344 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java @@ -77,7 +77,6 @@ public class CustomScopeConfigurer implements BeanFactoryPostProcessor, BeanClas @Override - @SuppressWarnings("unchecked") public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { if (this.scopes != null) { for (Map.Entry entry : this.scopes.entrySet()) { @@ -87,12 +86,12 @@ public class CustomScopeConfigurer implements BeanFactoryPostProcessor, BeanClas beanFactory.registerScope(scopeKey, (Scope) value); } else if (value instanceof Class) { - Class scopeClass = (Class) value; + Class scopeClass = (Class) value; Assert.isAssignable(Scope.class, scopeClass); beanFactory.registerScope(scopeKey, (Scope) BeanUtils.instantiateClass(scopeClass)); } else if (value instanceof String) { - Class scopeClass = ClassUtils.resolveClassName((String) value, this.beanClassLoader); + Class scopeClass = ClassUtils.resolveClassName((String) value, this.beanClassLoader); Assert.isAssignable(Scope.class, scopeClass); beanFactory.registerScope(scopeKey, (Scope) BeanUtils.instantiateClass(scopeClass)); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java index eeea2e09c6..5d8d82b14c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java @@ -52,7 +52,7 @@ public class DependencyDescriptor implements Serializable { private String methodName; - private Class[] parameterTypes; + private Class[] parameterTypes; private int parameterIndex; @@ -267,12 +267,12 @@ public class DependencyDescriptor implements Serializable { Type[] args = ((ParameterizedType) type).getActualTypeArguments(); Type arg = args[args.length - 1]; if (arg instanceof Class) { - return (Class) arg; + return (Class) arg; } else if (arg instanceof ParameterizedType) { arg = ((ParameterizedType) arg).getRawType(); if (arg instanceof Class) { - return (Class) arg; + return (Class) arg; } } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java index b5471cb4e1..aca839616c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; public class FieldRetrievingFactoryBean implements FactoryBean, BeanNameAware, BeanClassLoaderAware, InitializingBean { - private Class targetClass; + private Class targetClass; private Object targetObject; @@ -78,14 +78,14 @@ public class FieldRetrievingFactoryBean * @see #setTargetObject * @see #setTargetField */ - public void setTargetClass(Class targetClass) { + public void setTargetClass(Class targetClass) { this.targetClass = targetClass; } /** * Return the target class on which the field is defined. */ - public Class getTargetClass() { + public Class getTargetClass() { return targetClass; } @@ -189,7 +189,7 @@ public class FieldRetrievingFactoryBean } // Try to get the exact method first. - Class targetClass = (this.targetObject != null) ? this.targetObject.getClass() : this.targetClass; + Class targetClass = (this.targetObject != null) ? this.targetObject.getClass() : this.targetClass; this.fieldObject = targetClass.getField(this.targetField); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java index 736868bed3..fb251c4243 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java @@ -32,17 +32,18 @@ import org.springframework.core.GenericCollectionTypeResolver; * @see SetFactoryBean * @see MapFactoryBean */ -public class ListFactoryBean extends AbstractFactoryBean { +public class ListFactoryBean extends AbstractFactoryBean> { - private List sourceList; + private List sourceList; - private Class targetListClass; + @SuppressWarnings("rawtypes") + private Class targetListClass; /** * Set the source List, typically populated via XML "list" elements. */ - public void setSourceList(List sourceList) { + public void setSourceList(List sourceList) { this.sourceList = sourceList; } @@ -52,7 +53,8 @@ public class ListFactoryBean extends AbstractFactoryBean { *

Default is a {@code java.util.ArrayList}. * @see java.util.ArrayList */ - public void setTargetListClass(Class targetListClass) { + @SuppressWarnings("rawtypes") + public void setTargetListClass(Class targetListClass) { if (targetListClass == null) { throw new IllegalArgumentException("'targetListClass' must not be null"); } @@ -64,24 +66,25 @@ public class ListFactoryBean extends AbstractFactoryBean { @Override + @SuppressWarnings("rawtypes") public Class getObjectType() { return List.class; } @Override @SuppressWarnings("unchecked") - protected List createInstance() { + protected List createInstance() { if (this.sourceList == null) { throw new IllegalArgumentException("'sourceList' is required"); } - List result = null; + List result = null; if (this.targetListClass != null) { - result = (List) BeanUtils.instantiateClass(this.targetListClass); + result = BeanUtils.instantiateClass(this.targetListClass); } else { - result = new ArrayList(this.sourceList.size()); + result = new ArrayList(this.sourceList.size()); } - Class valueType = null; + Class valueType = null; if (this.targetListClass != null) { valueType = GenericCollectionTypeResolver.getCollectionType(this.targetListClass); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java index 436e20da93..f1ba9cfd45 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MapFactoryBean.java @@ -32,17 +32,18 @@ import org.springframework.core.GenericCollectionTypeResolver; * @see SetFactoryBean * @see ListFactoryBean */ -public class MapFactoryBean extends AbstractFactoryBean { +public class MapFactoryBean extends AbstractFactoryBean> { private Map sourceMap; - private Class targetMapClass; + @SuppressWarnings("rawtypes") + private Class targetMapClass; /** * Set the source Map, typically populated via XML "map" elements. */ - public void setSourceMap(Map sourceMap) { + public void setSourceMap(Map sourceMap) { this.sourceMap = sourceMap; } @@ -52,7 +53,8 @@ public class MapFactoryBean extends AbstractFactoryBean { *

Default is a linked HashMap, keeping the registration order. * @see java.util.LinkedHashMap */ - public void setTargetMapClass(Class targetMapClass) { + @SuppressWarnings("rawtypes") + public void setTargetMapClass(Class targetMapClass) { if (targetMapClass == null) { throw new IllegalArgumentException("'targetMapClass' must not be null"); } @@ -64,32 +66,33 @@ public class MapFactoryBean extends AbstractFactoryBean { @Override + @SuppressWarnings("rawtypes") public Class getObjectType() { return Map.class; } @Override @SuppressWarnings("unchecked") - protected Map createInstance() { + protected Map createInstance() { if (this.sourceMap == null) { throw new IllegalArgumentException("'sourceMap' is required"); } - Map result = null; + Map result = null; if (this.targetMapClass != null) { - result = (Map) BeanUtils.instantiateClass(this.targetMapClass); + result = BeanUtils.instantiateClass(this.targetMapClass); } else { - result = new LinkedHashMap(this.sourceMap.size()); + result = new LinkedHashMap(this.sourceMap.size()); } - Class keyType = null; - Class valueType = null; + Class keyType = null; + Class valueType = null; if (this.targetMapClass != null) { keyType = GenericCollectionTypeResolver.getMapKeyType(this.targetMapClass); valueType = GenericCollectionTypeResolver.getMapValueType(this.targetMapClass); } if (keyType != null || valueType != null) { TypeConverter converter = getBeanTypeConverter(); - for (Map.Entry entry : this.sourceMap.entrySet()) { + for (Map.Entry entry : this.sourceMap.entrySet()) { Object convertedKey = converter.convertIfNecessary(entry.getKey(), keyType); Object convertedValue = converter.convertIfNecessary(entry.getValue(), valueType); result.put(convertedKey, convertedValue); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java index 0e6ad68f07..505afb8223 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java @@ -121,7 +121,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker } @Override - protected Class resolveClassName(String className) throws ClassNotFoundException { + protected Class resolveClassName(String className) throws ClassNotFoundException { return ClassUtils.forName(className, this.beanClassLoader); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java index 5c3ed77257..38f990c8a9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java @@ -94,7 +94,7 @@ import org.springframework.util.Assert; * @see org.springframework.beans.factory.ObjectFactory * @see ServiceLocatorFactoryBean */ -public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean { +public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean> { private String targetBeanName; @@ -118,12 +118,12 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean getObjectType() { return ObjectFactory.class; } @Override - protected ObjectFactory createInstance() { + protected ObjectFactory createInstance() { return new TargetBeanObjectFactory(getBeanFactory(), this.targetBeanName); } @@ -132,7 +132,7 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean, Serializable { private final BeanFactory beanFactory; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java index 9a57d1d805..0acd5139ed 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java @@ -100,7 +100,7 @@ public class PropertyOverrideConfigurer extends PropertyResourceConfigurer { protected void processProperties(ConfigurableListableBeanFactory beanFactory, Properties props) throws BeansException { - for (Enumeration names = props.propertyNames(); names.hasMoreElements();) { + for (Enumeration names = props.propertyNames(); names.hasMoreElements();) { String key = (String) names.nextElement(); try { processKey(beanFactory, key, props.getProperty(key)); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java index 4b8703abf0..03617e1a67 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java @@ -91,7 +91,7 @@ public class PropertyPathFactoryBean implements FactoryBean, BeanNameAwa private String propertyPath; - private Class resultType; + private Class resultType; private String beanName; @@ -137,7 +137,7 @@ public class PropertyPathFactoryBean implements FactoryBean, BeanNameAwa * provided that you need matching by type (for example, for autowiring). * @param resultType the result type, for example "java.lang.Integer" */ - public void setResultType(Class resultType) { + public void setResultType(Class resultType) { this.resultType = resultType; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java index c0d2537042..7ec8e77fee 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; * @see javax.inject.Provider * @see ObjectFactoryCreatingFactoryBean */ -public class ProviderCreatingFactoryBean extends AbstractFactoryBean { +public class ProviderCreatingFactoryBean extends AbstractFactoryBean> { private String targetBeanName; @@ -63,12 +63,12 @@ public class ProviderCreatingFactoryBean extends AbstractFactoryBean { @Override - public Class getObjectType() { + public Class getObjectType() { return Provider.class; } @Override - protected Provider createInstance() { + protected Provider createInstance() { return new TargetBeanProvider(getBeanFactory(), this.targetBeanName); } @@ -77,7 +77,7 @@ public class ProviderCreatingFactoryBean extends AbstractFactoryBean { * Independent inner class - for serialization purposes. */ @SuppressWarnings("serial") - private static class TargetBeanProvider implements Provider, Serializable { + private static class TargetBeanProvider implements Provider, Serializable { private final BeanFactory beanFactory; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java index 7800a4d346..29b2bcf3b9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java @@ -188,9 +188,9 @@ import org.springframework.util.StringUtils; */ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFactoryAware, InitializingBean { - private Class serviceLocatorInterface; + private Class serviceLocatorInterface; - private Constructor serviceLocatorExceptionConstructor; + private Constructor serviceLocatorExceptionConstructor; private Properties serviceMappings; @@ -206,7 +206,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto * See the {@link ServiceLocatorFactoryBean class-level Javadoc} for * information on the semantics of such methods. */ - public void setServiceLocatorInterface(Class interfaceType) { + public void setServiceLocatorInterface(Class interfaceType) { this.serviceLocatorInterface = interfaceType; } @@ -222,7 +222,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto * @see #determineServiceLocatorExceptionConstructor * @see #createServiceLocatorException */ - public void setServiceLocatorExceptionClass(Class serviceLocatorExceptionClass) { + public void setServiceLocatorExceptionClass(Class serviceLocatorExceptionClass) { if (serviceLocatorExceptionClass != null && !Exception.class.isAssignableFrom(serviceLocatorExceptionClass)) { throw new IllegalArgumentException( "serviceLocatorException [" + serviceLocatorExceptionClass.getName() + "] is not a subclass of Exception"); @@ -263,7 +263,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto // Create service locator proxy. this.proxy = Proxy.newProxyInstance( this.serviceLocatorInterface.getClassLoader(), - new Class[] {this.serviceLocatorInterface}, + new Class[] {this.serviceLocatorInterface}, new ServiceLocatorInvocationHandler()); } @@ -278,17 +278,18 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto * @return the constructor to use * @see #setServiceLocatorExceptionClass */ - protected Constructor determineServiceLocatorExceptionConstructor(Class exceptionClass) { + @SuppressWarnings("unchecked") + protected Constructor determineServiceLocatorExceptionConstructor(Class exceptionClass) { try { - return exceptionClass.getConstructor(new Class[] {String.class, Throwable.class}); + return (Constructor) exceptionClass.getConstructor(new Class[] {String.class, Throwable.class}); } catch (NoSuchMethodException ex) { try { - return exceptionClass.getConstructor(new Class[] {Throwable.class}); + return (Constructor) exceptionClass.getConstructor(new Class[] {Throwable.class}); } catch (NoSuchMethodException ex2) { try { - return exceptionClass.getConstructor(new Class[] {String.class}); + return (Constructor) exceptionClass.getConstructor(new Class[] {String.class}); } catch (NoSuchMethodException ex3) { throw new IllegalArgumentException( @@ -309,8 +310,8 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto * @return the service locator exception to throw * @see #setServiceLocatorExceptionClass */ - protected Exception createServiceLocatorException(Constructor exceptionConstructor, BeansException cause) { - Class[] paramTypes = exceptionConstructor.getParameterTypes(); + protected Exception createServiceLocatorException(Constructor exceptionConstructor, BeansException cause) { + Class[] paramTypes = exceptionConstructor.getParameterTypes(); Object[] args = new Object[paramTypes.length]; for (int i = 0; i < paramTypes.length; i++) { if (paramTypes[i].equals(String.class)) { @@ -320,7 +321,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto args[i] = cause; } } - return (Exception) BeanUtils.instantiateClass(exceptionConstructor, args); + return BeanUtils.instantiateClass(exceptionConstructor, args); } @@ -363,9 +364,8 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto } } - @SuppressWarnings("unchecked") private Object invokeServiceLocatorMethod(Method method, Object[] args) throws Exception { - Class serviceLocatorMethodReturnType = getServiceLocatorMethodReturnType(method); + Class serviceLocatorMethodReturnType = getServiceLocatorMethodReturnType(method); try { String beanName = tryGetBeanName(args); if (StringUtils.hasLength(beanName)) { @@ -403,10 +403,10 @@ public class ServiceLocatorFactoryBean implements FactoryBean, BeanFacto return beanName; } - private Class getServiceLocatorMethodReturnType(Method method) throws NoSuchMethodException { - Class[] paramTypes = method.getParameterTypes(); + private Class getServiceLocatorMethodReturnType(Method method) throws NoSuchMethodException { + Class[] paramTypes = method.getParameterTypes(); Method interfaceMethod = serviceLocatorInterface.getMethod(method.getName(), paramTypes); - Class serviceLocatorReturnType = interfaceMethod.getReturnType(); + Class serviceLocatorReturnType = interfaceMethod.getReturnType(); // Check whether the method is a valid service locator. if (paramTypes.length > 1 || void.class.equals(serviceLocatorReturnType)) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java index e3b2ee9e21..c6b573d3db 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SetFactoryBean.java @@ -32,17 +32,18 @@ import org.springframework.core.GenericCollectionTypeResolver; * @see ListFactoryBean * @see MapFactoryBean */ -public class SetFactoryBean extends AbstractFactoryBean { +public class SetFactoryBean extends AbstractFactoryBean> { - private Set sourceSet; + private Set sourceSet; - private Class targetSetClass; + @SuppressWarnings("rawtypes") + private Class targetSetClass; /** * Set the source Set, typically populated via XML "set" elements. */ - public void setSourceSet(Set sourceSet) { + public void setSourceSet(Set sourceSet) { this.sourceSet = sourceSet; } @@ -52,7 +53,8 @@ public class SetFactoryBean extends AbstractFactoryBean { *

Default is a linked HashSet, keeping the registration order. * @see java.util.LinkedHashSet */ - public void setTargetSetClass(Class targetSetClass) { + @SuppressWarnings("rawtypes") + public void setTargetSetClass(Class targetSetClass) { if (targetSetClass == null) { throw new IllegalArgumentException("'targetSetClass' must not be null"); } @@ -64,24 +66,25 @@ public class SetFactoryBean extends AbstractFactoryBean { @Override + @SuppressWarnings("rawtypes") public Class getObjectType() { return Set.class; } @Override @SuppressWarnings("unchecked") - protected Set createInstance() { + protected Set createInstance() { if (this.sourceSet == null) { throw new IllegalArgumentException("'sourceSet' is required"); } - Set result = null; + Set result = null; if (this.targetSetClass != null) { - result = (Set) BeanUtils.instantiateClass(this.targetSetClass); + result = BeanUtils.instantiateClass(this.targetSetClass); } else { - result = new LinkedHashSet(this.sourceSet.size()); + result = new LinkedHashSet(this.sourceSet.size()); } - Class valueType = null; + Class valueType = null; if (this.targetSetClass != null) { valueType = GenericCollectionTypeResolver.getCollectionType(this.targetSetClass); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java index bf107e6b1f..0a6f73e350 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java @@ -114,7 +114,7 @@ public class TypedStringValue implements BeanMetadataElement { if (!(targetTypeValue instanceof Class)) { throw new IllegalStateException("Typed String value does not carry a resolved target type"); } - return (Class) targetTypeValue; + return (Class) targetTypeValue; } /** @@ -131,7 +131,7 @@ public class TypedStringValue implements BeanMetadataElement { public String getTargetTypeName() { Object targetTypeValue = this.targetType; if (targetTypeValue instanceof Class) { - return ((Class) targetTypeValue).getName(); + return ((Class) targetTypeValue).getName(); } else { return (String) targetTypeValue; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java index 3c4b68e339..43b0c29332 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java @@ -40,22 +40,23 @@ public final class ParseState { /** * Internal {@link Stack} storage. */ - private final Stack state; + private final Stack state; /** * Create a new {@code ParseState} with an empty {@link Stack}. */ public ParseState() { - this.state = new Stack(); + this.state = new Stack(); } /** * Create a new {@code ParseState} whose {@link Stack} is a {@link Object#clone clone} * of that of the passed in {@code ParseState}. */ + @SuppressWarnings("unchecked") private ParseState(ParseState other) { - this.state = (Stack) other.state.clone(); + this.state = (Stack) other.state.clone(); } @@ -78,7 +79,7 @@ public final class ParseState { * {@code null} if the {@link Stack} is empty. */ public Entry peek() { - return (Entry) (this.state.empty() ? null : this.state.peek()); + return this.state.empty() ? null : this.state.peek(); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java index 27e72ce9e0..a7e03dd429 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/AbstractServiceLoaderBasedFactoryBean.java @@ -31,10 +31,10 @@ import org.springframework.util.ClassUtils; * @since 2.5 * @see java.util.ServiceLoader */ -public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFactoryBean +public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFactoryBean implements BeanClassLoaderAware { - private Class serviceType; + private Class serviceType; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -42,14 +42,14 @@ public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFact /** * Specify the desired service type (typically the service's public API). */ - public void setServiceType(Class serviceType) { + public void setServiceType(Class serviceType) { this.serviceType = serviceType; } /** * Return the desired service type. */ - public Class getServiceType() { + public Class getServiceType() { return this.serviceType; } @@ -75,6 +75,6 @@ public abstract class AbstractServiceLoaderBasedFactoryBean extends AbstractFact * @param serviceLoader the ServiceLoader for the configured service class * @return the object to expose */ - protected abstract Object getObjectToExpose(ServiceLoader serviceLoader); + protected abstract Object getObjectToExpose(ServiceLoader serviceLoader); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java index 5abbda9f2b..c337ba19b4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceFactoryBean.java @@ -33,8 +33,8 @@ import org.springframework.beans.factory.BeanClassLoaderAware; public class ServiceFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { @Override - protected Object getObjectToExpose(ServiceLoader serviceLoader) { - Iterator it = serviceLoader.iterator(); + protected Object getObjectToExpose(ServiceLoader serviceLoader) { + Iterator it = serviceLoader.iterator(); if (!it.hasNext()) { throw new IllegalStateException( "ServiceLoader could not find service for type [" + getServiceType() + "]"); @@ -43,7 +43,7 @@ public class ServiceFactoryBean extends AbstractServiceLoaderBasedFactoryBean im } @Override - public Class getObjectType() { + public Class getObjectType() { return getServiceType(); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java index b23cd70ee0..01f46e0d31 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceListFactoryBean.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware; public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { @Override - protected Object getObjectToExpose(ServiceLoader serviceLoader) { + protected Object getObjectToExpose(ServiceLoader serviceLoader) { List result = new LinkedList(); for (Object loaderObject : serviceLoader) { result.add(loaderObject); @@ -43,7 +43,7 @@ public class ServiceListFactoryBean extends AbstractServiceLoaderBasedFactoryBea } @Override - public Class getObjectType() { + public Class getObjectType() { return List.class; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java index 34f3a1cf21..21adf5617c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/ServiceLoaderFactoryBean.java @@ -31,12 +31,12 @@ import org.springframework.beans.factory.BeanClassLoaderAware; public class ServiceLoaderFactoryBean extends AbstractServiceLoaderBasedFactoryBean implements BeanClassLoaderAware { @Override - protected Object getObjectToExpose(ServiceLoader serviceLoader) { + protected Object getObjectToExpose(ServiceLoader serviceLoader) { return serviceLoader; } @Override - public Class getObjectType() { + public Class getObjectType() { return ServiceLoader.class; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 4e7c65c36e..12004a5d0e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -135,21 +135,21 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * Dependency types to ignore on dependency check and autowire, as Set of * Class objects: for example, String. Default is none. */ - private final Set ignoredDependencyTypes = new HashSet(); + private final Set> ignoredDependencyTypes = new HashSet>(); /** * Dependency interfaces to ignore on dependency check and autowire, as Set of * Class objects. By default, only the BeanFactory interface is ignored. */ - private final Set ignoredDependencyInterfaces = new HashSet(); + private final Set> ignoredDependencyInterfaces = new HashSet>(); /** Cache of unfinished FactoryBean instances: FactoryBean name --> BeanWrapper */ private final Map factoryBeanInstanceCache = new ConcurrentHashMap(16); /** Cache of filtered PropertyDescriptors: bean Class -> PropertyDescriptor array */ - private final Map filteredPropertyDescriptorsCache = - new ConcurrentHashMap(64); + private final Map, PropertyDescriptor[]> filteredPropertyDescriptorsCache = + new ConcurrentHashMap, PropertyDescriptor[]>(64); /** @@ -523,7 +523,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac logger.debug("Eagerly caching bean '" + beanName + "' to allow for resolving potential circular references"); } - addSingletonFactory(beanName, new ObjectFactory() { + addSingletonFactory(beanName, new ObjectFactory() { @Override public Object getObject() throws BeansException { return getEarlyBeanReference(beanName, mbd, bean); @@ -821,11 +821,12 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @return the FactoryBean instance, or {@code null} to indicate * that we couldn't obtain a shortcut FactoryBean instance */ - private FactoryBean getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) { + @SuppressWarnings("unchecked") + private FactoryBean getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) { synchronized (getSingletonMutex()) { BeanWrapper bw = this.factoryBeanInstanceCache.get(beanName); if (bw != null) { - return (FactoryBean) bw.getWrappedInstance(); + return (FactoryBean) bw.getWrappedInstance(); } if (isSingletonCurrentlyInCreation(beanName)) { return null; @@ -845,7 +846,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac // Finished partial creation of this bean. afterSingletonCreation(beanName); } - FactoryBean fb = getFactoryBean(beanName, instance); + FactoryBean fb = getFactoryBean(beanName, instance); if (bw != null) { this.factoryBeanInstanceCache.put(beanName, bw); } @@ -862,7 +863,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @return the FactoryBean instance, or {@code null} to indicate * that we couldn't obtain a shortcut FactoryBean instance */ - private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) { + private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) { if (isPrototypeCurrentlyInCreation(beanName)) { return null; } @@ -1005,7 +1006,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac } // Need to determine the constructor... - Constructor[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName); + Constructor[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName); if (ctors != null || mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR || mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args)) { @@ -1025,14 +1026,14 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @throws org.springframework.beans.BeansException in case of errors * @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors */ - protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName) + protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName) throws BeansException { if (beanClass != null && hasInstantiationAwareBeanPostProcessors()) { for (BeanPostProcessor bp : getBeanPostProcessors()) { if (bp instanceof SmartInstantiationAwareBeanPostProcessor) { SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp; - Constructor[] ctors = ibp.determineCandidateConstructors(beanClass, beanName); + Constructor[] ctors = ibp.determineCandidateConstructors(beanClass, beanName); if (ctors != null) { return ctors; } @@ -1104,7 +1105,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @return BeanWrapper for the new instance */ protected BeanWrapper autowireConstructor( - String beanName, RootBeanDefinition mbd, Constructor[] ctors, Object[] explicitArgs) { + String beanName, RootBeanDefinition mbd, Constructor[] ctors, Object[] explicitArgs) { return new ConstructorResolver(this).autowireConstructor(beanName, mbd, ctors, explicitArgs); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 2ed4d28570..a03c452884 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -357,7 +357,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess throw new IllegalStateException( "Bean class name [" + beanClassObject + "] has not been resolved into an actual Class"); } - return (Class) beanClassObject; + return (Class) beanClassObject; } @Override @@ -369,7 +369,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess public String getBeanClassName() { Object beanClassObject = this.beanClass; if (beanClassObject instanceof Class) { - return ((Class) beanClassObject).getName(); + return ((Class) beanClassObject).getName(); } else { return (String) beanClassObject; @@ -384,12 +384,12 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess * @return the resolved bean class * @throws ClassNotFoundException if the class name could be resolved */ - public Class resolveBeanClass(ClassLoader classLoader) throws ClassNotFoundException { + public Class resolveBeanClass(ClassLoader classLoader) throws ClassNotFoundException { String className = getBeanClassName(); if (className == null) { return null; } - Class resolvedClass = ClassUtils.forName(className, classLoader); + Class resolvedClass = ClassUtils.forName(className, classLoader); this.beanClass = resolvedClass; return resolvedClass; } @@ -512,8 +512,8 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess // Work out whether to apply setter autowiring or constructor autowiring. // If it has a no-arg constructor it's deemed to be setter autowiring, // otherwise we'll try constructor autowiring. - Constructor[] constructors = getBeanClass().getConstructors(); - for (Constructor constructor : constructors) { + Constructor[] constructors = getBeanClass().getConstructors(); + for (Constructor constructor : constructors) { if (constructor.getParameterTypes().length == 0) { return AUTOWIRE_BY_TYPE; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index f12f83774c..6eb7e7b82e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -513,8 +513,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp // Retrieve corresponding bean definition. RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName); - Class[] typesToMatch = (FactoryBean.class.equals(typeToMatch) ? - new Class[] {typeToMatch} : new Class[] {FactoryBean.class, typeToMatch}); + Class[] typesToMatch = (FactoryBean.class.equals(typeToMatch) ? + new Class[] {typeToMatch} : new Class[] {FactoryBean.class, typeToMatch}); // Check decorated bean definition, if any: We assume it'll be easier // to determine the decorated bean's type than the proxy's type. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java index 6846390e1b..f5991ac930 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java @@ -42,7 +42,7 @@ public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor { * given type. * @param type the annotation type */ - public AutowireCandidateQualifier(Class type) { + public AutowireCandidateQualifier(Class type) { this(type.getName()); } @@ -65,7 +65,7 @@ public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor { * @param type the annotation type * @param value the annotation value to match */ - public AutowireCandidateQualifier(Class type, Object value) { + public AutowireCandidateQualifier(Class type, Object value) { this(type.getName(), value); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java index a9e574629f..5111599f08 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java @@ -56,10 +56,10 @@ abstract class AutowireUtils { * decreasing number of arguments. * @param constructors the constructor array to sort */ - public static void sortConstructors(Constructor[] constructors) { - Arrays.sort(constructors, new Comparator() { + public static void sortConstructors(Constructor[] constructors) { + Arrays.sort(constructors, new Comparator>() { @Override - public int compare(Constructor c1, Constructor c2) { + public int compare(Constructor c1, Constructor c2) { boolean p1 = Modifier.isPublic(c1.getModifiers()); boolean p2 = Modifier.isPublic(c2.getModifiers()); if (p1 != p2) { @@ -112,7 +112,7 @@ abstract class AutowireUtils { } // It was declared by CGLIB, but we might still want to autowire it // if it was actually declared by the superclass. - Class superclass = wm.getDeclaringClass().getSuperclass(); + Class superclass = wm.getDeclaringClass().getSuperclass(); return !ClassUtils.hasMethod(superclass, wm.getName(), wm.getParameterTypes()); } @@ -123,7 +123,7 @@ abstract class AutowireUtils { * @param interfaces the Set of interfaces (Class objects) * @return whether the setter method is defined by an interface */ - public static boolean isSetterDefinedInInterface(PropertyDescriptor pd, Set interfaces) { + public static boolean isSetterDefinedInInterface(PropertyDescriptor pd, Set> interfaces) { Method setter = pd.getWriteMethod(); if (setter != null) { Class targetClass = setter.getDeclaringClass(); @@ -146,10 +146,10 @@ abstract class AutowireUtils { */ public static Object resolveAutowiringValue(Object autowiringValue, Class requiredType) { if (autowiringValue instanceof ObjectFactory && !requiredType.isInstance(autowiringValue)) { - ObjectFactory factory = (ObjectFactory) autowiringValue; + ObjectFactory factory = (ObjectFactory) autowiringValue; if (autowiringValue instanceof Serializable && requiredType.isInterface()) { autowiringValue = Proxy.newProxyInstance(requiredType.getClassLoader(), - new Class[] {requiredType}, new ObjectFactoryDelegatingInvocationHandler(factory)); + new Class[] {requiredType}, new ObjectFactoryDelegatingInvocationHandler(factory)); } else { return factory.getObject(); @@ -283,9 +283,9 @@ abstract class AutowireUtils { @SuppressWarnings("serial") private static class ObjectFactoryDelegatingInvocationHandler implements InvocationHandler, Serializable { - private final ObjectFactory objectFactory; + private final ObjectFactory objectFactory; - public ObjectFactoryDelegatingInvocationHandler(ObjectFactory objectFactory) { + public ObjectFactoryDelegatingInvocationHandler(ObjectFactory objectFactory) { this.objectFactory = objectFactory; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java index 23678580c0..f70e163ce4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java @@ -45,7 +45,7 @@ public class BeanDefinitionBuilder { * Create a new {@code BeanDefinitionBuilder} used to construct a {@link GenericBeanDefinition}. * @param beanClass the {@code Class} of the bean that the definition is being created for */ - public static BeanDefinitionBuilder genericBeanDefinition(Class beanClass) { + public static BeanDefinitionBuilder genericBeanDefinition(Class beanClass) { BeanDefinitionBuilder builder = new BeanDefinitionBuilder(); builder.beanDefinition = new GenericBeanDefinition(); builder.beanDefinition.setBeanClass(beanClass); @@ -67,7 +67,7 @@ public class BeanDefinitionBuilder { * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}. * @param beanClass the {@code Class} of the bean that the definition is being created for */ - public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass) { + public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass) { return rootBeanDefinition(beanClass, null); } @@ -76,7 +76,7 @@ public class BeanDefinitionBuilder { * @param beanClass the {@code Class} of the bean that the definition is being created for * @param factoryMethodName the name of the method to use to construct the bean instance */ - public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass, String factoryMethodName) { + public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass, String factoryMethodName) { BeanDefinitionBuilder builder = new BeanDefinitionBuilder(); builder.beanDefinition = new RootBeanDefinition(); builder.beanDefinition.setBeanClass(beanClass); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java index 9640067784..493633cfc4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java @@ -164,7 +164,7 @@ class BeanDefinitionValueResolver { else if (value instanceof ManagedProperties) { Properties original = (Properties) value; Properties copy = new Properties(); - for (Map.Entry propEntry : original.entrySet()) { + for (Map.Entry propEntry : original.entrySet()) { Object propKey = propEntry.getKey(); Object propValue = propEntry.getValue(); if (propKey instanceof TypedStringValue) { @@ -272,7 +272,7 @@ class BeanDefinitionValueResolver { this.beanFactory.registerContainedBean(actualInnerBeanName, this.beanName); if (innerBean instanceof FactoryBean) { boolean synthetic = mbd.isSynthetic(); - return this.beanFactory.getObjectFromFactoryBean((FactoryBean) innerBean, actualInnerBeanName, !synthetic); + return this.beanFactory.getObjectFromFactoryBean((FactoryBean) innerBean, actualInnerBeanName, !synthetic); } else { return innerBean; @@ -347,7 +347,7 @@ class BeanDefinitionValueResolver { /** * For each element in the managed list, resolve reference if necessary. */ - private List resolveManagedList(Object argName, List ml) { + private List resolveManagedList(Object argName, List ml) { List resolved = new ArrayList(ml.size()); for (int i = 0; i < ml.size(); i++) { resolved.add( @@ -359,7 +359,7 @@ class BeanDefinitionValueResolver { /** * For each element in the managed set, resolve reference if necessary. */ - private Set resolveManagedSet(Object argName, Set ms) { + private Set resolveManagedSet(Object argName, Set ms) { Set resolved = new LinkedHashSet(ms.size()); int i = 0; for (Object m : ms) { @@ -372,9 +372,9 @@ class BeanDefinitionValueResolver { /** * For each element in the managed map, resolve reference if necessary. */ - private Map resolveManagedMap(Object argName, Map mm) { + private Map resolveManagedMap(Object argName, Map mm) { Map resolved = new LinkedHashMap(mm.size()); - for (Map.Entry entry : mm.entrySet()) { + for (Map.Entry entry : mm.entrySet()) { Object resolvedKey = resolveValueIfNecessary(argName, entry.getKey()); Object resolvedValue = resolveValueIfNecessary( new KeyedArgName(argName, entry.getKey()), entry.getValue()); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java index 8c802f09d2..a70d634807 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java @@ -72,7 +72,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt @Override protected Object instantiateWithMethodInjection( RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, - Constructor ctor, Object[] args) { + Constructor ctor, Object[] args) { return new CglibSubclassCreator(beanDefinition, owner).instantiate(ctor, args); } @@ -104,7 +104,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt * Ignored if the ctor parameter is {@code null}. * @return new instance of the dynamically generated class */ - public Object instantiate(Constructor ctor, Object[] args) { + public Object instantiate(Constructor ctor, Object[] args) { Enhancer enhancer = new Enhancer(); enhancer.setSuperclass(this.beanDefinition.getBeanClass()); enhancer.setCallbackFilter(new CallbackFilterImpl()); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java index 5c0e446c0b..617c4fd94a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java @@ -103,12 +103,12 @@ class ConstructorResolver { * @return a BeanWrapper for the new instance */ public BeanWrapper autowireConstructor( - final String beanName, final RootBeanDefinition mbd, Constructor[] chosenCtors, final Object[] explicitArgs) { + final String beanName, final RootBeanDefinition mbd, Constructor[] chosenCtors, final Object[] explicitArgs) { BeanWrapperImpl bw = new BeanWrapperImpl(); this.beanFactory.initBeanWrapper(bw); - Constructor constructorToUse = null; + Constructor constructorToUse = null; ArgumentsHolder argsHolderToUse = null; Object[] argsToUse = null; @@ -118,7 +118,7 @@ class ConstructorResolver { else { Object[] argsToResolve = null; synchronized (mbd.constructorArgumentLock) { - constructorToUse = (Constructor) mbd.resolvedConstructorOrFactoryMethod; + constructorToUse = (Constructor) mbd.resolvedConstructorOrFactoryMethod; if (constructorToUse != null && mbd.constructorArgumentsResolved) { // Found a cached constructor... argsToUse = mbd.resolvedConstructorArguments; @@ -149,7 +149,7 @@ class ConstructorResolver { } // Take specified constructors, if any. - Constructor[] candidates = chosenCtors; + Constructor[] candidates = chosenCtors; if (candidates == null) { Class beanClass = mbd.getBeanClass(); try { @@ -164,7 +164,7 @@ class ConstructorResolver { } AutowireUtils.sortConstructors(candidates); int minTypeDiffWeight = Integer.MAX_VALUE; - Set ambiguousConstructors = null; + Set> ambiguousConstructors = null; List causes = null; for (int i = 0; i < candidates.length; i++) { @@ -239,7 +239,7 @@ class ConstructorResolver { } else if (constructorToUse != null && typeDiffWeight == minTypeDiffWeight) { if (ambiguousConstructors == null) { - ambiguousConstructors = new LinkedHashSet(); + ambiguousConstructors = new LinkedHashSet>(); ambiguousConstructors.add(constructorToUse); } ambiguousConstructors.add(candidate); @@ -267,7 +267,7 @@ class ConstructorResolver { Object beanInstance; if (System.getSecurityManager() != null) { - final Constructor ctorToUse = constructorToUse; + final Constructor ctorToUse = constructorToUse; final Object[] argumentsToUse = argsToUse; beanInstance = AccessController.doPrivileged(new PrivilegedAction() { @Override @@ -296,7 +296,7 @@ class ConstructorResolver { * @param mbd the bean definition to check */ public void resolveFactoryMethodIfPossible(RootBeanDefinition mbd) { - Class factoryClass; + Class factoryClass; if (mbd.getFactoryBeanName() != null) { factoryClass = this.beanFactory.getType(mbd.getFactoryBeanName()); } @@ -762,7 +762,7 @@ class ConstructorResolver { String beanName, RootBeanDefinition mbd, BeanWrapper bw, Member methodOrCtor, Object[] argsToResolve) { Class[] paramTypes = (methodOrCtor instanceof Method ? - ((Method) methodOrCtor).getParameterTypes() : ((Constructor) methodOrCtor).getParameterTypes()); + ((Method) methodOrCtor).getParameterTypes() : ((Constructor) methodOrCtor).getParameterTypes()); TypeConverter converter = (this.beanFactory.getCustomTypeConverter() != null ? this.beanFactory.getCustomTypeConverter() : bw); BeanDefinitionValueResolver valueResolver = diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index bffe7d1991..d35f65532c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -128,7 +128,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto private boolean allowEagerClassLoading = true; /** Optional OrderComparator for dependency Lists and arrays */ - private Comparator dependencyComparator; + private Comparator dependencyComparator; /** Resolver to use for checking if a bean definition is an autowire candidate */ private AutowireCandidateResolver autowireCandidateResolver = new SimpleAutowireCandidateResolver(); @@ -215,14 +215,14 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto * @see org.springframework.core.OrderComparator * @see org.springframework.core.annotation.AnnotationAwareOrderComparator */ - public void setDependencyComparator(Comparator dependencyComparator) { + public void setDependencyComparator(Comparator dependencyComparator) { this.dependencyComparator = dependencyComparator; } /** * Return the dependency comparator for this BeanFactory (may be {@code null}. */ - public Comparator getDependencyComparator() { + public Comparator getDependencyComparator() { return this.dependencyComparator; } @@ -898,7 +898,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter()); Object result = converter.convertIfNecessary(matchingBeans.values(), type); if (this.dependencyComparator != null && result instanceof List) { - Collections.sort((List) result, this.dependencyComparator); + Collections.sort((List) result, this.dependencyComparator); } return result; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java index cb84792cb2..eedeff37ff 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java @@ -85,7 +85,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements private final Map singletonObjects = new ConcurrentHashMap(64); /** Cache of singleton factories: bean name --> ObjectFactory */ - private final Map singletonFactories = new HashMap(16); + private final Map> singletonFactories = new HashMap>(16); /** Cache of early singleton objects: bean name --> bean instance */ private final Map earlySingletonObjects = new HashMap(16); @@ -156,7 +156,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements * @param beanName the name of the bean * @param singletonFactory the factory for the singleton object */ - protected void addSingletonFactory(String beanName, ObjectFactory singletonFactory) { + protected void addSingletonFactory(String beanName, ObjectFactory singletonFactory) { Assert.notNull(singletonFactory, "Singleton factory must not be null"); synchronized (this.singletonObjects) { if (!this.singletonObjects.containsKey(beanName)) { @@ -186,7 +186,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements synchronized (this.singletonObjects) { singletonObject = this.earlySingletonObjects.get(beanName); if (singletonObject == null && allowEarlyReference) { - ObjectFactory singletonFactory = this.singletonFactories.get(beanName); + ObjectFactory singletonFactory = this.singletonFactories.get(beanName); if (singletonFactory != null) { singletonObject = singletonFactory.getObject(); this.earlySingletonObjects.put(beanName, singletonObject); @@ -206,7 +206,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements * with, if necessary * @return the registered singleton object */ - public Object getSingleton(String beanName, ObjectFactory singletonFactory) { + public Object getSingleton(String beanName, ObjectFactory singletonFactory) { Assert.notNull(beanName, "'beanName' must not be null"); synchronized (this.singletonObjects) { Object singletonObject = this.singletonObjects.get(beanName); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java index 65b5bfc351..9b85f73ae9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java @@ -65,7 +65,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable { private static final Log logger = LogFactory.getLog(DisposableBeanAdapter.class); - private static Class closeableInterface; + private static Class closeableInterface; static { try { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java index 286765a80d..92361bdaca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java @@ -52,12 +52,12 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg * @return the FactoryBean's object type, * or {@code null} if the type cannot be determined yet */ - protected Class getTypeForFactoryBean(final FactoryBean factoryBean) { + protected Class getTypeForFactoryBean(final FactoryBean factoryBean) { try { if (System.getSecurityManager() != null) { - return AccessController.doPrivileged(new PrivilegedAction() { + return AccessController.doPrivileged(new PrivilegedAction>() { @Override - public Class run() { + public Class run() { return factoryBean.getObjectType(); } }, getAccessControlContext()); @@ -95,7 +95,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg * @throws BeanCreationException if FactoryBean object creation failed * @see org.springframework.beans.factory.FactoryBean#getObject() */ - protected Object getObjectFromFactoryBean(FactoryBean factory, String beanName, boolean shouldPostProcess) { + protected Object getObjectFromFactoryBean(FactoryBean factory, String beanName, boolean shouldPostProcess) { if (factory.isSingleton() && containsSingleton(beanName)) { synchronized (getSingletonMutex()) { Object object = this.factoryBeanObjectCache.get(beanName); @@ -121,7 +121,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg * @see org.springframework.beans.factory.FactoryBean#getObject() */ private Object doGetObjectFromFactoryBean( - final FactoryBean factory, final String beanName, final boolean shouldPostProcess) + final FactoryBean factory, final String beanName, final boolean shouldPostProcess) throws BeanCreationException { Object object; @@ -192,12 +192,13 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg * @return the bean instance as FactoryBean * @throws BeansException if the given bean cannot be exposed as a FactoryBean */ - protected FactoryBean getFactoryBean(String beanName, Object beanInstance) throws BeansException { + @SuppressWarnings("unchecked") + protected FactoryBean getFactoryBean(String beanName, Object beanInstance) throws BeansException { if (!(beanInstance instanceof FactoryBean)) { throw new BeanCreationException(beanName, "Bean instance of type [" + beanInstance.getClass() + "] is not a FactoryBean"); } - return (FactoryBean) beanInstance; + return (FactoryBean) beanInstance; } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java index e7e7ec7dca..e47d5dbeb3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; public class ManagedArray extends ManagedList { /** Resolved element type for runtime creation of the target array */ - volatile Class resolvedElementType; + volatile Class resolvedElementType; /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java index d01b649bca..2a25830eb4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java @@ -102,7 +102,7 @@ public class ManagedList extends ArrayList implements Mergeable, BeanMetad throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]"); } List merged = new ManagedList(); - merged.addAll((List) parent); + merged.addAll((List) parent); merged.addAll(this); return merged; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java index 4646766596..3cc4b98648 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java @@ -117,7 +117,7 @@ public class ManagedMap extends LinkedHashMap implements Mergeable, throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]"); } Map merged = new ManagedMap(); - merged.putAll((Map) parent); + merged.putAll((Map) parent); merged.putAll(this); return merged; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java index 570963c17a..dc6f0e0c1a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java @@ -101,7 +101,7 @@ public class ManagedSet extends LinkedHashSet implements Mergeable, BeanMe throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]"); } Set merged = new ManagedSet(); - merged.addAll((Set) parent); + merged.addAll((Set) parent); merged.addAll(this); return merged; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java index bbdc65d437..454b2c35b5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java @@ -290,9 +290,9 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader public int registerBeanDefinitions(ResourceBundle rb, String prefix) throws BeanDefinitionStoreException { // Simply create a map and call overloaded method. Map map = new HashMap(); - Enumeration keys = rb.getKeys(); + Enumeration keys = rb.getKeys(); while (keys.hasMoreElements()) { - String key = (String) keys.nextElement(); + String key = keys.nextElement(); map.put(key, rb.getObject(key)); } return registerBeanDefinitions(map, prefix); @@ -309,7 +309,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader * @throws BeansException in case of loading or parsing errors * @see #registerBeanDefinitions(java.util.Map, String, String) */ - public int registerBeanDefinitions(Map map) throws BeansException { + public int registerBeanDefinitions(Map map) throws BeansException { return registerBeanDefinitions(map, null); } @@ -324,7 +324,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader * @return the number of bean definitions found * @throws BeansException in case of loading or parsing errors */ - public int registerBeanDefinitions(Map map, String prefix) throws BeansException { + public int registerBeanDefinitions(Map map, String prefix) throws BeansException { return registerBeanDefinitions(map, prefix, "Map " + map); } @@ -342,7 +342,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader * @throws BeansException in case of loading or parsing errors * @see #registerBeanDefinitions(Map, String) */ - public int registerBeanDefinitions(Map map, String prefix, String resourceDescription) + public int registerBeanDefinitions(Map map, String prefix, String resourceDescription) throws BeansException { if (prefix == null) { @@ -413,7 +413,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader ConstructorArgumentValues cas = new ConstructorArgumentValues(); MutablePropertyValues pvs = new MutablePropertyValues(); - for (Map.Entry entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { String key = StringUtils.trimWhitespace((String) entry.getKey()); if (key.startsWith(prefix + SEPARATOR)) { String property = key.substring(prefix.length() + SEPARATOR.length()); @@ -502,7 +502,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader * Reads the value of the entry. Correctly interprets bean references for * values that are prefixed with an asterisk. */ - private Object readValue(Map.Entry entry) { + private Object readValue(Map.Entry entry) { Object val = entry.getValue(); if (val instanceof String) { String strVal = (String) val; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java index 4dd5a1a1ca..26ef21270a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java @@ -63,15 +63,15 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { synchronized (beanDefinition.constructorArgumentLock) { constructorToUse = (Constructor) beanDefinition.resolvedConstructorOrFactoryMethod; if (constructorToUse == null) { - final Class clazz = beanDefinition.getBeanClass(); + final Class clazz = beanDefinition.getBeanClass(); if (clazz.isInterface()) { throw new BeanInstantiationException(clazz, "Specified class is an interface"); } try { if (System.getSecurityManager() != null) { - constructorToUse = AccessController.doPrivileged(new PrivilegedExceptionAction() { + constructorToUse = AccessController.doPrivileged(new PrivilegedExceptionAction>() { @Override - public Constructor run() throws Exception { + public Constructor run() throws Exception { return clazz.getDeclaredConstructor((Class[]) null); } }); @@ -136,7 +136,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { * Instantiation should use the given constructor and parameters. */ protected Object instantiateWithMethodInjection(RootBeanDefinition beanDefinition, - String beanName, BeanFactory owner, Constructor ctor, Object[] args) { + String beanName, BeanFactory owner, Constructor ctor, Object[] args) { throw new UnsupportedOperationException( "Method Injection not supported in SimpleInstantiationStrategy"); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java index 6901a5e21c..5ba6f39399 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java @@ -94,7 +94,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory { if (bean instanceof FactoryBean && !BeanFactoryUtils.isFactoryDereference(name)) { try { - return ((FactoryBean) bean).getObject(); + return ((FactoryBean) bean).getObject(); } catch (Exception ex) { throw new BeanCreationException(beanName, "FactoryBean threw exception on object creation", ex); @@ -147,20 +147,20 @@ public class StaticListableBeanFactory implements ListableBeanFactory { public boolean isSingleton(String name) throws NoSuchBeanDefinitionException { Object bean = getBean(name); // In case of FactoryBean, return singleton status of created object. - return (bean instanceof FactoryBean && ((FactoryBean) bean).isSingleton()); + return (bean instanceof FactoryBean && ((FactoryBean) bean).isSingleton()); } @Override public boolean isPrototype(String name) throws NoSuchBeanDefinitionException { Object bean = getBean(name); // In case of FactoryBean, return prototype status of created object. - return ((bean instanceof SmartFactoryBean && ((SmartFactoryBean) bean).isPrototype()) || - (bean instanceof FactoryBean && !((FactoryBean) bean).isSingleton())); + return ((bean instanceof SmartFactoryBean && ((SmartFactoryBean) bean).isPrototype()) || + (bean instanceof FactoryBean && !((FactoryBean) bean).isSingleton())); } @Override - public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException { - Class type = getType(name); + public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException { + Class type = getType(name); return (targetType == null || (type != null && targetType.isAssignableFrom(type))); } @@ -176,7 +176,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory { if (bean instanceof FactoryBean && !BeanFactoryUtils.isFactoryDereference(name)) { // If it's a FactoryBean, we want to look at what it creates, not the factory class. - return ((FactoryBean) bean).getObjectType(); + return ((FactoryBean) bean).getObjectType(); } return bean.getClass(); } @@ -207,19 +207,19 @@ public class StaticListableBeanFactory implements ListableBeanFactory { } @Override - public String[] getBeanNamesForType(Class type) { + public String[] getBeanNamesForType(Class type) { return getBeanNamesForType(type, true, true); } @Override - public String[] getBeanNamesForType(Class type, boolean includeNonSingletons, boolean includeFactoryBeans) { + public String[] getBeanNamesForType(Class type, boolean includeNonSingletons, boolean includeFactoryBeans) { boolean isFactoryType = (type != null && FactoryBean.class.isAssignableFrom(type)); List matches = new ArrayList(); for (String name : this.beans.keySet()) { Object beanInstance = this.beans.get(name); if (beanInstance instanceof FactoryBean && !isFactoryType) { if (includeFactoryBeans) { - Class objectType = ((FactoryBean) beanInstance).getObjectType(); + Class objectType = ((FactoryBean) beanInstance).getObjectType(); if (objectType != null && (type == null || type.isAssignableFrom(objectType))) { matches.add(name); } @@ -254,8 +254,8 @@ public class StaticListableBeanFactory implements ListableBeanFactory { if (beanInstance instanceof FactoryBean && !isFactoryType) { if (includeFactoryBeans) { // Match object created by FactoryBean. - FactoryBean factory = (FactoryBean) beanInstance; - Class objectType = factory.getObjectType(); + FactoryBean factory = (FactoryBean) beanInstance; + Class objectType = factory.getObjectType(); if ((includeNonSingletons || factory.isSingleton()) && objectType != null && (type == null || type.isAssignableFrom(objectType))) { matches.put(beanName, getBean(beanName, type)); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index fda725a94a..16e10fb832 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -519,7 +519,7 @@ public class BeanDefinitionParserDelegate { foundName = beanName; } if (foundName == null) { - foundName = (String) CollectionUtils.findFirstMatch(this.usedNames, aliases); + foundName = CollectionUtils.findFirstMatch(this.usedNames, aliases); } if (foundName != null) { error("Bean name '" + foundName + "' is already used in this element", beanElement); @@ -1181,7 +1181,7 @@ public class BeanDefinitionParserDelegate { /** * Parse a list element. */ - public List parseListElement(Element collectionEle, BeanDefinition bd) { + public List parseListElement(Element collectionEle, BeanDefinition bd) { String defaultElementType = collectionEle.getAttribute(VALUE_TYPE_ATTRIBUTE); NodeList nl = collectionEle.getChildNodes(); ManagedList target = new ManagedList(nl.getLength()); @@ -1195,7 +1195,7 @@ public class BeanDefinitionParserDelegate { /** * Parse a set element. */ - public Set parseSetElement(Element collectionEle, BeanDefinition bd) { + public Set parseSetElement(Element collectionEle, BeanDefinition bd) { String defaultElementType = collectionEle.getAttribute(VALUE_TYPE_ATTRIBUTE); NodeList nl = collectionEle.getChildNodes(); ManagedSet target = new ManagedSet(nl.getLength()); @@ -1220,7 +1220,7 @@ public class BeanDefinitionParserDelegate { /** * Parse a map element. */ - public Map parseMapElement(Element mapEle, BeanDefinition bd) { + public Map parseMapElement(Element mapEle, BeanDefinition bd) { String defaultKeyType = mapEle.getAttribute(KEY_TYPE_ATTRIBUTE); String defaultValueType = mapEle.getAttribute(VALUE_TYPE_ATTRIBUTE); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java index b7e440d647..c9108541c5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java @@ -75,7 +75,7 @@ public class ResourceEntityResolver extends DelegatingEntityResolver { if (source == null && systemId != null) { String resourcePath = null; try { - String decodedSystemId = URLDecoder.decode(systemId); + String decodedSystemId = URLDecoder.decode(systemId, "UTF-8"); String givenUrl = new URL(decodedSystemId).toString(); String systemRootUrl = new File("").toURI().toURL().toString(); // Try relative to resource base if currently in system root. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java index 4d33f236ce..8eb5701794 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java @@ -59,7 +59,7 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class ConstantBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return FieldRetrievingFactoryBean.class; } @@ -77,7 +77,7 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class PropertyPathBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return PropertyPathFactoryBean.class; } @@ -114,14 +114,14 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class ListBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return ListFactoryBean.class; } @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String listClass = element.getAttribute("list-class"); - List parsedList = parserContext.getDelegate().parseListElement(element, builder.getRawBeanDefinition()); + List parsedList = parserContext.getDelegate().parseListElement(element, builder.getRawBeanDefinition()); builder.addPropertyValue("sourceList", parsedList); if (StringUtils.hasText(listClass)) { builder.addPropertyValue("targetListClass", listClass); @@ -137,14 +137,14 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class SetBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return SetFactoryBean.class; } @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String setClass = element.getAttribute("set-class"); - Set parsedSet = parserContext.getDelegate().parseSetElement(element, builder.getRawBeanDefinition()); + Set parsedSet = parserContext.getDelegate().parseSetElement(element, builder.getRawBeanDefinition()); builder.addPropertyValue("sourceSet", parsedSet); if (StringUtils.hasText(setClass)) { builder.addPropertyValue("targetSetClass", setClass); @@ -160,14 +160,14 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class MapBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return MapFactoryBean.class; } @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { String mapClass = element.getAttribute("map-class"); - Map parsedMap = parserContext.getDelegate().parseMapElement(element, builder.getRawBeanDefinition()); + Map parsedMap = parserContext.getDelegate().parseMapElement(element, builder.getRawBeanDefinition()); builder.addPropertyValue("sourceMap", parsedMap); if (StringUtils.hasText(mapClass)) { builder.addPropertyValue("targetMapClass", mapClass); @@ -183,7 +183,7 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport { private static class PropertiesBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return PropertiesFactoryBean.class; } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java index 68ab64d576..c63bb7c00d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java @@ -62,7 +62,7 @@ public class ClassArrayEditor extends PropertyEditorSupport { public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { String[] classNames = StringUtils.commaDelimitedListToStringArray(text); - Class[] classes = new Class[classNames.length]; + Class[] classes = new Class[classNames.length]; for (int i = 0; i < classNames.length; i++) { String className = classNames[i].trim(); classes[i] = ClassUtils.resolveClassName(className, this.classLoader); @@ -76,7 +76,7 @@ public class ClassArrayEditor extends PropertyEditorSupport { @Override public String getAsText() { - Class[] classes = (Class[]) getValue(); + Class[] classes = (Class[]) getValue(); if (ObjectUtils.isEmpty(classes)) { return ""; } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java index a6214171a5..51e630cd9b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java @@ -69,7 +69,7 @@ public class ClassEditor extends PropertyEditorSupport { @Override public String getAsText() { - Class clazz = (Class) getValue(); + Class clazz = (Class) getValue(); if (clazz != null) { return ClassUtils.getQualifiedName(clazz); } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java index cbf10da7a4..55fc75594a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java @@ -42,7 +42,8 @@ import java.util.TreeSet; */ public class CustomCollectionEditor extends PropertyEditorSupport { - private final Class collectionType; + @SuppressWarnings("rawtypes") + private final Class collectionType; private final boolean nullAsEmptyCollection; @@ -57,7 +58,8 @@ public class CustomCollectionEditor extends PropertyEditorSupport { * @see java.util.TreeSet * @see java.util.LinkedHashSet */ - public CustomCollectionEditor(Class collectionType) { + @SuppressWarnings("rawtypes") + public CustomCollectionEditor(Class collectionType) { this(collectionType, false); } @@ -79,7 +81,8 @@ public class CustomCollectionEditor extends PropertyEditorSupport { * @see java.util.TreeSet * @see java.util.LinkedHashSet */ - public CustomCollectionEditor(Class collectionType, boolean nullAsEmptyCollection) { + @SuppressWarnings("rawtypes") + public CustomCollectionEditor(Class collectionType, boolean nullAsEmptyCollection) { if (collectionType == null) { throw new IllegalArgumentException("Collection type is required"); } @@ -104,7 +107,6 @@ public class CustomCollectionEditor extends PropertyEditorSupport { * Convert the given value to a Collection of the target type. */ @Override - @SuppressWarnings("unchecked") public void setValue(Object value) { if (value == null && this.nullAsEmptyCollection) { super.setValue(createCollection(this.collectionType, 0)); @@ -115,8 +117,8 @@ public class CustomCollectionEditor extends PropertyEditorSupport { } else if (value instanceof Collection) { // Convert Collection elements. - Collection source = (Collection) value; - Collection target = createCollection(this.collectionType, source.size()); + Collection source = (Collection) value; + Collection target = createCollection(this.collectionType, source.size()); for (Object elem : source) { target.add(convertElement(elem)); } @@ -125,7 +127,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport { else if (value.getClass().isArray()) { // Convert array elements to Collection elements. int length = Array.getLength(value); - Collection target = createCollection(this.collectionType, length); + Collection target = createCollection(this.collectionType, length); for (int i = 0; i < length; i++) { target.add(convertElement(Array.get(value, i))); } @@ -133,7 +135,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport { } else { // A plain value: convert it to a Collection with a single element. - Collection target = createCollection(this.collectionType, 1); + Collection target = createCollection(this.collectionType, 1); target.add(convertElement(value)); super.setValue(target); } @@ -146,10 +148,11 @@ public class CustomCollectionEditor extends PropertyEditorSupport { * @param initialCapacity the initial capacity * @return the new Collection instance */ - protected Collection createCollection(Class collectionType, int initialCapacity) { + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected Collection createCollection(Class collectionType, int initialCapacity) { if (!collectionType.isInterface()) { try { - return (Collection) collectionType.newInstance(); + return collectionType.newInstance(); } catch (Exception ex) { throw new IllegalArgumentException( @@ -157,13 +160,13 @@ public class CustomCollectionEditor extends PropertyEditorSupport { } } else if (List.class.equals(collectionType)) { - return new ArrayList(initialCapacity); + return new ArrayList(initialCapacity); } else if (SortedSet.class.equals(collectionType)) { - return new TreeSet(); + return new TreeSet(); } else { - return new LinkedHashSet(initialCapacity); + return new LinkedHashSet(initialCapacity); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java index 14871687de..8218302680 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java @@ -33,7 +33,8 @@ import java.util.TreeMap; */ public class CustomMapEditor extends PropertyEditorSupport { - private final Class mapType; + @SuppressWarnings("rawtypes") + private final Class mapType; private final boolean nullAsEmptyMap; @@ -48,7 +49,8 @@ public class CustomMapEditor extends PropertyEditorSupport { * @see java.util.TreeMap * @see java.util.LinkedHashMap */ - public CustomMapEditor(Class mapType) { + @SuppressWarnings("rawtypes") + public CustomMapEditor(Class mapType) { this(mapType, false); } @@ -69,7 +71,8 @@ public class CustomMapEditor extends PropertyEditorSupport { * @see java.util.TreeMap * @see java.util.LinkedHashMap */ - public CustomMapEditor(Class mapType, boolean nullAsEmptyMap) { + @SuppressWarnings("rawtypes") + public CustomMapEditor(Class mapType, boolean nullAsEmptyMap) { if (mapType == null) { throw new IllegalArgumentException("Map type is required"); } @@ -104,9 +107,9 @@ public class CustomMapEditor extends PropertyEditorSupport { } else if (value instanceof Map) { // Convert Map elements. - Map source = (Map) value; - Map target = createMap(this.mapType, source.size()); - for (Map.Entry entry : source.entrySet()) { + Map source = (Map) value; + Map target = createMap(this.mapType, source.size()); + for (Map.Entry entry : source.entrySet()) { target.put(convertKey(entry.getKey()), convertValue(entry.getValue())); } super.setValue(target); @@ -123,10 +126,11 @@ public class CustomMapEditor extends PropertyEditorSupport { * @param initialCapacity the initial capacity * @return the new Map instance */ - protected Map createMap(Class mapType, int initialCapacity) { + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected Map createMap(Class mapType, int initialCapacity) { if (!mapType.isInterface()) { try { - return (Map) mapType.newInstance(); + return mapType.newInstance(); } catch (Exception ex) { throw new IllegalArgumentException( @@ -134,10 +138,10 @@ public class CustomMapEditor extends PropertyEditorSupport { } } else if (SortedMap.class.equals(mapType)) { - return new TreeMap(); + return new TreeMap(); } else { - return new LinkedHashMap(initialCapacity); + return new LinkedHashMap(initialCapacity); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java index 977c2b0a6c..e6670202e3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java @@ -67,7 +67,7 @@ public class PropertiesEditor extends PropertyEditorSupport { public void setValue(Object value) { if (!(value instanceof Properties) && value instanceof Map) { Properties props = new Properties(); - props.putAll((Map) value); + props.putAll((Map) value); super.setValue(props); } else { diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java index a9ed9984aa..ebdf6a494b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java @@ -92,7 +92,7 @@ public class ArgumentConvertingMethodInvoker extends MethodInvoker { * @see #setTypeConverter * @see org.springframework.beans.PropertyEditorRegistry#registerCustomEditor */ - public void registerCustomEditor(Class requiredType, PropertyEditor propertyEditor) { + public void registerCustomEditor(Class requiredType, PropertyEditor propertyEditor) { TypeConverter converter = getTypeConverter(); if (!(converter instanceof PropertyEditorRegistry)) { throw new IllegalStateException( @@ -139,7 +139,7 @@ public class ArgumentConvertingMethodInvoker extends MethodInvoker { for (Method candidate : candidates) { if (candidate.getName().equals(targetMethod)) { // Check if the inspected method has the correct number of parameters. - Class[] paramTypes = candidate.getParameterTypes(); + Class[] paramTypes = candidate.getParameterTypes(); if (paramTypes.length == argCount) { Object[] convertedArguments = new Object[argCount]; boolean match = true; diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java index bbea12861a..299aaac4be 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeansException; import org.springframework.util.StringUtils; @@ -37,7 +36,7 @@ import org.springframework.util.StringUtils; * @since 19.05.2003 * @see org.springframework.beans.BeanWrapper */ -public class PropertyComparator implements Comparator { +public class PropertyComparator implements Comparator { protected final Log logger = LogFactory.getLog(getClass()); @@ -73,7 +72,8 @@ public class PropertyComparator implements Comparator { @Override - public int compare(Object o1, Object o2) { + @SuppressWarnings("unchecked") + public int compare(T o1, T o2) { Object v1 = getPropertyValue(o1); Object v2 = getPropertyValue(o2); if (this.sortDefinition.isIgnoreCase() && (v1 instanceof String) && (v2 instanceof String)) { @@ -86,7 +86,7 @@ public class PropertyComparator implements Comparator { // Put an object with null property at the end of the sort result. try { if (v1 != null) { - result = (v2 != null ? ((Comparable) v1).compareTo(v2) : -1); + result = (v2 != null ? ((Comparable) v1).compareTo(v2) : -1); } else { result = (v2 != null ? 1 : 0); @@ -130,9 +130,9 @@ public class PropertyComparator implements Comparator { * @param sortDefinition the parameters to sort by * @throws java.lang.IllegalArgumentException in case of a missing propertyName */ - public static void sort(List source, SortDefinition sortDefinition) throws BeansException { + public static void sort(List source, SortDefinition sortDefinition) throws BeansException { if (StringUtils.hasText(sortDefinition.getProperty())) { - Collections.sort(source, new PropertyComparator(sortDefinition)); + Collections.sort(source, new PropertyComparator(sortDefinition)); } } @@ -146,7 +146,7 @@ public class PropertyComparator implements Comparator { */ public static void sort(Object[] source, SortDefinition sortDefinition) throws BeansException { if (StringUtils.hasText(sortDefinition.getProperty())) { - Arrays.sort(source, new PropertyComparator(sortDefinition)); + Arrays.sort(source, new PropertyComparator(sortDefinition)); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index ae7c2b8451..151245650e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -252,9 +252,10 @@ public final class ServiceLocatorFactoryBeanTests { } @Test(expected=IllegalArgumentException.class) + @SuppressWarnings("unchecked") public void testWhenServiceLocatorExceptionClassIsNotAnExceptionSubclass() throws Exception { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); - factory.setServiceLocatorExceptionClass(getClass()); + factory.setServiceLocatorExceptionClass((Class) getClass()); // should throw, bad (non-Exception-type) serviceLocatorException class supplied } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java index 4f9463a5c7..bd1623390a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java @@ -38,8 +38,9 @@ public final class CustomCollectionEditorTests { } @Test(expected=IllegalArgumentException.class) + @SuppressWarnings("unchecked") public void testCtorWithNonCollectionType() throws Exception { - new CustomCollectionEditor(String.class); + new CustomCollectionEditor((Class) String.class); } @Test(expected=IllegalArgumentException.class) diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java index 2ebb09e258..76f49e95e6 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java @@ -31,9 +31,9 @@ import net.sf.ehcache.constructs.blocking.SelfPopulatingCache; import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory; import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache; import net.sf.ehcache.event.CacheEventListener; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; @@ -85,6 +85,7 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea private Ehcache cache; + @SuppressWarnings("deprecation") public EhCacheFactoryBean() { setMaxElementsInMemory(10000); setMaxElementsOnDisk(10000000); diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java index 6e3b30e458..71d41b6a5d 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java @@ -101,7 +101,7 @@ public class JCacheCacheManager extends AbstractTransactionSupportingCacheManage protected Collection loadCaches() { Collection caches = new LinkedHashSet(); for (String cacheName : this.cacheManager.getCacheNames()) { - javax.cache.Cache jcache = this.cacheManager.getCache(cacheName); + javax.cache.Cache jcache = this.cacheManager.getCache(cacheName); caches.add(new JCacheCache(jcache, this.allowNullValues)); } return caches; diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java index 3801e703c0..b1d4b2207f 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java @@ -53,12 +53,12 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T @Override - public ScheduledFuture schedule(Runnable task, Trigger trigger) { + public ScheduledFuture schedule(Runnable task, Trigger trigger) { return new ReschedulingTimerListener(errorHandlingTask(task, true), trigger).schedule(); } @Override - public ScheduledFuture schedule(Runnable task, Date startTime) { + public ScheduledFuture schedule(Runnable task, Date startTime) { TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, false)); Timer timer = getTimerManager().schedule(futureTask, startTime); futureTask.setTimer(timer); @@ -66,7 +66,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true)); Timer timer = getTimerManager().scheduleAtFixedRate(futureTask, startTime, period); futureTask.setTimer(timer); @@ -74,7 +74,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true)); Timer timer = getTimerManager().scheduleAtFixedRate(futureTask, 0, period); futureTask.setTimer(timer); @@ -82,7 +82,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true)); Timer timer = getTimerManager().schedule(futureTask, startTime, delay); futureTask.setTimer(timer); @@ -90,7 +90,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true)); Timer timer = getTimerManager().schedule(futureTask, 0, delay); futureTask.setTimer(timer); @@ -164,7 +164,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T this.trigger = trigger; } - public ScheduledFuture schedule() { + public ScheduledFuture schedule() { this.scheduledExecutionTime = this.trigger.nextExecutionTime(this.triggerContext); if (this.scheduledExecutionTime == null) { return null; diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java index e335f00d32..420329b011 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.FutureTask; + import javax.naming.NamingException; import commonj.work.Work; @@ -176,11 +177,13 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport } @Override + @SuppressWarnings("rawtypes") public boolean waitForAll(Collection workItems, long timeout) throws InterruptedException { return this.workManager.waitForAll(workItems, timeout); } @Override + @SuppressWarnings("rawtypes") public Collection waitForAny(Collection workItems, long timeout) throws InterruptedException { return this.workManager.waitForAny(workItems, timeout); } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java index a4035dc86a..69250486ae 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java @@ -74,7 +74,7 @@ public class AdaptableJobFactory implements JobFactory { Method getJobDetail = bundle.getClass().getMethod("getJobDetail"); Object jobDetail = ReflectionUtils.invokeMethod(getJobDetail, bundle); Method getJobClass = jobDetail.getClass().getMethod("getJobClass"); - Class jobClass = (Class) ReflectionUtils.invokeMethod(getJobClass, jobDetail); + Class jobClass = (Class) ReflectionUtils.invokeMethod(getJobClass, jobDetail); return jobClass.newInstance(); } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java index 92d4e07d58..35a2267e39 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java @@ -232,7 +232,7 @@ public class CronTriggerFactoryBean implements FactoryBean, BeanNam this.cronTrigger = cti; */ - Class cronTriggerClass; + Class cronTriggerClass; Method jobKeyMethod; try { cronTriggerClass = getClass().getClassLoader().loadClass("org.quartz.impl.triggers.CronTriggerImpl"); diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java index 2d8e2a24db..25087862fe 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java @@ -21,7 +21,6 @@ import java.util.Map; import org.quartz.Job; import org.quartz.JobDetail; import org.quartz.Scheduler; - import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; @@ -48,11 +47,11 @@ import org.springframework.context.ApplicationContextAware; * @see org.springframework.beans.factory.BeanNameAware * @see org.quartz.Scheduler#DEFAULT_GROUP */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "rawtypes" }) public class JobDetailBean extends JobDetail implements BeanNameAware, ApplicationContextAware, InitializingBean { - private Class actualJobClass; + private Class actualJobClass; private String beanName; diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java index a2d9beebe0..38d64537a2 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java @@ -56,7 +56,7 @@ public class JobDetailFactoryBean private String group; - private Class jobClass; + private Class jobClass; private JobDataMap jobDataMap = new JobDataMap(); @@ -92,7 +92,7 @@ public class JobDetailFactoryBean /** * Specify the job's implementation class. */ - public void setJobClass(Class jobClass) { + public void setJobClass(Class jobClass) { this.jobClass = jobClass; } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java index b6533ac793..fba5a4a7af 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java @@ -92,7 +92,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod jobDetailImplClass = null; } try { - Class jobExecutionContextClass = + Class jobExecutionContextClass = QuartzJobBean.class.getClassLoader().loadClass("org.quartz.JobExecutionContext"); setResultMethod = jobExecutionContextClass.getMethod("setResult", Object.class); } @@ -192,7 +192,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod } @Override - protected Class resolveClassName(String className) throws ClassNotFoundException { + protected Class resolveClassName(String className) throws ClassNotFoundException { return ClassUtils.forName(className, this.beanClassLoader); } @@ -205,7 +205,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod String name = (this.name != null ? this.name : this.beanName); // Consider the concurrent flag to choose between stateful and stateless job. - Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class); + Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class); // Build JobDetail instance. if (jobDetailImplClass != null) { @@ -253,8 +253,8 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod * Overridden to support the {@link #setTargetBeanName "targetBeanName"} feature. */ @Override - public Class getTargetClass() { - Class targetClass = super.getTargetClass(); + public Class getTargetClass() { + Class targetClass = super.getTargetClass(); if (targetClass == null && this.targetBeanName != null) { Assert.state(this.beanFactory != null, "BeanFactory must be set when using 'targetBeanName'"); targetClass = this.beanFactory.getType(this.targetBeanName); diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java index 6eebbd337d..c78498f5d0 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java @@ -76,7 +76,7 @@ public abstract class QuartzJobBean implements Job { static { try { - Class jobExecutionContextClass = + Class jobExecutionContextClass = QuartzJobBean.class.getClassLoader().loadClass("org.quartz.JobExecutionContext"); getSchedulerMethod = jobExecutionContextClass.getMethod("getScheduler"); getMergedJobDataMapMethod = jobExecutionContextClass.getMethod("getMergedJobDataMap"); @@ -97,7 +97,7 @@ public abstract class QuartzJobBean implements Job { try { // Reflectively adapting to differences between Quartz 1.x and Quartz 2.0... Scheduler scheduler = (Scheduler) ReflectionUtils.invokeMethod(getSchedulerMethod, context); - Map mergedJobDataMap = (Map) ReflectionUtils.invokeMethod(getMergedJobDataMapMethod, context); + Map mergedJobDataMap = (Map) ReflectionUtils.invokeMethod(getMergedJobDataMapMethod, context); BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(this); MutablePropertyValues pvs = new MutablePropertyValues(); diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java index 54dd55760b..bcbaa67f90 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java @@ -24,7 +24,6 @@ import java.net.URL; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.spi.ClassLoadHelper; - import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -73,6 +72,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper { } @Override + @SuppressWarnings("rawtypes") public Class loadClass(String name) throws ClassNotFoundException { return this.resourceLoader.getClassLoader().loadClass(name); } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java index b2705d291a..8dca647f53 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java @@ -382,7 +382,7 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware { } else { try { - Map jobDataMap = (Map) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger); + Map jobDataMap = (Map) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger); return (JobDetail) jobDataMap.remove(JobDetailAwareTrigger.JOB_DETAIL_KEY); } catch (NoSuchMethodException ex) { diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java index 6b6a03c62d..f6213bd773 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java @@ -173,7 +173,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe private DataSource nonTransactionalDataSource; - private Map schedulerContextMap; + private Map schedulerContextMap; private ApplicationContext applicationContext; @@ -208,7 +208,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe * @see #setConfigLocation * @see #setQuartzProperties */ - public void setSchedulerFactoryClass(Class schedulerFactoryClass) { + public void setSchedulerFactoryClass(Class schedulerFactoryClass) { if (schedulerFactoryClass == null || !SchedulerFactory.class.isAssignableFrom(schedulerFactoryClass)) { throw new IllegalArgumentException("schedulerFactoryClass must implement [org.quartz.SchedulerFactory]"); } @@ -313,7 +313,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe * values (for example Spring-managed beans) * @see JobDetailBean#setJobDataAsMap */ - public void setSchedulerContextAsMap(Map schedulerContextAsMap) { + public void setSchedulerContextAsMap(Map schedulerContextAsMap) { this.schedulerContextMap = schedulerContextAsMap; } diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java index 84e39be1c1..5e2f9fadc9 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java @@ -233,7 +233,7 @@ public class SimpleTriggerFactoryBean implements FactoryBean, Bea this.simpleTrigger = sti; */ - Class simpleTriggerClass; + Class simpleTriggerClass; Method jobKeyMethod; try { simpleTriggerClass = getClass().getClassLoader().loadClass("org.quartz.impl.triggers.SimpleTriggerImpl"); diff --git a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java index b74611a4b0..591f2a6fac 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java +++ b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java @@ -63,7 +63,7 @@ public abstract class JasperReportsUtils { return (JRDataSource) value; } else if (value instanceof Collection) { - return new JRBeanCollectionDataSource((Collection) value); + return new JRBeanCollectionDataSource((Collection) value); } else if (value instanceof Object[]) { return new JRBeanArrayDataSource((Object[]) value); diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java index 822d100664..4dc8af0d7a 100644 --- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java +++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java @@ -89,7 +89,7 @@ public class ConcurrentMapCache implements Cache { } @Override - public ConcurrentMap getNativeCache() { + public ConcurrentMap getNativeCache() { return this.store; } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java index 3137d07dc1..59204a6d7b 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java @@ -127,11 +127,13 @@ public class AnnotatedBeanDefinitionReader { registerBean(annotatedClass, null, (Class[]) null); } - public void registerBean(Class annotatedClass, Class... qualifiers) { + public void registerBean(Class annotatedClass, + @SuppressWarnings("unchecked") Class... qualifiers) { registerBean(annotatedClass, null, qualifiers); } - public void registerBean(Class annotatedClass, String name, Class... qualifiers) { + public void registerBean(Class annotatedClass, String name, + @SuppressWarnings("unchecked") Class... qualifiers) { AnnotatedGenericBeanDefinition abd = new AnnotatedGenericBeanDefinition(annotatedClass); if (this.conditionEvaluator.shouldSkip(abd.getMetadata())) { return; diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java index 2e58cc2177..239ac169ad 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java @@ -604,7 +604,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean } if (StringUtils.hasLength(this.wsdlLocation)) { try { - Constructor ctor = this.lookupType.getConstructor(new Class[] {URL.class, QName.class}); + Constructor ctor = this.lookupType.getConstructor(new Class[] {URL.class, QName.class}); WebServiceClient clientAnn = this.lookupType.getAnnotation(WebServiceClient.class); if (clientAnn == null) { throw new IllegalStateException("JAX-WS Service class [" + this.lookupType.getName() + diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java index 2ef0ad17af..e6a5ef274a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java @@ -240,7 +240,7 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser { return new RegexPatternTypeFilter(Pattern.compile(expression)); } else if ("custom".equals(filterType)) { - Class filterClass = classLoader.loadClass(expression); + Class filterClass = classLoader.loadClass(expression); if (!TypeFilter.class.isAssignableFrom(filterClass)) { throw new IllegalArgumentException( "Class is not assignable to [" + TypeFilter.class.getName() + "]: " + expression); @@ -257,7 +257,7 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser { } @SuppressWarnings("unchecked") - private Object instantiateUserDefinedStrategy(String className, Class strategyType, ClassLoader classLoader) { + private Object instantiateUserDefinedStrategy(String className, Class strategyType, ClassLoader classLoader) { Object result = null; try { result = classLoader.loadClass(className).newInstance(); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java index ec7dfd86cd..b525fe8359 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java @@ -103,7 +103,7 @@ class ConfigurationClassEnhancer { private Enhancer newEnhancer(Class superclass) { Enhancer enhancer = new Enhancer(); enhancer.setSuperclass(superclass); - enhancer.setInterfaces(new Class[] {EnhancedConfiguration.class}); + enhancer.setInterfaces(new Class[] {EnhancedConfiguration.class}); enhancer.setUseFactory(false); enhancer.setCallbackFilter(CALLBACK_FILTER); enhancer.setCallbackTypes(CALLBACK_FILTER.getCallbackTypes()); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java index 515ab363bb..ff3d66991b 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java @@ -672,7 +672,7 @@ class ConfigurationClassParser { public boolean isAssignable(Class clazz) throws IOException { if (this.source instanceof Class) { - return clazz.isAssignableFrom((Class) this.source); + return clazz.isAssignableFrom((Class) this.source); } return new AssignableTypeFilter(clazz).match((MetadataReader) this.source, metadataReaderFactory); } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java index 47b6395fbd..1a4708322d 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java @@ -55,7 +55,7 @@ public class Jsr330ScopeMetadataResolver implements ScopeMetadataResolver { * @param annotationType the JSR-330 annotation type as a Class * @param scopeName the Spring scope name */ - public final void registerScope(Class annotationType, String scopeName) { + public final void registerScope(Class annotationType, String scopeName) { this.scopeMap.put(annotationType.getName(), scopeName); } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java index 218fbe75ca..c7935a547d 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java @@ -91,9 +91,12 @@ public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoade // No aop.xml present on the classpath -> treat as 'disabled' break; } - // aop.xml is present on the classpath -> fall through and enable + // aop.xml is present on the classpath -> enable + AspectJWeavingEnabler.enableAspectJWeaving(loadTimeWeaver, this.beanClassLoader); + break; case ENABLED: AspectJWeavingEnabler.enableAspectJWeaving(loadTimeWeaver, this.beanClassLoader); + break; } return loadTimeWeaver; diff --git a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java index 3a70e3c5f0..cf496b7346 100644 --- a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; class PropertyOverrideBeanDefinitionParser extends AbstractPropertyLoadingBeanDefinitionParser { @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return PropertyOverrideConfigurer.class; } diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java index 43119129fd..a4940e0e9a 100644 --- a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java +++ b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java @@ -61,7 +61,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application @Override - public void addApplicationListener(ApplicationListener listener) { + public void addApplicationListener(ApplicationListener listener) { synchronized (this.defaultRetriever) { this.defaultRetriever.applicationListeners.add(listener); this.retrieverCache.clear(); @@ -77,7 +77,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application } @Override - public void removeApplicationListener(ApplicationListener listener) { + public void removeApplicationListener(ApplicationListener listener) { synchronized (this.defaultRetriever) { this.defaultRetriever.applicationListeners.remove(listener); this.retrieverCache.clear(); @@ -120,7 +120,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application * @return a Collection of ApplicationListeners * @see org.springframework.context.ApplicationListener */ - protected Collection getApplicationListeners() { + protected Collection> getApplicationListeners() { synchronized (this.defaultRetriever) { return this.defaultRetriever.getApplicationListeners(); } @@ -134,7 +134,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application * @return a Collection of ApplicationListeners * @see org.springframework.context.ApplicationListener */ - protected Collection getApplicationListeners(ApplicationEvent event) { + protected Collection> getApplicationListeners(ApplicationEvent event) { Class eventType = event.getClass(); Object source = event.getSource(); Class sourceType = (source != null ? source.getClass() : null); @@ -145,14 +145,14 @@ public abstract class AbstractApplicationEventMulticaster implements Application } else { retriever = new ListenerRetriever(true); - LinkedList allListeners = new LinkedList(); - Set listeners; + LinkedList> allListeners = new LinkedList>(); + Set> listeners; Set listenerBeans; synchronized (this.defaultRetriever) { - listeners = new LinkedHashSet(this.defaultRetriever.applicationListeners); + listeners = new LinkedHashSet>(this.defaultRetriever.applicationListeners); listenerBeans = new LinkedHashSet(this.defaultRetriever.applicationListenerBeans); } - for (ApplicationListener listener : listeners) { + for (ApplicationListener listener : listeners) { if (supportsEvent(listener, eventType, sourceType)) { retriever.applicationListeners.add(listener); allListeners.add(listener); @@ -162,7 +162,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application BeanFactory beanFactory = getBeanFactory(); for (String listenerBeanName : listenerBeans) { try { - ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class); + ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class); if (!allListeners.contains(listener) && supportsEvent(listener, eventType, sourceType)) { retriever.applicationListenerBeans.add(listenerBeanName); allListeners.add(listener); @@ -192,8 +192,8 @@ public abstract class AbstractApplicationEventMulticaster implements Application * @return whether the given listener should be included in the * candidates for the given event type */ - protected boolean supportsEvent( - ApplicationListener listener, Class eventType, Class sourceType) { + protected boolean supportsEvent(ApplicationListener listener, + Class eventType, Class sourceType) { SmartApplicationListener smartListener = (listener instanceof SmartApplicationListener ? (SmartApplicationListener) listener : new GenericApplicationListenerAdapter(listener)); @@ -239,28 +239,28 @@ public abstract class AbstractApplicationEventMulticaster implements Application */ private class ListenerRetriever { - public final Set applicationListeners; + public final Set> applicationListeners; public final Set applicationListenerBeans; private final boolean preFiltered; public ListenerRetriever(boolean preFiltered) { - this.applicationListeners = new LinkedHashSet(); + this.applicationListeners = new LinkedHashSet>(); this.applicationListenerBeans = new LinkedHashSet(); this.preFiltered = preFiltered; } - public Collection getApplicationListeners() { - LinkedList allListeners = new LinkedList(); - for (ApplicationListener listener : this.applicationListeners) { + public Collection> getApplicationListeners() { + LinkedList> allListeners = new LinkedList>(); + for (ApplicationListener listener : this.applicationListeners) { allListeners.add(listener); } if (!this.applicationListenerBeans.isEmpty()) { BeanFactory beanFactory = getBeanFactory(); for (String listenerBeanName : this.applicationListenerBeans) { try { - ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class); + ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class); if (this.preFiltered || !allListeners.contains(listener)) { allListeners.add(listener); } diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java index 6a2f2cd745..03bd1ceefe 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java +++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationEventMulticaster.java @@ -36,7 +36,7 @@ public interface ApplicationEventMulticaster { * Add a listener to be notified of all events. * @param listener the listener to add */ - void addApplicationListener(ApplicationListener listener); + void addApplicationListener(ApplicationListener listener); /** * Add a listener bean to be notified of all events. @@ -48,7 +48,7 @@ public interface ApplicationEventMulticaster { * Remove a listener from the notification list. * @param listener the listener to remove */ - void removeApplicationListener(ApplicationListener listener); + void removeApplicationListener(ApplicationListener listener); /** * Remove a listener bean from the notification list. diff --git a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java index 0ff440e34c..f9cfda74bf 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java @@ -48,7 +48,7 @@ import org.springframework.context.ApplicationEventPublisherAware; public class EventPublicationInterceptor implements MethodInterceptor, ApplicationEventPublisherAware, InitializingBean { - private Constructor applicationEventClassConstructor; + private Constructor applicationEventClassConstructor; private ApplicationEventPublisher applicationEventPublisher; @@ -62,14 +62,14 @@ public class EventPublicationInterceptor * {@code null} or if it is not an {@code ApplicationEvent} subclass or * if it does not expose a constructor that takes a single {@code Object} argument */ - public void setApplicationEventClass(Class applicationEventClass) { + public void setApplicationEventClass(Class applicationEventClass) { if (ApplicationEvent.class.equals(applicationEventClass) || !ApplicationEvent.class.isAssignableFrom(applicationEventClass)) { throw new IllegalArgumentException("applicationEventClass needs to extend ApplicationEvent"); } try { this.applicationEventClassConstructor = - applicationEventClass.getConstructor(new Class[] {Object.class}); + applicationEventClass.getConstructor(new Class[] {Object.class}); } catch (NoSuchMethodException ex) { throw new IllegalArgumentException("applicationEventClass [" + diff --git a/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java b/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java index bc7e2660ac..5180e1ab78 100644 --- a/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java +++ b/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java @@ -33,21 +33,21 @@ import org.springframework.util.Assert; */ public class GenericApplicationListenerAdapter implements SmartApplicationListener { - private final ApplicationListener delegate; + private final ApplicationListener delegate; /** * Create a new GenericApplicationListener for the given delegate. * @param delegate the delegate listener to be invoked */ - public GenericApplicationListenerAdapter(ApplicationListener delegate) { + @SuppressWarnings("unchecked") + public GenericApplicationListenerAdapter(ApplicationListener delegate) { Assert.notNull(delegate, "Delegate listener must not be null"); - this.delegate = delegate; + this.delegate = (ApplicationListener) delegate; } @Override - @SuppressWarnings("unchecked") public void onApplicationEvent(ApplicationEvent event) { this.delegate.onApplicationEvent(event); } diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java index 964b187516..6b73c9cfa4 100644 --- a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java +++ b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java @@ -82,7 +82,7 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void multicastEvent(final ApplicationEvent event) { for (final ApplicationListener listener : getApplicationListeners(event)) { Executor executor = getTaskExecutor(); diff --git a/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java b/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java index 7bb0f874b6..93bf92f756 100644 --- a/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java +++ b/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java @@ -45,7 +45,7 @@ public class SourceFilteringListener implements SmartApplicationListener { * @param delegate the delegate listener to invoke with event * from the specified source */ - public SourceFilteringListener(Object source, ApplicationListener delegate) { + public SourceFilteringListener(Object source, ApplicationListener delegate) { this.source = source; this.delegate = (delegate instanceof SmartApplicationListener ? (SmartApplicationListener) delegate : new GenericApplicationListenerAdapter(delegate)); diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java index 0f1a161948..b87ff7820c 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java @@ -53,8 +53,8 @@ public class BeanExpressionContextAccessor implements PropertyAccessor { } @Override - public Class[] getSpecificTargetClasses() { - return new Class[] {BeanExpressionContext.class}; + public Class[] getSpecificTargetClasses() { + return new Class[] {BeanExpressionContext.class}; } } diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java index 15d3d7a622..f6ee4820f4 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java @@ -53,8 +53,8 @@ public class BeanFactoryAccessor implements PropertyAccessor { } @Override - public Class[] getSpecificTargetClasses() { - return new Class[] {BeanFactory.class}; + public Class[] getSpecificTargetClasses() { + return new Class[] {BeanFactory.class}; } } diff --git a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java index 86893f3daa..7b39cc21ec 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java @@ -33,7 +33,7 @@ public class EnvironmentAccessor implements PropertyAccessor { @Override public Class[] getSpecificTargetClasses() { - return new Class[] { Environment.class }; + return new Class[] { Environment.class }; } /** diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java index 7f4de09daf..340a18b59d 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java @@ -35,13 +35,13 @@ public class MapAccessor implements PropertyAccessor { @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { - Map map = (Map) target; + Map map = (Map) target; return map.containsKey(name); } @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { - Map map = (Map) target; + Map map = (Map) target; Object value = map.get(name); if (value == null && !map.containsKey(name)) { throw new MapAccessException(name); @@ -57,13 +57,13 @@ public class MapAccessor implements PropertyAccessor { @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { - Map map = (Map) target; + Map map = (Map) target; map.put(name, newValue); } @Override - public Class[] getSpecificTargetClasses() { - return new Class[] {Map.class}; + public Class[] getSpecificTargetClasses() { + return new Class[] {Map.class}; } diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java index e3bb18e49c..2a401ac6fc 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java +++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java @@ -100,7 +100,7 @@ public abstract class ApplicationObjectSupport implements ApplicationContextAwar * Can be overridden in subclasses. * @see #setApplicationContext */ - protected Class requiredContextClass() { + protected Class requiredContextClass() { return ApplicationContext.class; } diff --git a/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java index 670461fc54..5d3d996dad 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/ClassPathXmlApplicationContext.java @@ -154,7 +154,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex * @see org.springframework.context.support.GenericApplicationContext * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader */ - public ClassPathXmlApplicationContext(String path, Class clazz) throws BeansException { + public ClassPathXmlApplicationContext(String path, Class clazz) throws BeansException { this(new String[] {path}, clazz); } @@ -168,7 +168,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex * @see org.springframework.context.support.GenericApplicationContext * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader */ - public ClassPathXmlApplicationContext(String[] paths, Class clazz) throws BeansException { + public ClassPathXmlApplicationContext(String[] paths, Class clazz) throws BeansException { this(paths, clazz, null); } @@ -184,7 +184,7 @@ public class ClassPathXmlApplicationContext extends AbstractXmlApplicationContex * @see org.springframework.context.support.GenericApplicationContext * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader */ - public ClassPathXmlApplicationContext(String[] paths, Class clazz, ApplicationContext parent) + public ClassPathXmlApplicationContext(String[] paths, Class clazz, ApplicationContext parent) throws BeansException { super(parent); diff --git a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java index 9cdff9d621..b433137f39 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java +++ b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java @@ -42,7 +42,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart static { try { - findLoadedClassMethod = ClassLoader.class.getDeclaredMethod("findLoadedClass", new Class[] {String.class}); + findLoadedClassMethod = ClassLoader.class.getDeclaredMethod("findLoadedClass", new Class[] {String.class}); } catch (NoSuchMethodException ex) { throw new IllegalStateException("Invalid [java.lang.ClassLoader] class: no 'findLoadedClass' method defined!"); @@ -59,12 +59,12 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart } @Override - public Class loadClass(String name) throws ClassNotFoundException { + public Class loadClass(String name) throws ClassNotFoundException { return new ContextOverridingClassLoader(getParent()).loadClass(name); } @Override - public boolean isClassReloadable(Class clazz) { + public boolean isClassReloadable(Class clazz) { return (clazz.getClassLoader() instanceof ContextOverridingClassLoader); } @@ -96,7 +96,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart } @Override - protected Class loadClassForOverriding(String name) throws ClassNotFoundException { + protected Class loadClassForOverriding(String name) throws ClassNotFoundException { byte[] bytes = bytesCache.get(name); if (bytes == null) { bytes = loadBytesForClass(name); diff --git a/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java b/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java index 7ff0584d9e..4e3394c348 100644 --- a/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java +++ b/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java @@ -371,7 +371,7 @@ class PostProcessorRegistrationDelegate { public void postProcessBeforeDestruction(Object bean, String beanName) { if (bean instanceof ApplicationListener) { ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster(); - multicaster.removeApplicationListener((ApplicationListener) bean); + multicaster.removeApplicationListener((ApplicationListener) bean); multicaster.removeApplicationListenerBean(beanName); } } diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java index 14b831c098..c145549d79 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java @@ -330,9 +330,9 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource Properties mergedProps = new Properties(); mergedHolder = new PropertiesHolder(mergedProps, -1); for (int i = this.basenames.length - 1; i >= 0; i--) { - List filenames = calculateAllFilenames(this.basenames[i], locale); + List filenames = calculateAllFilenames(this.basenames[i], locale); for (int j = filenames.size() - 1; j >= 0; j--) { - String filename = (String) filenames.get(j); + String filename = filenames.get(j); PropertiesHolder propHolder = getProperties(filename); if (propHolder.getProperties() != null) { mergedProps.putAll(propHolder.getProperties()); diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java index 0feb05443e..ebbac4b55a 100644 --- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java +++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java @@ -56,7 +56,7 @@ public class SimpleThreadScope implements Scope { }; @Override - public Object get(String name, ObjectFactory objectFactory) { + public Object get(String name, ObjectFactory objectFactory) { Map scope = threadScope.get(); Object object = scope.get(name); if (object == null) { diff --git a/spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java index 502beff5f7..7f0700e0b5 100644 --- a/spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/StaticApplicationContext.java @@ -89,7 +89,7 @@ public class StaticApplicationContext extends GenericApplicationContext { *

For more advanced needs, register with the underlying BeanFactory directly. * @see #getDefaultListableBeanFactory */ - public void registerSingleton(String name, Class clazz) throws BeansException { + public void registerSingleton(String name, Class clazz) throws BeansException { GenericBeanDefinition bd = new GenericBeanDefinition(); bd.setBeanClass(clazz); getDefaultListableBeanFactory().registerBeanDefinition(name, bd); @@ -100,7 +100,7 @@ public class StaticApplicationContext extends GenericApplicationContext { *

For more advanced needs, register with the underlying BeanFactory directly. * @see #getDefaultListableBeanFactory */ - public void registerSingleton(String name, Class clazz, MutablePropertyValues pvs) throws BeansException { + public void registerSingleton(String name, Class clazz, MutablePropertyValues pvs) throws BeansException { GenericBeanDefinition bd = new GenericBeanDefinition(); bd.setBeanClass(clazz); bd.setPropertyValues(pvs); @@ -112,7 +112,7 @@ public class StaticApplicationContext extends GenericApplicationContext { *

For more advanced needs, register with the underlying BeanFactory directly. * @see #getDefaultListableBeanFactory */ - public void registerPrototype(String name, Class clazz) throws BeansException { + public void registerPrototype(String name, Class clazz) throws BeansException { GenericBeanDefinition bd = new GenericBeanDefinition(); bd.setScope(GenericBeanDefinition.SCOPE_PROTOTYPE); bd.setBeanClass(clazz); @@ -124,7 +124,7 @@ public class StaticApplicationContext extends GenericApplicationContext { *

For more advanced needs, register with the underlying BeanFactory directly. * @see #getDefaultListableBeanFactory */ - public void registerPrototype(String name, Class clazz, MutablePropertyValues pvs) throws BeansException { + public void registerPrototype(String name, Class clazz, MutablePropertyValues pvs) throws BeansException { GenericBeanDefinition bd = new GenericBeanDefinition(); bd.setScope(GenericBeanDefinition.SCOPE_PROTOTYPE); bd.setBeanClass(clazz); diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java index 1af0997e64..b01182a184 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java @@ -43,7 +43,7 @@ import org.springframework.remoting.rmi.RmiClientInterceptorUtils; */ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor { - private Class homeInterface; + private Class homeInterface; private boolean refreshHomeOnConnectFailure = false; @@ -60,7 +60,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI * sufficient to make a WebSphere 5.0 Remote SLSB work. On other servers, * the specific home interface for the target SLSB might be necessary. */ - public void setHomeInterface(Class homeInterface) { + public void setHomeInterface(Class homeInterface) { if (homeInterface != null && !homeInterface.isInterface()) { throw new IllegalArgumentException( "Home interface class [" + homeInterface.getClass() + "] is not an interface"); diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java index ca4d245ff4..601e7632d1 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java @@ -52,7 +52,7 @@ public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInter implements FactoryBean, BeanClassLoaderAware { /** The business interface of the EJB we're proxying */ - private Class businessInterface; + private Class businessInterface; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -66,14 +66,14 @@ public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInter * Using a business methods interface is a best practice when implementing EJBs. * @param businessInterface set the business interface of the EJB */ - public void setBusinessInterface(Class businessInterface) { + public void setBusinessInterface(Class businessInterface) { this.businessInterface = businessInterface; } /** * Return the business interface of the EJB we're proxying. */ - public Class getBusinessInterface() { + public Class getBusinessInterface() { return this.businessInterface; } diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java index ff40f71ba4..f556f209a5 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java @@ -62,7 +62,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSl implements FactoryBean, BeanClassLoaderAware { /** The business interface of the EJB we're proxying */ - private Class businessInterface; + private Class businessInterface; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -80,14 +80,14 @@ public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSl * converted to Spring's generic RemoteAccessException. * @param businessInterface the business interface of the EJB */ - public void setBusinessInterface(Class businessInterface) { + public void setBusinessInterface(Class businessInterface) { this.businessInterface = businessInterface; } /** * Return the business interface of the EJB we're proxying. */ - public Class getBusinessInterface() { + public Class getBusinessInterface() { return this.businessInterface; } diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java index 6b616ace25..7c46d7735c 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java @@ -43,7 +43,7 @@ class JndiLookupBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionP @Override - protected Class getBeanClass(Element element) { + protected Class getBeanClass(Element element) { return JndiObjectFactoryBean.class; } diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java index ccad09d747..fb79c71782 100644 --- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java +++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java @@ -206,12 +206,13 @@ public class FormattingConversionService extends GenericConversionService private Class annotationType; - private AnnotationFormatterFactory annotationFormatterFactory; + @SuppressWarnings("rawtypes") + private AnnotationFormatterFactory annotationFormatterFactory; private Class fieldType; public AnnotationPrinterConverter(Class annotationType, - AnnotationFormatterFactory annotationFormatterFactory, Class fieldType) { + AnnotationFormatterFactory annotationFormatterFactory, Class fieldType) { this.annotationType = annotationType; this.annotationFormatterFactory = annotationFormatterFactory; this.fieldType = fieldType; @@ -254,6 +255,7 @@ public class FormattingConversionService extends GenericConversionService private Class annotationType; + @SuppressWarnings("rawtypes") private AnnotationFormatterFactory annotationFormatterFactory; private Class fieldType; diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java index 65ced7f039..45b6836fd3 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java @@ -98,14 +98,14 @@ public class ReflectiveLoadTimeWeaver implements LoadTimeWeaver { this.classLoader = classLoader; this.addTransformerMethod = ClassUtils.getMethodIfAvailable( this.classLoader.getClass(), ADD_TRANSFORMER_METHOD_NAME, - new Class[] {ClassFileTransformer.class}); + new Class[] {ClassFileTransformer.class}); if (this.addTransformerMethod == null) { throw new IllegalStateException( "ClassLoader [" + classLoader.getClass().getName() + "] does NOT provide an " + "'addTransformer(ClassFileTransformer)' method."); } this.getThrowawayClassLoaderMethod = ClassUtils.getMethodIfAvailable( - this.classLoader.getClass(), GET_THROWAWAY_CLASS_LOADER_METHOD_NAME, new Class[0]); + this.classLoader.getClass(), GET_THROWAWAY_CLASS_LOADER_METHOD_NAME, new Class[0]); // getThrowawayClassLoader method is optional if (this.getThrowawayClassLoaderMethod == null) { if (logger.isInfoEnabled()) { diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java index 913b4b00de..fbff824dfd 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ShadowingClassLoader.java @@ -56,7 +56,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { private final List classFileTransformers = new LinkedList(); - private final Map classCache = new HashMap(); + private final Map> classCache = new HashMap>(); /** @@ -96,7 +96,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { @Override public Class loadClass(String name) throws ClassNotFoundException { if (shouldShadow(name)) { - Class cls = this.classCache.get(name); + Class cls = this.classCache.get(name); if (cls != null) { return cls; } @@ -129,7 +129,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { } - private Class doLoadClass(String name) throws ClassNotFoundException { + private Class doLoadClass(String name) throws ClassNotFoundException { String internalName = StringUtils.replace(name, ".", "/") + ".class"; InputStream is = this.enclosingClassLoader.getResourceAsStream(internalName); if (is == null) { @@ -138,7 +138,7 @@ public class ShadowingClassLoader extends DecoratingClassLoader { try { byte[] bytes = FileCopyUtils.copyToByteArray(is); bytes = applyTransformers(name, bytes); - Class cls = defineClass(name, bytes, 0, bytes.length); + Class cls = defineClass(name, bytes, 0, bytes.length); // Additional check for defining the package, if not defined yet. if (cls.getPackage() == null) { int packageSeparator = name.lastIndexOf('.'); diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java index fb834375d8..b8cfccee1d 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java @@ -131,7 +131,7 @@ class JBossMCAdapter implements JBossClassLoaderAdapter { public void addTransformer(ClassFileTransformer transformer) { InvocationHandler adapter = new JBossMCTranslatorAdapter(transformer); Object adapterInstance = Proxy.newProxyInstance(this.translatorClass.getClassLoader(), - new Class[] { this.translatorClass }, adapter); + new Class[] { this.translatorClass }, adapter); try { addTranslator.invoke(target, adapterInstance); diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java index e925e5bfc3..2f74120590 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java @@ -43,7 +43,7 @@ class WebLogicClassLoaderAdapter { private final ClassLoader classLoader; - private final Class wlPreProcessorClass; + private final Class wlPreProcessorClass; private final Method addPreProcessorMethod; @@ -51,11 +51,11 @@ class WebLogicClassLoaderAdapter { private final Method getParentMethod; - private final Constructor wlGenericClassLoaderConstructor; + private final Constructor wlGenericClassLoaderConstructor; public WebLogicClassLoaderAdapter(ClassLoader classLoader) { - Class wlGenericClassLoaderClass = null; + Class wlGenericClassLoaderClass = null; try { wlGenericClassLoaderClass = classLoader.loadClass(GENERIC_CLASS_LOADER_NAME); this.wlPreProcessorClass = classLoader.loadClass(CLASS_PRE_PROCESSOR_NAME); @@ -81,7 +81,7 @@ class WebLogicClassLoaderAdapter { try { InvocationHandler adapter = new WebLogicClassPreProcessorAdapter(transformer, this.classLoader); Object adapterInstance = Proxy.newProxyInstance(this.wlPreProcessorClass.getClassLoader(), - new Class[] {this.wlPreProcessorClass}, adapter); + new Class[] {this.wlPreProcessorClass}, adapter); this.addPreProcessorMethod.invoke(this.classLoader, adapterInstance); } catch (InvocationTargetException ex) { diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java index fe35f3f15a..e8135d799f 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java @@ -60,7 +60,7 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler { } else if ("toString".equals(name)) { return toString(); } else if ("initialize".equals(name)) { - initialize((Hashtable) args[0]); + initialize((Hashtable) args[0]); return null; } else if ("preProcess".equals(name)) { return preProcess((String) args[0], (byte[]) args[1]); @@ -69,7 +69,7 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler { } } - public void initialize(Hashtable params) { + public void initialize(Hashtable params) { } public byte[] preProcess(String className, byte[] classBytes) { diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java index b0004bb1a7..3ee521c3be 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java @@ -79,7 +79,7 @@ class WebSphereClassLoaderAdapter { try { InvocationHandler adapter = new WebSphereClassPreDefinePlugin(transformer); Object adapterInstance = Proxy.newProxyInstance(this.wsPreProcessorClass.getClassLoader(), - new Class[] { this.wsPreProcessorClass }, adapter); + new Class[] { this.wsPreProcessorClass }, adapter); this.addPreDefinePlugin.invoke(this.classLoader, adapterInstance); } diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java index 86c95431c1..f7e2f7db39 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java @@ -107,7 +107,7 @@ public class MBeanClientInterceptor private boolean useStrictCasing = true; - private Class managementInterface; + private Class managementInterface; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -215,7 +215,7 @@ public class MBeanClientInterceptor * setters and getters for MBean attributes and conventional Java methods * for MBean operations. */ - public void setManagementInterface(Class managementInterface) { + public void setManagementInterface(Class managementInterface) { this.managementInterface = managementInterface; } @@ -223,7 +223,7 @@ public class MBeanClientInterceptor * Return the management interface of the target MBean, * or {@code null} if none specified. */ - protected final Class getManagementInterface() { + protected final Class getManagementInterface() { return this.managementInterface; } @@ -299,7 +299,7 @@ public class MBeanClientInterceptor MBeanOperationInfo[] operationInfo = info.getOperations(); this.allowedOperations = new HashMap(operationInfo.length); for (MBeanOperationInfo infoEle : operationInfo) { - Class[] paramTypes = JmxUtils.parameterInfoToTypes(infoEle.getSignature(), this.beanClassLoader); + Class[] paramTypes = JmxUtils.parameterInfoToTypes(infoEle.getSignature(), this.beanClassLoader); this.allowedOperations.put(new MethodCacheKey(infoEle.getName(), paramTypes), infoEle); } } @@ -534,7 +534,7 @@ public class MBeanClientInterceptor * is necessary */ protected Object convertResultValueIfNecessary(Object result, MethodParameter parameter) { - Class targetClass = parameter.getParameterType(); + Class targetClass = parameter.getParameterType(); try { if (result == null) { return null; @@ -552,7 +552,7 @@ public class MBeanClientInterceptor return convertDataArrayToTargetArray(array, targetClass); } else if (Collection.class.isAssignableFrom(targetClass)) { - Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter); + Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter); if (elementType != null) { return convertDataArrayToTargetCollection(array, targetClass, elementType); } @@ -568,7 +568,7 @@ public class MBeanClientInterceptor return convertDataArrayToTargetArray(array, targetClass); } else if (Collection.class.isAssignableFrom(targetClass)) { - Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter); + Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter); if (elementType != null) { return convertDataArrayToTargetCollection(array, targetClass, elementType); } @@ -584,8 +584,8 @@ public class MBeanClientInterceptor } } - private Object convertDataArrayToTargetArray(Object[] array, Class targetClass) throws NoSuchMethodException { - Class targetType = targetClass.getComponentType(); + private Object convertDataArrayToTargetArray(Object[] array, Class targetClass) throws NoSuchMethodException { + Class targetType = targetClass.getComponentType(); Method fromMethod = targetType.getMethod("from", array.getClass().getComponentType()); Object resultArray = Array.newInstance(targetType, array.length); for (int i = 0; i < array.length; i++) { @@ -594,12 +594,11 @@ public class MBeanClientInterceptor return resultArray; } - @SuppressWarnings("unchecked") - private Collection convertDataArrayToTargetCollection(Object[] array, Class collectionType, Class elementType) + private Collection convertDataArrayToTargetCollection(Object[] array, Class collectionType, Class elementType) throws NoSuchMethodException { Method fromMethod = elementType.getMethod("from", array.getClass().getComponentType()); - Collection resultColl = CollectionFactory.createCollection(collectionType, Array.getLength(array)); + Collection resultColl = CollectionFactory.createCollection(collectionType, Array.getLength(array)); for (int i = 0; i < array.length; i++) { resultColl.add(ReflectionUtils.invokeMethod(fromMethod, null, array[i])); } @@ -620,7 +619,7 @@ public class MBeanClientInterceptor private final String name; - private final Class[] parameterTypes; + private final Class[] parameterTypes; /** * Create a new instance of {@code MethodCacheKey} with the supplied @@ -628,9 +627,9 @@ public class MBeanClientInterceptor * @param name the name of the method * @param parameterTypes the arguments in the method signature */ - public MethodCacheKey(String name, Class[] parameterTypes) { + public MethodCacheKey(String name, Class[] parameterTypes) { this.name = name; - this.parameterTypes = (parameterTypes != null ? parameterTypes : new Class[0]); + this.parameterTypes = (parameterTypes != null ? parameterTypes : new Class[0]); } @Override diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java index 022a3a01f6..fff2885f8f 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java @@ -48,7 +48,7 @@ import org.springframework.util.ClassUtils; public class MBeanProxyFactoryBean extends MBeanClientInterceptor implements FactoryBean, BeanClassLoaderAware, InitializingBean { - private Class proxyInterface; + private Class proxyInterface; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -62,7 +62,7 @@ public class MBeanProxyFactoryBean extends MBeanClientInterceptor * conventional Java methods for MBean operations. * @see #setObjectName */ - public void setProxyInterface(Class proxyInterface) { + public void setProxyInterface(Class proxyInterface) { this.proxyInterface = proxyInterface; } diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java index e9a73da2ff..813bcf0aa3 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java @@ -25,6 +25,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; + import javax.management.DynamicMBean; import javax.management.JMException; import javax.management.MBeanException; @@ -746,7 +747,7 @@ public class MBeanExporter extends MBeanRegistrationSupport * @return whether the class qualifies as an MBean * @see org.springframework.jmx.support.JmxUtils#isMBean(Class) */ - protected boolean isMBean(Class beanClass) { + protected boolean isMBean(Class beanClass) { return JmxUtils.isMBean(beanClass); } @@ -760,9 +761,9 @@ public class MBeanExporter extends MBeanRegistrationSupport */ @SuppressWarnings("unchecked") protected DynamicMBean adaptMBeanIfPossible(Object bean) throws JMException { - Class targetClass = AopUtils.getTargetClass(bean); + Class targetClass = AopUtils.getTargetClass(bean); if (targetClass != bean.getClass()) { - Class ifc = JmxUtils.getMXBeanInterface(targetClass); + Class ifc = (Class) JmxUtils.getMXBeanInterface(targetClass); if (ifc != null) { if (!(ifc.isInstance(bean))) { throw new NotCompliantMBeanException("Managed bean [" + bean + @@ -771,7 +772,7 @@ public class MBeanExporter extends MBeanRegistrationSupport return new StandardMBean(bean, ifc, true); } else { - ifc = JmxUtils.getMBeanInterface(targetClass); + ifc = (Class) JmxUtils.getMBeanInterface(targetClass); if (ifc != null) { if (!(ifc.isInstance(bean))) { throw new NotCompliantMBeanException("Managed bean [" + bean + @@ -848,7 +849,7 @@ public class MBeanExporter extends MBeanRegistrationSupport private void autodetectBeans(final AutodetectCapableMBeanInfoAssembler assembler) { autodetect(new AutodetectCallback() { @Override - public boolean include(Class beanClass, String beanName) { + public boolean include(Class beanClass, String beanName) { return assembler.includeBean(beanClass, beanName); } }); @@ -861,7 +862,7 @@ public class MBeanExporter extends MBeanRegistrationSupport private void autodetectMBeans() { autodetect(new AutodetectCallback() { @Override - public boolean include(Class beanClass, String beanName) { + public boolean include(Class beanClass, String beanName) { return isMBean(beanClass); } }); @@ -883,7 +884,7 @@ public class MBeanExporter extends MBeanRegistrationSupport for (String beanName : beanNames) { if (!isExcluded(beanName) && !isBeanDefinitionAbstract(this.beanFactory, beanName)) { try { - Class beanClass = this.beanFactory.getType(beanName); + Class beanClass = this.beanFactory.getType(beanName); if (beanClass != null && callback.include(beanClass, beanName)) { boolean lazyInit = isBeanDefinitionLazyInit(this.beanFactory, beanName); Object beanInstance = (!lazyInit ? this.beanFactory.getBean(beanName) : null); @@ -1069,7 +1070,7 @@ public class MBeanExporter extends MBeanRegistrationSupport * @param beanClass the class of the bean * @param beanName the name of the bean */ - boolean include(Class beanClass, String beanName); + boolean include(Class beanClass, String beanName); } diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java index 4857f405e0..4a5f78b648 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java @@ -77,7 +77,7 @@ public abstract class AbstractConfigurableMBeanInfoAssembler extends AbstractRef return new ModelMBeanNotificationInfo[] {JmxMetadataUtils.convertToModelMBeanNotificationInfo(mn)}; } else if (mapValue instanceof Collection) { - Collection col = (Collection) mapValue; + Collection col = (Collection) mapValue; List result = new ArrayList(); for (Object colValue : col) { if (!(colValue instanceof ManagedNotification)) { diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java index 244e6a5966..eec19d450a 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java @@ -91,7 +91,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler { * @return the bean class to expose * @see org.springframework.aop.support.AopUtils#getTargetClass(Object) */ - protected Class getTargetClass(Object managedBean) { + protected Class getTargetClass(Object managedBean) { return AopUtils.getTargetClass(managedBean); } diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java index 1db07e96cf..3c21a8e7dd 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java @@ -434,7 +434,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean * @see #getClassToExpose(Class) * @see org.springframework.aop.framework.AopProxyUtils#proxiedUserInterfaces(Object) */ - protected Class getClassForDescriptor(Object managedBean) { + protected Class getClassForDescriptor(Object managedBean) { if (AopUtils.isJdkDynamicProxy(managedBean)) { return AopProxyUtils.proxiedUserInterfaces(managedBean)[0]; } diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java index 3f91e7fdfa..1356b0eaad 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java @@ -63,7 +63,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI /** * Stores the array of interfaces to use for creating the management interface. */ - private Class[] managedInterfaces; + private Class[] managedInterfaces; /** * Stores the mappings of bean keys to an array of {@code Class}es. @@ -75,7 +75,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI /** * Stores the mappings of bean keys to an array of {@code Class}es. */ - private Map resolvedInterfaceMappings; + private Map[]> resolvedInterfaceMappings; /** @@ -86,7 +86,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * Each entry MUST be an interface. * @see #setInterfaceMappings */ - public void setManagedInterfaces(Class[] managedInterfaces) { + public void setManagedInterfaces(Class[] managedInterfaces) { if (managedInterfaces != null) { for (Class ifc : managedInterfaces) { if (!ifc.isInterface()) { @@ -127,12 +127,12 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * @param mappings the specified interface mappings * @return the resolved interface mappings (with Class objects as values) */ - private Map resolveInterfaceMappings(Properties mappings) { - Map resolvedMappings = new HashMap(mappings.size()); - for (Enumeration en = mappings.propertyNames(); en.hasMoreElements();) { + private Map[]> resolveInterfaceMappings(Properties mappings) { + Map[]> resolvedMappings = new HashMap[]>(mappings.size()); + for (Enumeration en = mappings.propertyNames(); en.hasMoreElements();) { String beanKey = (String) en.nextElement(); String[] classNames = StringUtils.commaDelimitedListToStringArray(mappings.getProperty(beanKey)); - Class[] classes = resolveClassNames(classNames, beanKey); + Class[] classes = resolveClassNames(classNames, beanKey); resolvedMappings.put(beanKey, classes); } return resolvedMappings; @@ -144,10 +144,10 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * @param beanKey the bean key that the class names are associated with * @return the resolved Class */ - private Class[] resolveClassNames(String[] classNames, String beanKey) { - Class[] classes = new Class[classNames.length]; + private Class[] resolveClassNames(String[] classNames, String beanKey) { + Class[] classes = new Class[classNames.length]; for (int x = 0; x < classes.length; x++) { - Class cls = ClassUtils.resolveClassName(classNames[x].trim(), this.beanClassLoader); + Class cls = ClassUtils.resolveClassName(classNames[x].trim(), this.beanClassLoader); if (!cls.isInterface()) { throw new IllegalArgumentException( "Class [" + classNames[x] + "] mapped to bean key [" + beanKey + "] is no interface"); @@ -217,7 +217,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI * interface for the given bean. */ private boolean isDeclaredInInterface(Method method, String beanKey) { - Class[] ifaces = null; + Class[] ifaces = null; if (this.resolvedInterfaceMappings != null) { ifaces = this.resolvedInterfaceMappings.get(beanKey); @@ -231,7 +231,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI } if (ifaces != null) { - for (Class ifc : ifaces) { + for (Class ifc : ifaces) { for (Method ifcMethod : ifc.getMethods()) { if (ifcMethod.getName().equals(method.getName()) && Arrays.equals(ifcMethod.getParameterTypes(), method.getParameterTypes())) { diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java index c9925bc19a..32b2510901 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java @@ -263,7 +263,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem } MBeanParameterInfo[] parameterInfo = new MBeanParameterInfo[params.length]; - Class[] methodParameters = method.getParameterTypes(); + Class[] methodParameters = method.getParameterTypes(); for (int i = 0; i < params.length; i++) { ManagedOperationParameter param = params[i]; parameterInfo[i] = diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java index e092c221cd..33084bf17d 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java @@ -81,7 +81,7 @@ public class MethodExclusionMBeanInfoAssembler extends AbstractConfigurableMBean */ public void setIgnoredMethodMappings(Properties mappings) { this.ignoredMethodMappings = new HashMap>(); - for (Enumeration en = mappings.keys(); en.hasMoreElements();) { + for (Enumeration en = mappings.keys(); en.hasMoreElements();) { String beanKey = (String) en.nextElement(); String[] methodNames = StringUtils.commaDelimitedListToStringArray(mappings.getProperty(beanKey)); this.ignoredMethodMappings.put(beanKey, new HashSet(Arrays.asList(methodNames))); diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java index c4467ab58a..3df5350dfd 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java @@ -85,7 +85,7 @@ public class MethodNameBasedMBeanInfoAssembler extends AbstractConfigurableMBean */ public void setMethodMappings(Properties mappings) { this.methodMappings = new HashMap>(); - for (Enumeration en = mappings.keys(); en.hasMoreElements();) { + for (Enumeration en = mappings.keys(); en.hasMoreElements();) { String beanKey = (String) en.nextElement(); String[] methodNames = StringUtils.commaDelimitedListToStringArray(mappings.getProperty(beanKey)); this.methodMappings.put(beanKey, new HashSet(Arrays.asList(methodNames))); diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java index ea29cc1737..3175021f8b 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java @@ -50,7 +50,7 @@ public class IdentityNamingStrategy implements ObjectNamingStrategy { @Override public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException { String domain = ClassUtils.getPackageName(managedBean.getClass()); - Hashtable keys = new Hashtable(); + Hashtable keys = new Hashtable(); keys.put(TYPE_KEY, ClassUtils.getShortName(managedBean.getClass())); keys.put(HASH_CODE_KEY, ObjectUtils.getIdentityHexString(managedBean)); return ObjectNameManager.getInstance(domain, keys); diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java index f574256ef0..fde4adec67 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java @@ -108,7 +108,7 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin */ @Override public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException { - Class managedClass = AopUtils.getTargetClass(managedBean); + Class managedClass = AopUtils.getTargetClass(managedBean); ManagedResource mr = this.attributeSource.getManagedResource(managedClass); // Check that an object name has been specified. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java index 1308f35087..a4f84b0dd0 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java @@ -145,7 +145,7 @@ public abstract class JmxUtils { * @return the parameter types as classes * @throws ClassNotFoundException if a parameter type could not be resolved */ - public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo) throws ClassNotFoundException { + public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo) throws ClassNotFoundException { return parameterInfoToTypes(paramInfo, ClassUtils.getDefaultClassLoader()); } @@ -157,12 +157,12 @@ public abstract class JmxUtils { * @return the parameter types as classes * @throws ClassNotFoundException if a parameter type could not be resolved */ - public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo, ClassLoader classLoader) + public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo, ClassLoader classLoader) throws ClassNotFoundException { - Class[] types = null; + Class[] types = null; if (paramInfo != null && paramInfo.length > 0) { - types = new Class[paramInfo.length]; + types = new Class[paramInfo.length]; for (int x = 0; x < paramInfo.length; x++) { types[x] = ClassUtils.forName(paramInfo[x].getType(), classLoader); } @@ -178,7 +178,7 @@ public abstract class JmxUtils { * @return the signature as array of argument types */ public static String[] getMethodSignature(Method method) { - Class[] types = method.getParameterTypes(); + Class[] types = method.getParameterTypes(); String[] signature = new String[types.length]; for (int x = 0; x < types.length; x++) { signature[x] = types[x].getName(); @@ -282,7 +282,7 @@ public abstract class JmxUtils { return null; } String mbeanInterfaceName = clazz.getName() + MBEAN_SUFFIX; - Class[] implementedInterfaces = clazz.getInterfaces(); + Class[] implementedInterfaces = clazz.getInterfaces(); for (Class iface : implementedInterfaces) { if (iface.getName().equals(mbeanInterfaceName)) { return iface; @@ -302,7 +302,7 @@ public abstract class JmxUtils { if (clazz == null || clazz.getSuperclass() == null) { return null; } - Class[] implementedInterfaces = clazz.getInterfaces(); + Class[] implementedInterfaces = clazz.getInterfaces(); for (Class iface : implementedInterfaces) { boolean isMxBean = iface.getName().endsWith(MXBEAN_SUFFIX); if (mxBeanAnnotationAvailable) { diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java index 1cd564b193..c361480117 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java @@ -61,7 +61,7 @@ public class WebSphereMBeanServerFactoryBean implements FactoryBean /* * this.mbeanServer = AdminServiceFactory.getMBeanFactory().getMBeanServer(); */ - Class adminServiceClass = getClass().getClassLoader().loadClass(ADMIN_SERVICE_FACTORY_CLASS); + Class adminServiceClass = getClass().getClassLoader().loadClass(ADMIN_SERVICE_FACTORY_CLASS); Method getMBeanFactoryMethod = adminServiceClass.getMethod(GET_MBEAN_FACTORY_METHOD); Object mbeanFactory = getMBeanFactoryMethod.invoke(null); Method getMBeanServerMethod = mbeanFactory.getClass().getMethod(GET_MBEAN_SERVER_METHOD); diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java index e951469369..5e28a1b728 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java @@ -66,7 +66,7 @@ public class JndiObjectTargetSource extends JndiObjectLocator implements TargetS private Object cachedObject; - private Class targetClass; + private Class targetClass; /** diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java index 35f964fde8..d781a5d3c0 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java @@ -127,10 +127,10 @@ public class JndiTemplate { * @throws NamingException in case of initialization errors */ protected Context createInitialContext() throws NamingException { - Hashtable icEnv = null; + Hashtable icEnv = null; Properties env = getEnvironment(); if (env != null) { - icEnv = new Hashtable(env.size()); + icEnv = new Hashtable(env.size()); CollectionUtils.mergePropertiesIntoMap(env, icEnv); } return new InitialContext(icEnv); diff --git a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java index f5ec23bc46..c82108a912 100644 --- a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java +++ b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java @@ -29,9 +29,9 @@ import javax.naming.NamingException; @SuppressWarnings("serial") public class TypeMismatchNamingException extends NamingException { - private Class requiredType; + private Class requiredType; - private Class actualType; + private Class actualType; /** @@ -41,7 +41,7 @@ public class TypeMismatchNamingException extends NamingException { * @param requiredType the required type for the lookup * @param actualType the actual type that the lookup returned */ - public TypeMismatchNamingException(String jndiName, Class requiredType, Class actualType) { + public TypeMismatchNamingException(String jndiName, Class requiredType, Class actualType) { super("Object of type [" + actualType + "] available at JNDI location [" + jndiName + "] is not assignable to [" + requiredType.getName() + "]"); this.requiredType = requiredType; @@ -60,14 +60,14 @@ public class TypeMismatchNamingException extends NamingException { /** * Return the required type for the lookup, if available. */ - public final Class getRequiredType() { + public final Class getRequiredType() { return this.requiredType; } /** * Return the actual type that the lookup returned, if available. */ - public final Class getActualType() { + public final Class getActualType() { return this.actualType; } diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java index 555e1f4b91..1ced696bc9 100644 --- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java +++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java @@ -66,7 +66,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac private final Map singletonObjects = new HashMap(); /** Cache of the types of nonshareable resources: bean name --> bean type */ - private final Map resourceTypes = new HashMap(); + private final Map> resourceTypes = new HashMap>(); public SimpleJndiBeanFactory() { @@ -165,8 +165,8 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac } @Override - public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException { - Class type = getType(name); + public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException { + Class type = getType(name); return (targetType == null || (type != null && targetType.isAssignableFrom(type))); } @@ -206,7 +206,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac } } - private Class doGetType(String name) throws NamingException { + private Class doGetType(String name) throws NamingException { if (isSingleton(name)) { Object jndiObject = doGetSingleton(name, null); return (jndiObject != null ? jndiObject.getClass() : null); @@ -218,7 +218,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac } else { Object jndiObject = lookup(name, null); - Class type = (jndiObject != null ? jndiObject.getClass() : null); + Class type = (jndiObject != null ? jndiObject.getClass() : null); this.resourceTypes.put(name, type); return type; } diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java index 1bea9c145f..4bc3d794dc 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java @@ -100,7 +100,7 @@ public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStrea @Override - protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex) + protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex) throws IOException, ClassNotFoundException { // If codebaseUrl is set, try to load the class with the RMIClassLoader. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java index 6e193fe996..b461d23c23 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java @@ -78,7 +78,7 @@ import org.springframework.util.ReflectionUtils; */ public class JndiRmiClientInterceptor extends JndiObjectLocator implements MethodInterceptor, InitializingBean { - private Class serviceInterface; + private Class serviceInterface; private RemoteInvocationFactory remoteInvocationFactory = new DefaultRemoteInvocationFactory(); @@ -101,7 +101,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho *

Typically required to be able to create a suitable service proxy, * but can also be optional if the lookup returns a typed stub. */ - public void setServiceInterface(Class serviceInterface) { + public void setServiceInterface(Class serviceInterface) { if (serviceInterface != null && !serviceInterface.isInterface()) { throw new IllegalArgumentException("'serviceInterface' must be an interface"); } @@ -111,7 +111,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho /** * Return the interface of the service to access. */ - public Class getServiceInterface() { + public Class getServiceInterface() { return this.serviceInterface; } diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java index b5d2da6159..df766c67ce 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java @@ -59,7 +59,7 @@ class RmiInvocationWrapper implements RmiInvocationHandler { */ @Override public String getTargetInterfaceName() { - Class ifc = this.rmiExporter.getServiceInterface(); + Class ifc = this.rmiExporter.getServiceInterface(); return (ifc != null ? ifc.getName() : null); } diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java index 2cf59d0d74..7657a65593 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java @@ -36,7 +36,7 @@ package org.springframework.remoting.support; */ public abstract class RemoteAccessor extends RemotingSupport { - private Class serviceInterface; + private Class serviceInterface; /** @@ -45,7 +45,7 @@ public abstract class RemoteAccessor extends RemotingSupport { *

Typically required to be able to create a suitable service proxy, * but can also be optional if the lookup returns a typed proxy. */ - public void setServiceInterface(Class serviceInterface) { + public void setServiceInterface(Class serviceInterface) { if (serviceInterface != null && !serviceInterface.isInterface()) { throw new IllegalArgumentException("'serviceInterface' must be an interface"); } @@ -55,7 +55,7 @@ public abstract class RemoteAccessor extends RemotingSupport { /** * Return the interface of the service to access. */ - public Class getServiceInterface() { + public Class getServiceInterface() { return this.serviceInterface; } diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java index 91f87ff65d..ad84641953 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java @@ -36,7 +36,7 @@ public abstract class RemoteExporter extends RemotingSupport { private Object service; - private Class serviceInterface; + private Class serviceInterface; private Boolean registerTraceInterceptor; @@ -62,7 +62,7 @@ public abstract class RemoteExporter extends RemotingSupport { * Set the interface of the service to export. * The interface must be suitable for the particular service and remoting strategy. */ - public void setServiceInterface(Class serviceInterface) { + public void setServiceInterface(Class serviceInterface) { if (serviceInterface != null && !serviceInterface.isInterface()) { throw new IllegalArgumentException("'serviceInterface' must be an interface"); } @@ -72,7 +72,7 @@ public abstract class RemoteExporter extends RemotingSupport { /** * Return the interface of the service to export. */ - public Class getServiceInterface() { + public Class getServiceInterface() { return this.serviceInterface; } @@ -122,7 +122,7 @@ public abstract class RemoteExporter extends RemotingSupport { * @see #setService */ protected void checkServiceInterface() throws IllegalArgumentException { - Class serviceInterface = getServiceInterface(); + Class serviceInterface = getServiceInterface(); Object service = getService(); if (serviceInterface == null) { throw new IllegalArgumentException("Property 'serviceInterface' is required"); diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java index afb5dd37d4..677438f062 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java @@ -51,7 +51,7 @@ public class RemoteInvocation implements Serializable { private String methodName; - private Class[] parameterTypes; + private Class[] parameterTypes; private Object[] arguments; @@ -70,7 +70,7 @@ public class RemoteInvocation implements Serializable { * @param parameterTypes the parameter types of the method * @param arguments the arguments for the invocation */ - public RemoteInvocation(String methodName, Class[] parameterTypes, Object[] arguments) { + public RemoteInvocation(String methodName, Class[] parameterTypes, Object[] arguments) { this.methodName = methodName; this.parameterTypes = parameterTypes; this.arguments = arguments; @@ -104,14 +104,14 @@ public class RemoteInvocation implements Serializable { /** * Set the parameter types of the target method. */ - public void setParameterTypes(Class[] parameterTypes) { + public void setParameterTypes(Class[] parameterTypes) { this.parameterTypes = parameterTypes; } /** * Return the parameter types of the target method. */ - public Class[] getParameterTypes() { + public Class[] getParameterTypes() { return this.parameterTypes; } diff --git a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java index defd101789..ef46729cde 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java @@ -62,7 +62,7 @@ public interface TaskScheduler { * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * @see org.springframework.scheduling.support.CronTrigger */ - ScheduledFuture schedule(Runnable task, Trigger trigger); + ScheduledFuture schedule(Runnable task, Trigger trigger); /** * Schedule the given {@link Runnable}, invoking it at the specified execution time. @@ -75,7 +75,7 @@ public interface TaskScheduler { * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) */ - ScheduledFuture schedule(Runnable task, Date startTime); + ScheduledFuture schedule(Runnable task, Date startTime); /** * Schedule the given {@link Runnable}, invoking it at the specified execution time @@ -90,7 +90,7 @@ public interface TaskScheduler { * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) */ - ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period); + ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period); /** * Schedule the given {@link Runnable}, starting as soon as possible and @@ -103,7 +103,7 @@ public interface TaskScheduler { * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) */ - ScheduledFuture scheduleAtFixedRate(Runnable task, long period); + ScheduledFuture scheduleAtFixedRate(Runnable task, long period); /** * Schedule the given {@link Runnable}, invoking it at the specified execution time @@ -120,7 +120,7 @@ public interface TaskScheduler { * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) */ - ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay); + ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay); /** * Schedule the given {@link Runnable}, starting as soon as possible and @@ -134,6 +134,6 @@ public interface TaskScheduler { * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) */ - ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay); + ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay); } diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java index e07d5b8ee2..27c6e1ee7f 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java @@ -160,7 +160,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T @Override - public ScheduledFuture schedule(Runnable task, Trigger trigger) { + public ScheduledFuture schedule(Runnable task, Trigger trigger) { try { if (this.enterpriseConcurrentScheduler) { return new EnterpriseConcurrentTriggerScheduler().schedule(decorateTask(task, true), trigger); @@ -176,7 +176,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public ScheduledFuture schedule(Runnable task, Date startTime) { + public ScheduledFuture schedule(Runnable task, Date startTime) { long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { return this.scheduledExecutor.schedule(decorateTask(task, false), initialDelay, TimeUnit.MILLISECONDS); @@ -187,7 +187,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { return this.scheduledExecutor.scheduleAtFixedRate(decorateTask(task, true), initialDelay, period, TimeUnit.MILLISECONDS); @@ -198,7 +198,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { try { return this.scheduledExecutor.scheduleAtFixedRate(decorateTask(task, true), 0, period, TimeUnit.MILLISECONDS); } @@ -208,7 +208,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { return this.scheduledExecutor.scheduleWithFixedDelay(decorateTask(task, true), initialDelay, delay, TimeUnit.MILLISECONDS); @@ -219,7 +219,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { try { return this.scheduledExecutor.scheduleWithFixedDelay(decorateTask(task, true), 0, delay, TimeUnit.MILLISECONDS); } @@ -243,7 +243,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T */ private class EnterpriseConcurrentTriggerScheduler { - public ScheduledFuture schedule(Runnable task, final Trigger trigger) { + public ScheduledFuture schedule(Runnable task, final Trigger trigger) { ManagedScheduledExecutorService executor = (ManagedScheduledExecutorService) scheduledExecutor; return executor.schedule(task, new javax.enterprise.concurrent.Trigger() { @Override diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java index 37af5d3fc7..3eb676466d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java @@ -41,6 +41,7 @@ import org.springframework.jndi.JndiTemplate; * @author Juergen Hoeller * @since 4.0 */ +@SuppressWarnings("serial") public class DefaultManagedAwareThreadFactory extends CustomizableThreadFactory implements InitializingBean { protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java index ff199f1609..0a3e6ecdd9 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java @@ -49,7 +49,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc private final ScheduledExecutorService executor; - private ScheduledFuture currentFuture; + private ScheduledFuture currentFuture; private Date scheduledExecutionTime; @@ -63,7 +63,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc } - public ScheduledFuture schedule() { + public ScheduledFuture schedule() { synchronized (this.triggerContextMonitor) { this.scheduledExecutionTime = this.trigger.nextExecutionTime(this.triggerContext); if (this.scheduledExecutionTime == null) { @@ -112,7 +112,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc @Override public Object get() throws InterruptedException, ExecutionException { - ScheduledFuture curr; + ScheduledFuture curr; synchronized (this.triggerContextMonitor) { curr = this.currentFuture; } @@ -121,7 +121,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc @Override public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { - ScheduledFuture curr; + ScheduledFuture curr; synchronized (this.triggerContextMonitor) { curr = this.currentFuture; } @@ -130,7 +130,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc @Override public long getDelay(TimeUnit unit) { - ScheduledFuture curr; + ScheduledFuture curr; synchronized (this.triggerContextMonitor) { curr = this.currentFuture; } diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index 6ba108732b..e9cfddd75f 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -209,7 +209,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport // TaskScheduler implementation @Override - public ScheduledFuture schedule(Runnable task, Trigger trigger) { + public ScheduledFuture schedule(Runnable task, Trigger trigger) { ScheduledExecutorService executor = getScheduledExecutor(); try { ErrorHandler errorHandler = @@ -222,7 +222,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public ScheduledFuture schedule(Runnable task, Date startTime) { + public ScheduledFuture schedule(Runnable task, Date startTime) { ScheduledExecutorService executor = getScheduledExecutor(); long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { @@ -234,7 +234,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) { ScheduledExecutorService executor = getScheduledExecutor(); long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { @@ -246,7 +246,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { + public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) { ScheduledExecutorService executor = getScheduledExecutor(); try { return executor.scheduleAtFixedRate(errorHandlingTask(task, true), 0, period, TimeUnit.MILLISECONDS); @@ -257,7 +257,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) { ScheduledExecutorService executor = getScheduledExecutor(); long initialDelay = startTime.getTime() - System.currentTimeMillis(); try { @@ -269,7 +269,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { + public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) { ScheduledExecutorService executor = getScheduledExecutor(); try { return executor.scheduleWithFixedDelay(errorHandlingTask(task, true), 0, delay, TimeUnit.MILLISECONDS); diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java index 278e051298..d0e63c6020 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java @@ -132,7 +132,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware { if (result instanceof Class) { // A Class: We'll cache the Class here and create an instance // outside of the synchronized block. - this.scriptClass = (Class) result; + this.scriptClass = (Class) result; } else { // Not a Class: OK, we'll simply create BeanShell objects diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java index a7562ee308..5fb732dc41 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java @@ -89,7 +89,7 @@ public abstract class BshScriptUtils { Object result = evaluateBshScript(scriptSource, scriptInterfaces, classLoader); if (result instanceof Class) { - Class clazz = (Class) result; + Class clazz = (Class) result; try { return clazz.newInstance(); } @@ -120,7 +120,7 @@ public abstract class BshScriptUtils { interpreter.setClassLoader(classLoader); Object result = interpreter.eval(scriptSource); if (result instanceof Class) { - return (Class) result; + return (Class) result; } else if (result != null) { return result.getClass(); diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java index f12e4004bf..de5aa7ea9d 100644 --- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java @@ -213,7 +213,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { */ private String resolveScriptSource(Element element, XmlReaderContext readerContext) { boolean hasScriptSource = element.hasAttribute(SCRIPT_SOURCE_ATTRIBUTE); - List elements = DomUtils.getChildElementsByTagName(element, INLINE_SCRIPT_ELEMENT); + List elements = DomUtils.getChildElementsByTagName(element, INLINE_SCRIPT_ELEMENT); if (hasScriptSource && !elements.isEmpty()) { readerContext.error("Only one of 'script-source' and 'inline-script' should be specified.", element); return null; @@ -222,7 +222,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { return element.getAttribute(SCRIPT_SOURCE_ATTRIBUTE); } else if (!elements.isEmpty()) { - Element inlineElement = (Element) elements.get(0); + Element inlineElement = elements.get(0); return "inline:" + DomUtils.getTextValue(inlineElement); } else { diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java index fcee64821e..2530ae4ad5 100644 --- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java @@ -206,7 +206,7 @@ public abstract class JRubyScriptUtils { return rubyArgs; } - private Object convertFromRuby(IRubyObject rubyResult, Class returnType) { + private Object convertFromRuby(IRubyObject rubyResult, Class returnType) { Object result = JavaEmbedUtils.rubyToJava(this.ruby, rubyResult, returnType); if (result instanceof RubyArray && returnType.isArray()) { result = convertFromRubyArray(((RubyArray) result).toJavaArray(), returnType); @@ -214,8 +214,8 @@ public abstract class JRubyScriptUtils { return result; } - private Object convertFromRubyArray(IRubyObject[] rubyArray, Class returnType) { - Class targetType = returnType.getComponentType(); + private Object convertFromRubyArray(IRubyObject[] rubyArray, Class returnType) { + Class targetType = returnType.getComponentType(); Object javaArray = Array.newInstance(targetType, rubyArray.length); for (int i = 0; i < rubyArray.length; i++) { IRubyObject rubyObject = rubyArray[i]; diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java index 84ea6a9d27..2314ac9d1a 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java @@ -239,7 +239,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces } @Override - public Class predictBeanType(Class beanClass, String beanName) { + public Class predictBeanType(Class beanClass, String beanName) { // We only apply special treatment to ScriptFactory implementations here. if (!ScriptFactory.class.isAssignableFrom(beanClass)) { return null; @@ -254,9 +254,9 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces ScriptFactory scriptFactory = this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class); ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator()); - Class[] interfaces = scriptFactory.getScriptInterfaces(); + Class[] interfaces = scriptFactory.getScriptInterfaces(); - Class scriptedType = scriptFactory.getScriptedObjectType(scriptSource); + Class scriptedType = scriptFactory.getScriptedObjectType(scriptSource); if (scriptedType != null) { return scriptedType; } else if (!ObjectUtils.isEmpty(interfaces)) { @@ -287,7 +287,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces } @Override - public Object postProcessBeforeInstantiation(Class beanClass, String beanName) { + public Object postProcessBeforeInstantiation(Class beanClass, String beanName) { // We only apply special treatment to ScriptFactory implementations here. if (!ScriptFactory.class.isAssignableFrom(beanClass)) { return null; @@ -302,7 +302,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator()); boolean isFactoryBean = false; try { - Class scriptedObjectType = scriptFactory.getScriptedObjectType(scriptSource); + Class scriptedObjectType = scriptFactory.getScriptedObjectType(scriptSource); // Returned type may be null if the factory is unable to determine the type. if (scriptedObjectType != null) { isFactoryBean = FactoryBean.class.isAssignableFrom(scriptedObjectType); @@ -314,7 +314,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces long refreshCheckDelay = resolveRefreshCheckDelay(bd); if (refreshCheckDelay >= 0) { - Class[] interfaces = scriptFactory.getScriptInterfaces(); + Class[] interfaces = scriptFactory.getScriptInterfaces(); RefreshableScriptTargetSource ts = new RefreshableScriptTargetSource(this.scriptBeanFactory, scriptedObjectBeanName, scriptFactory, scriptSource, isFactoryBean); boolean proxyTargetClass = resolveProxyTargetClass(bd); @@ -482,12 +482,12 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces * @see org.springframework.cglib.proxy.InterfaceMaker * @see org.springframework.beans.BeanUtils#findPropertyType */ - protected Class createConfigInterface(BeanDefinition bd, Class[] interfaces) { + protected Class createConfigInterface(BeanDefinition bd, Class[] interfaces) { InterfaceMaker maker = new InterfaceMaker(); PropertyValue[] pvs = bd.getPropertyValues().getPropertyValues(); for (PropertyValue pv : pvs) { String propertyName = pv.getName(); - Class propertyType = BeanUtils.findPropertyType(propertyName, interfaces); + Class propertyType = BeanUtils.findPropertyType(propertyName, interfaces); String setterName = "set" + StringUtils.capitalize(propertyName); Signature signature = new Signature(setterName, Type.VOID_TYPE, new Type[] { Type.getType(propertyType) }); maker.add(signature, new Type[0]); @@ -515,7 +515,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces * @return the merged interface as Class * @see java.lang.reflect.Proxy#getProxyClass */ - protected Class createCompositeInterface(Class[] interfaces) { + protected Class createCompositeInterface(Class[] interfaces) { return ClassUtils.createCompositeInterface(interfaces, this.beanClassLoader); } @@ -531,7 +531,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces * @see org.springframework.scripting.ScriptFactory#getScriptedObject */ protected BeanDefinition createScriptedObjectBeanDefinition(BeanDefinition bd, String scriptFactoryBeanName, - ScriptSource scriptSource, Class[] interfaces) { + ScriptSource scriptSource, Class[] interfaces) { GenericBeanDefinition objectBd = new GenericBeanDefinition(bd); objectBd.setFactoryBeanName(scriptFactoryBeanName); @@ -550,7 +550,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces * @return the generated proxy * @see RefreshableScriptTargetSource */ - protected Object createRefreshableProxy(TargetSource ts, Class[] interfaces, boolean proxyTargetClass) { + protected Object createRefreshableProxy(TargetSource ts, Class[] interfaces, boolean proxyTargetClass) { ProxyFactory proxyFactory = new ProxyFactory(); proxyFactory.setTargetSource(ts); ClassLoader classLoader = this.beanClassLoader; diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java index 532dcdae62..755fe59811 100644 --- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java +++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java @@ -89,7 +89,7 @@ public class ModelMap extends LinkedHashMap { */ public ModelMap addAttribute(Object attributeValue) { Assert.notNull(attributeValue, "Model object must not be null"); - if (attributeValue instanceof Collection && ((Collection) attributeValue).isEmpty()) { + if (attributeValue instanceof Collection && ((Collection) attributeValue).isEmpty()) { return this; } return addAttribute(Conventions.getVariableName(attributeValue), attributeValue); diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java index 27126bd50e..32b1513149 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java @@ -261,7 +261,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter setTargetValidator(this.validatorFactory.getValidator()); } - private void configureParameterNameProviderIfPossible(Configuration configuration) { + private void configureParameterNameProviderIfPossible(Configuration configuration) { try { Class parameterNameProviderClass = ClassUtils.forName("javax.validation.ParameterNameProvider", getClass().getClassLoader()); @@ -271,13 +271,13 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter Configuration.class.getMethod("getDefaultParameterNameProvider"), configuration); final ParameterNameDiscoverer discoverer = this.parameterNameDiscoverer; Object parameterNameProvider = Proxy.newProxyInstance(getClass().getClassLoader(), - new Class[] {parameterNameProviderClass}, new InvocationHandler() { + new Class[] {parameterNameProviderClass}, new InvocationHandler() { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (method.getName().equals("getParameterNames")) { String[] result = null; if (args[0] instanceof Constructor) { - result = discoverer.getParameterNames((Constructor) args[0]); + result = discoverer.getParameterNames((Constructor) args[0]); } else if (args[0] instanceof Method) { result = discoverer.getParameterNames((Method) args[0]); @@ -320,7 +320,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter * @param configuration the Configuration object, pre-populated with * settings driven by LocalValidatorFactoryBean's properties */ - protected void postProcessConfiguration(Configuration configuration) { + protected void postProcessConfiguration(Configuration configuration) { } diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java index f0c5fd30c0..319095a16d 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java @@ -18,6 +18,7 @@ package org.springframework.validation.beanvalidation; import java.lang.reflect.Method; import java.util.Set; + import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validation; @@ -27,10 +28,6 @@ import javax.validation.ValidatorFactory; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.hibernate.validator.HibernateValidator; -import org.hibernate.validator.method.MethodConstraintViolation; -import org.hibernate.validator.method.MethodConstraintViolationException; -import org.hibernate.validator.method.MethodValidator; - import org.springframework.core.annotation.AnnotationUtils; import org.springframework.util.ReflectionUtils; import org.springframework.validation.annotation.Validated; @@ -113,7 +110,7 @@ public class MethodValidationInterceptor implements MethodInterceptor { @Override @SuppressWarnings("unchecked") public Object invoke(MethodInvocation invocation) throws Throwable { - Class[] groups = determineValidationGroups(invocation); + Class[] groups = determineValidationGroups(invocation); if (forExecutablesMethod != null) { Object executableValidator = ReflectionUtils.invokeMethod(forExecutablesMethod, this.validator); Set> result = (Set>) @@ -143,9 +140,9 @@ public class MethodValidationInterceptor implements MethodInterceptor { * @param invocation the current MethodInvocation * @return the applicable validation groups as a Class array */ - protected Class[] determineValidationGroups(MethodInvocation invocation) { + protected Class[] determineValidationGroups(MethodInvocation invocation) { Validated valid = AnnotationUtils.findAnnotation(invocation.getThis().getClass(), Validated.class); - return (valid != null ? valid.value() : new Class[0]); + return (valid != null ? valid.value() : new Class[0]); } @@ -158,23 +155,23 @@ public class MethodValidationInterceptor implements MethodInterceptor { return Validation.byProvider(HibernateValidator.class).configure().buildValidatorFactory(); } - public static Object invokeWithinValidation(MethodInvocation invocation, Validator validator, Class[] groups) + @SuppressWarnings("deprecation") + public static Object invokeWithinValidation(MethodInvocation invocation, Validator validator, Class[] groups) throws Throwable { - MethodValidator methodValidator = validator.unwrap(MethodValidator.class); - Set> result = methodValidator.validateAllParameters( + org.hibernate.validator.method.MethodValidator methodValidator = validator.unwrap(org.hibernate.validator.method.MethodValidator.class); + Set> result = methodValidator.validateAllParameters( invocation.getThis(), invocation.getMethod(), invocation.getArguments(), groups); if (!result.isEmpty()) { - throw new MethodConstraintViolationException(result); + throw new org.hibernate.validator.method.MethodConstraintViolationException(result); } Object returnValue = invocation.proceed(); result = methodValidator.validateReturnValue( invocation.getThis(), invocation.getMethod(), returnValue, groups); if (!result.isEmpty()) { - throw new MethodConstraintViolationException(result); + throw new org.hibernate.validator.method.MethodConstraintViolationException(result); } return returnValue; } } - } diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java index b9553992c3..f0a310ea7c 100644 --- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java +++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java @@ -44,7 +44,7 @@ public class BindingAwareModelMap extends ExtendedModelMap { @Override public void putAll(Map map) { - for (Map.Entry entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { removeBindingResultIfNecessary(entry.getKey(), entry.getValue()); } super.putAll(map); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java index 485d7db7b5..4f35f84ee0 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java @@ -193,6 +193,11 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri return MethodMatcher.TRUE; } + @Override + public int hashCode() { + return 0; + } + @Override public boolean equals(Object obj) { return true; diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java index ecfea14839..2f3c5aff4a 100644 --- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java @@ -177,6 +177,7 @@ public class PropertySourcesPlaceholderConfigurerTests { } @Test(expected=BeanDefinitionStoreException.class) + @SuppressWarnings("serial") public void nestedUnresolvablePlaceholder() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerBeanDefinition("testBean", @@ -192,6 +193,7 @@ public class PropertySourcesPlaceholderConfigurerTests { } @Test + @SuppressWarnings("serial") public void ignoredNestedUnresolvablePlaceholder() { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.registerBeanDefinition("testBean", diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java index 491706f9e3..b2bf33ff49 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java @@ -25,6 +25,7 @@ import static org.junit.Assert.*; /** * @author Juergen Hoeller */ +@SuppressWarnings("deprecation") public class CronSequenceGeneratorTests { @Test diff --git a/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java b/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java index 7de1b04ab2..18c926c3de 100644 --- a/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java +++ b/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java @@ -38,10 +38,10 @@ public class MemorySafeUndeclaredThrowableStrategy extends DefaultGeneratorStrat }; - private Class wrapper; + private Class wrapper; - public MemorySafeUndeclaredThrowableStrategy(Class wrapper) { + public MemorySafeUndeclaredThrowableStrategy(Class wrapper) { this.wrapper = wrapper; } diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java index d0cf60aa83..75d1b8a3fe 100644 --- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java +++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java @@ -140,7 +140,7 @@ public abstract class BridgeMethodResolver { */ private static Method findGenericDeclaration(Method bridgeMethod) { // Search parent types for method that has same signature as bridge. - Class superclass = bridgeMethod.getDeclaringClass().getSuperclass(); + Class superclass = bridgeMethod.getDeclaringClass().getSuperclass(); while (superclass != null && !Object.class.equals(superclass)) { Method method = searchForMatch(superclass, bridgeMethod); if (method != null && !method.isBridge()) { @@ -150,8 +150,8 @@ public abstract class BridgeMethodResolver { } // Search interfaces. - Class[] interfaces = ClassUtils.getAllInterfacesForClass(bridgeMethod.getDeclaringClass()); - for (Class ifc : interfaces) { + Class[] interfaces = ClassUtils.getAllInterfacesForClass(bridgeMethod.getDeclaringClass()); + for (Class ifc : interfaces) { Method method = searchForMatch(ifc, bridgeMethod); if (method != null && !method.isBridge()) { return method; @@ -170,13 +170,13 @@ public abstract class BridgeMethodResolver { private static boolean isResolvedTypeMatch( Method genericMethod, Method candidateMethod, Class declaringClass) { Type[] genericParameters = genericMethod.getGenericParameterTypes(); - Class[] candidateParameters = candidateMethod.getParameterTypes(); + Class[] candidateParameters = candidateMethod.getParameterTypes(); if (genericParameters.length != candidateParameters.length) { return false; } for (int i = 0; i < candidateParameters.length; i++) { ResolvableType genericParameter = ResolvableType.forMethodParameter(genericMethod, i, declaringClass); - Class candidateParameter = candidateParameters[i]; + Class candidateParameter = candidateParameters[i]; if (candidateParameter.isArray()) { // An array type: compare the component type. if (!candidateParameter.getComponentType().equals(genericParameter.getComponentType().resolve(Object.class))) { @@ -196,7 +196,7 @@ public abstract class BridgeMethodResolver { * that of the supplied {@link Method}, then this matching {@link Method} is returned, * otherwise {@code null} is returned. */ - private static Method searchForMatch(Class type, Method bridgeMethod) { + private static Method searchForMatch(Class type, Method bridgeMethod) { return ReflectionUtils.findMethod(type, bridgeMethod.getName(), bridgeMethod.getParameterTypes()); } diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java index 0bc831ccb9..1a898cbffa 100644 --- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java +++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java @@ -50,13 +50,13 @@ import org.springframework.util.MultiValueMap; */ public abstract class CollectionFactory { - private static Class navigableSetClass = null; + private static Class navigableSetClass = null; - private static Class navigableMapClass = null; + private static Class navigableMapClass = null; - private static final Set approximableCollectionTypes = new HashSet(10); + private static final Set> approximableCollectionTypes = new HashSet>(10); - private static final Set approximableMapTypes = new HashSet(6); + private static final Set> approximableMapTypes = new HashSet>(6); static { @@ -105,18 +105,18 @@ public abstract class CollectionFactory { * @see java.util.LinkedHashSet */ @SuppressWarnings("unchecked") - public static Collection createApproximateCollection(Object collection, int initialCapacity) { + public static Collection createApproximateCollection(Object collection, int initialCapacity) { if (collection instanceof LinkedList) { - return new LinkedList(); + return new LinkedList(); } else if (collection instanceof List) { - return new ArrayList(initialCapacity); + return new ArrayList(initialCapacity); } else if (collection instanceof SortedSet) { - return new TreeSet(((SortedSet) collection).comparator()); + return new TreeSet(((SortedSet) collection).comparator()); } else { - return new LinkedHashSet(initialCapacity); + return new LinkedHashSet(initialCapacity); } } @@ -131,16 +131,17 @@ public abstract class CollectionFactory { * @see java.util.TreeSet * @see java.util.LinkedHashSet */ - public static Collection createCollection(Class collectionType, int initialCapacity) { + @SuppressWarnings("unchecked") + public static Collection createCollection(Class collectionType, int initialCapacity) { if (collectionType.isInterface()) { if (List.class.equals(collectionType)) { - return new ArrayList(initialCapacity); + return new ArrayList(initialCapacity); } else if (SortedSet.class.equals(collectionType) || collectionType.equals(navigableSetClass)) { - return new TreeSet(); + return new TreeSet(); } else if (Set.class.equals(collectionType) || Collection.class.equals(collectionType)) { - return new LinkedHashSet(initialCapacity); + return new LinkedHashSet(initialCapacity); } else { throw new IllegalArgumentException("Unsupported Collection interface: " + collectionType.getName()); @@ -151,7 +152,7 @@ public abstract class CollectionFactory { throw new IllegalArgumentException("Unsupported Collection type: " + collectionType.getName()); } try { - return (Collection) collectionType.newInstance(); + return (Collection) collectionType.newInstance(); } catch (Exception ex) { throw new IllegalArgumentException("Could not instantiate Collection type: " + @@ -181,12 +182,12 @@ public abstract class CollectionFactory { * @see java.util.LinkedHashMap */ @SuppressWarnings("unchecked") - public static Map createApproximateMap(Object map, int initialCapacity) { + public static Map createApproximateMap(Object map, int initialCapacity) { if (map instanceof SortedMap) { - return new TreeMap(((SortedMap) map).comparator()); + return new TreeMap(((SortedMap) map).comparator()); } else { - return new LinkedHashMap(initialCapacity); + return new LinkedHashMap(initialCapacity); } } @@ -199,13 +200,14 @@ public abstract class CollectionFactory { * @see java.util.TreeMap * @see java.util.LinkedHashMap */ - public static Map createMap(Class mapType, int initialCapacity) { + @SuppressWarnings({ "unchecked", "rawtypes" }) + public static Map createMap(Class mapType, int initialCapacity) { if (mapType.isInterface()) { if (Map.class.equals(mapType)) { - return new LinkedHashMap(initialCapacity); + return new LinkedHashMap(initialCapacity); } else if (SortedMap.class.equals(mapType) || mapType.equals(navigableMapClass)) { - return new TreeMap(); + return new TreeMap(); } else if (MultiValueMap.class.equals(mapType)) { return new LinkedMultiValueMap(); @@ -219,7 +221,7 @@ public abstract class CollectionFactory { throw new IllegalArgumentException("Unsupported Map type: " + mapType.getName()); } try { - return (Map) mapType.newInstance(); + return (Map) mapType.newInstance(); } catch (Exception ex) { throw new IllegalArgumentException("Could not instantiate Map type: " + diff --git a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java index 4d48b0449d..5af282f61d 100644 --- a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java +++ b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java @@ -68,7 +68,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream { @Override - protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { + protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { try { if (this.classLoader != null) { // Use the specified ClassLoader to resolve local classes. @@ -85,13 +85,13 @@ public class ConfigurableObjectInputStream extends ObjectInputStream { } @Override - protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException { + protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException { if (!this.acceptProxyClasses) { throw new NotSerializableException("Not allowed to accept serialized proxy classes"); } if (this.classLoader != null) { // Use the specified ClassLoader to resolve local proxy classes. - Class[] resolvedInterfaces = new Class[interfaces.length]; + Class[] resolvedInterfaces = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { try { resolvedInterfaces[i] = ClassUtils.forName(interfaces[i], this.classLoader); @@ -113,7 +113,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream { return super.resolveProxyClass(interfaces); } catch (ClassNotFoundException ex) { - Class[] resolvedInterfaces = new Class[interfaces.length]; + Class[] resolvedInterfaces = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { resolvedInterfaces[i] = resolveFallbackIfPossible(interfaces[i], ex); } @@ -131,7 +131,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream { * @param ex the original exception thrown when attempting to load the class * @return the newly resolved class (never {@code null}) */ - protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex) + protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex) throws IOException, ClassNotFoundException{ throw ex; diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlow.java b/spring-core/src/main/java/org/springframework/core/ControlFlow.java index bc754211b5..a650c6cb40 100644 --- a/spring-core/src/main/java/org/springframework/core/ControlFlow.java +++ b/spring-core/src/main/java/org/springframework/core/ControlFlow.java @@ -31,7 +31,7 @@ public interface ControlFlow { * according to the current stack trace. * @param clazz the clazz to look for */ - boolean under(Class clazz); + boolean under(Class clazz); /** * Detect whether we're under the given class and method, @@ -39,7 +39,7 @@ public interface ControlFlow { * @param clazz the clazz to look for * @param methodName the name of the method to look for */ - boolean under(Class clazz, String methodName); + boolean under(Class clazz, String methodName); /** * Detect whether the current stack trace contains the given token. diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java index 4860b5f4ee..167de0f7e0 100644 --- a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java +++ b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java @@ -62,7 +62,7 @@ public abstract class ControlFlowFactory { * Searches for class name match in a StackTraceElement. */ @Override - public boolean under(Class clazz) { + public boolean under(Class clazz) { Assert.notNull(clazz, "Class must not be null"); String className = clazz.getName(); for (int i = 0; i < stack.length; i++) { @@ -78,7 +78,7 @@ public abstract class ControlFlowFactory { * in a StackTraceElement. */ @Override - public boolean under(Class clazz, String methodName) { + public boolean under(Class clazz, String methodName) { Assert.notNull(clazz, "Class must not be null"); Assert.notNull(methodName, "Method name must not be null"); String className = clazz.getName(); diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java index 7ea7c825b0..99e3406f7a 100644 --- a/spring-core/src/main/java/org/springframework/core/Conventions.java +++ b/spring-core/src/main/java/org/springframework/core/Conventions.java @@ -20,7 +20,9 @@ import java.io.Externalizable; import java.io.Serializable; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -43,18 +45,18 @@ public abstract class Conventions { */ private static final String PLURAL_SUFFIX = "List"; - /** * Set of interfaces that are supposed to be ignored * when searching for the 'primary' interface of a proxy. */ - private static final Set ignoredInterfaces = new HashSet(); - + private static final Set> IGNORED_INTERFACES; static { - ignoredInterfaces.add(Serializable.class); - ignoredInterfaces.add(Externalizable.class); - ignoredInterfaces.add(Cloneable.class); - ignoredInterfaces.add(Comparable.class); + IGNORED_INTERFACES = Collections.unmodifiableSet( + new HashSet>(Arrays.> asList( + Serializable.class, + Externalizable.class, + Cloneable.class, + Comparable.class))); } @@ -75,7 +77,7 @@ public abstract class Conventions { */ public static String getVariableName(Object value) { Assert.notNull(value, "Value must not be null"); - Class valueClass; + Class valueClass; boolean pluralize = false; if (value.getClass().isArray()) { @@ -83,7 +85,7 @@ public abstract class Conventions { pluralize = true; } else if (value instanceof Collection) { - Collection collection = (Collection) value; + Collection collection = (Collection) value; if (collection.isEmpty()) { throw new IllegalArgumentException("Cannot generate variable name for an empty Collection"); } @@ -107,7 +109,7 @@ public abstract class Conventions { */ public static String getVariableNameForParameter(MethodParameter parameter) { Assert.notNull(parameter, "MethodParameter must not be null"); - Class valueClass; + Class valueClass; boolean pluralize = false; if (parameter.getParameterType().isArray()) { @@ -163,7 +165,7 @@ public abstract class Conventions { * @param value the return value (may be {@code null} if not available) * @return the generated variable name */ - public static String getVariableNameForReturnType(Method method, Class resolvedType, Object value) { + public static String getVariableNameForReturnType(Method method, Class resolvedType, Object value) { Assert.notNull(method, "Method must not be null"); if (Object.class.equals(resolvedType)) { @@ -173,7 +175,7 @@ public abstract class Conventions { return getVariableName(value); } - Class valueClass; + Class valueClass; boolean pluralize = false; if (resolvedType.isArray()) { @@ -187,7 +189,7 @@ public abstract class Conventions { throw new IllegalArgumentException( "Cannot generate variable name for non-typed Collection return type and a non-Collection value"); } - Collection collection = (Collection) value; + Collection collection = (Collection) value; if (collection.isEmpty()) { throw new IllegalArgumentException( "Cannot generate variable name for non-typed Collection return type and an empty Collection value"); @@ -239,7 +241,7 @@ public abstract class Conventions { * the attribute name '{@code foo}' qualified by {@link Class} '{@code com.myapp.SomeClass}' * would be '{@code com.myapp.SomeClass.foo}' */ - public static String getQualifiedAttributeName(Class enclosingClass, String attributeName) { + public static String getQualifiedAttributeName(Class enclosingClass, String attributeName) { Assert.notNull(enclosingClass, "'enclosingClass' must not be null"); Assert.notNull(attributeName, "'attributeName' must not be null"); return enclosingClass.getName() + "." + attributeName; @@ -255,12 +257,12 @@ public abstract class Conventions { * @param value the value to check * @return the class to use for naming a variable */ - private static Class getClassForValue(Object value) { - Class valueClass = value.getClass(); + private static Class getClassForValue(Object value) { + Class valueClass = value.getClass(); if (Proxy.isProxyClass(valueClass)) { - Class[] ifcs = valueClass.getInterfaces(); - for (Class ifc : ifcs) { - if (!ignoredInterfaces.contains(ifc)) { + Class[] ifcs = valueClass.getInterfaces(); + for (Class ifc : ifcs) { + if (!IGNORED_INTERFACES.contains(ifc)) { return ifc; } } @@ -285,13 +287,13 @@ public abstract class Conventions { * The exact element for which the {@code Class} is retreived will depend * on the concrete {@code Collection} implementation. */ - private static Object peekAhead(Collection collection) { - Iterator it = collection.iterator(); + private static E peekAhead(Collection collection) { + Iterator it = collection.iterator(); if (!it.hasNext()) { throw new IllegalStateException( "Unable to peek ahead in non-empty collection - no element found"); } - Object value = it.next(); + E value = it.next(); if (value == null) { throw new IllegalStateException( "Unable to peek ahead in non-empty collection - only null element found"); diff --git a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java index 8336678e26..ca014d8985 100644 --- a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java +++ b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java @@ -62,7 +62,7 @@ public class ExceptionDepthComparator implements Comparator declaredException, Class exceptionToMatch, int depth) { if (declaredException.equals(exceptionToMatch)) { // Found it! return depth; diff --git a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java index e464adc4e4..22d2a873fd 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java @@ -41,6 +41,7 @@ public abstract class GenericCollectionTypeResolver { * @param collectionClass the collection class to introspect * @return the generic type, or {@code null} if none */ + @SuppressWarnings("rawtypes") public static Class getCollectionType(Class collectionClass) { return ResolvableType.forClass(collectionClass).asCollection().resolveGeneric(); } @@ -51,6 +52,7 @@ public abstract class GenericCollectionTypeResolver { * @param mapClass the map class to introspect * @return the generic type, or {@code null} if none */ + @SuppressWarnings("rawtypes") public static Class getMapKeyType(Class mapClass) { return ResolvableType.forClass(mapClass).asMap().resolveGeneric(0); } @@ -61,6 +63,7 @@ public abstract class GenericCollectionTypeResolver { * @param mapClass the map class to introspect * @return the generic type, or {@code null} if none */ + @SuppressWarnings("rawtypes") public static Class getMapValueType(Class mapClass) { return ResolvableType.forClass(mapClass).asMap().resolveGeneric(1); } diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index 9b8731a752..3cdee34780 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -44,8 +44,9 @@ import org.springframework.util.ConcurrentReferenceHashMap; public abstract class GenericTypeResolver { /** Cache from Class to TypeVariable Map */ - private static final Map> typeVariableCache = - new ConcurrentReferenceHashMap>(); + @SuppressWarnings("rawtypes") + private static final Map, Map> typeVariableCache = + new ConcurrentReferenceHashMap, Map>(); /** @@ -256,6 +257,7 @@ public abstract class GenericTypeResolver { * @deprecated as of Spring 4.0 in favor of {@link ResolvableType} */ @Deprecated + @SuppressWarnings("rawtypes") public static Class resolveType(Type genericType, Map map) { return ResolvableType.forType(genericType, new TypeVariableMapVariableResolver(map)).resolve(Object.class); } @@ -267,6 +269,7 @@ public abstract class GenericTypeResolver { * @deprecated as of Spring 4.0 in favor of {@link ResolvableType} */ @Deprecated + @SuppressWarnings("rawtypes") public static Map getTypeVariableMap(Class clazz) { Map typeVariableMap = typeVariableCache.get(clazz); if (typeVariableMap == null) { @@ -277,6 +280,7 @@ public abstract class GenericTypeResolver { return typeVariableMap; } + @SuppressWarnings("rawtypes") private static void buildTypeVariableMap(ResolvableType type, Map typeVariableMap) { if (type != ResolvableType.NONE) { if (type.getType() instanceof ParameterizedType) { @@ -302,7 +306,7 @@ public abstract class GenericTypeResolver { } - @SuppressWarnings("serial") + @SuppressWarnings({"serial", "rawtypes"}) private static class TypeVariableMapVariableResolver implements ResolvableType.VariableResolver { private final Map typeVariableMap; diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java index 61c06468dc..0212eaa8bd 100644 --- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java +++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java @@ -43,7 +43,7 @@ public class MethodParameter { private final Method method; - private final Constructor constructor; + private final Constructor constructor; private final int parameterIndex; @@ -99,7 +99,7 @@ public class MethodParameter { * @param constructor the Constructor to specify a parameter for * @param parameterIndex the index of the parameter */ - public MethodParameter(Constructor constructor, int parameterIndex) { + public MethodParameter(Constructor constructor, int parameterIndex) { this(constructor, parameterIndex, 1); } @@ -111,7 +111,7 @@ public class MethodParameter { * (typically 1; e.g. in case of a List of Lists, 1 would indicate the * nested List, whereas 2 would indicate the element of the nested List) */ - public MethodParameter(Constructor constructor, int parameterIndex, int nestingLevel) { + public MethodParameter(Constructor constructor, int parameterIndex, int nestingLevel) { Assert.notNull(constructor, "Constructor must not be null"); this.constructor = constructor; this.parameterIndex = parameterIndex; @@ -155,7 +155,7 @@ public class MethodParameter { *

Note: Either Method or Constructor is available. * @return the Constructor, or {@code null} if none */ - public Constructor getConstructor() { + public Constructor getConstructor() { return this.constructor; } @@ -268,12 +268,12 @@ public class MethodParameter { Type[] args = ((ParameterizedType) type).getActualTypeArguments(); Type arg = args[index != null ? index : args.length - 1]; if (arg instanceof Class) { - return (Class) arg; + return (Class) arg; } else if (arg instanceof ParameterizedType) { arg = ((ParameterizedType) arg).getRawType(); if (arg instanceof Class) { - return (Class) arg; + return (Class) arg; } } } @@ -489,7 +489,7 @@ public class MethodParameter { return new MethodParameter((Method) methodOrConstructor, parameterIndex); } else if (methodOrConstructor instanceof Constructor) { - return new MethodParameter((Constructor) methodOrConstructor, parameterIndex); + return new MethodParameter((Constructor) methodOrConstructor, parameterIndex); } else { throw new IllegalArgumentException( diff --git a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java index 8f72b5eab4..23c7ceb16e 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java @@ -109,7 +109,7 @@ public abstract class NestedCheckedException extends Exception { * @param exType the exception type to look for * @return whether there is a nested exception of the specified type */ - public boolean contains(Class exType) { + public boolean contains(Class exType) { if (exType == null) { return false; } diff --git a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java index 520c8bc9ac..8d20d81f88 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java @@ -110,7 +110,7 @@ public abstract class NestedRuntimeException extends RuntimeException { * @param exType the exception type to look for * @return whether there is a nested exception of the specified type */ - public boolean contains(Class exType) { + public boolean contains(Class exType) { if (exType == null) { return false; } diff --git a/spring-core/src/main/java/org/springframework/core/OrderComparator.java b/spring-core/src/main/java/org/springframework/core/OrderComparator.java index f8e007f562..0a261279a7 100644 --- a/spring-core/src/main/java/org/springframework/core/OrderComparator.java +++ b/spring-core/src/main/java/org/springframework/core/OrderComparator.java @@ -111,7 +111,7 @@ public class OrderComparator implements Comparator { sort((Object[]) value); } else if (value instanceof List) { - sort((List) value); + sort((List) value); } } diff --git a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java index 597a392304..9fbf0eed1a 100644 --- a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java +++ b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java @@ -55,8 +55,8 @@ public class OverridingClassLoader extends DecoratingClassLoader { @Override - protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { - Class result = null; + protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + Class result = null; if (isEligibleForOverriding(name)) { result = loadClassForOverriding(name); } @@ -90,8 +90,8 @@ public class OverridingClassLoader extends DecoratingClassLoader { * @return the Class object, or {@code null} if no class defined for that name * @throws ClassNotFoundException if the class for the given name couldn't be loaded */ - protected Class loadClassForOverriding(String name) throws ClassNotFoundException { - Class result = findLoadedClass(name); + protected Class loadClassForOverriding(String name) throws ClassNotFoundException { + Class result = findLoadedClass(name); if (result == null) { byte[] bytes = loadBytesForClass(name); if (bytes != null) { diff --git a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java index d7165b3ee3..e64f58901d 100644 --- a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java +++ b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java @@ -61,7 +61,7 @@ public abstract class ParameterizedTypeReference { @Override public boolean equals(Object obj) { return (this == obj || (obj instanceof ParameterizedTypeReference && - this.type.equals(((ParameterizedTypeReference) obj).type))); + this.type.equals(((ParameterizedTypeReference) obj).type))); } @Override diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java index 8d883eddd3..086a0cc967 100644 --- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java @@ -60,7 +60,7 @@ public class PrioritizedParameterNameDiscoverer implements ParameterNameDiscover } @Override - public String[] getParameterNames(Constructor ctor) { + public String[] getParameterNames(Constructor ctor) { for (ParameterNameDiscoverer pnd : this.parameterNameDiscoverers) { String[] result = pnd.getParameterNames(ctor); if (result != null) { diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index ff1993dcff..bc9396a6a6 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -155,7 +155,7 @@ public final class ResolvableType implements Serializable { if (rawType instanceof ParameterizedType) { rawType = ((ParameterizedType) rawType).getRawType(); } - return (rawType instanceof Class ? (Class) rawType : null); + return (rawType instanceof Class ? (Class) rawType : null); } /** @@ -1060,11 +1060,11 @@ public final class ResolvableType implements Serializable { @SuppressWarnings("serial") private static class TypeVariablesVariableResolver implements VariableResolver { - private final TypeVariable[] typeVariables; + private final TypeVariable[] typeVariables; private final ResolvableType[] generics; - public TypeVariablesVariableResolver(TypeVariable[] typeVariables, ResolvableType[] generics) { + public TypeVariablesVariableResolver(TypeVariable[] typeVariables, ResolvableType[] generics) { Assert.isTrue(typeVariables.length == generics.length, "Mismatched number of generics specified"); this.typeVariables = typeVariables; this.generics = generics; diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java index c036f27ad9..a0f72d0ba4 100644 --- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java +++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java @@ -38,6 +38,6 @@ public interface SmartClassLoader { * @return whether the class should be expected to appear in a reloaded * version (with a different {@code Class} object) later on */ - boolean isClassReloadable(Class clazz); + boolean isClassReloadable(Class clazz); } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java index 7a21d93da8..f4a83b8f98 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java @@ -50,7 +50,7 @@ public class AnnotationAwareOrderComparator extends OrderComparator { return ((Ordered) obj).getOrder(); } if (obj != null) { - Class clazz = (obj instanceof Class ? (Class) obj : obj.getClass()); + Class clazz = (obj instanceof Class ? (Class) obj : obj.getClass()); Order order = AnnotationUtils.findAnnotation(clazz, Order.class); if (order != null) { return order.value(); @@ -99,7 +99,7 @@ public class AnnotationAwareOrderComparator extends OrderComparator { sort((Object[]) value); } else if (value instanceof List) { - sort((List) value); + sort((List) value); } } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java index 2bc20a8d25..8250a3dacd 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java @@ -523,7 +523,7 @@ public abstract class AnnotationUtils { */ public static Object getValue(Annotation annotation, String attributeName) { try { - Method method = annotation.annotationType().getDeclaredMethod(attributeName, new Class[0]); + Method method = annotation.annotationType().getDeclaredMethod(attributeName, new Class[0]); ReflectionUtils.makeAccessible(method); return method.invoke(annotation); } @@ -574,7 +574,7 @@ public abstract class AnnotationUtils { */ public static Object getDefaultValue(Class annotationType, String attributeName) { try { - Method method = annotationType.getDeclaredMethod(attributeName, new Class[0]); + Method method = annotationType.getDeclaredMethod(attributeName, new Class[0]); return method.getDefaultValue(); } catch (Exception ex) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java index 6676e73963..30f3de5593 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java @@ -56,7 +56,6 @@ final class ArrayToCollectionConverter implements ConditionalGenericConverter { } @Override - @SuppressWarnings("unchecked") public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { if (source == null) { return null; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java index c07b057a4b..09ca1f8ad5 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java @@ -56,7 +56,6 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert } @Override - @SuppressWarnings("unchecked") public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { if (source == null) { return null; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java index b2358b25ea..1dc41e1b79 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.core.GenericTypeResolver; import org.springframework.core.ResolvableType; import org.springframework.core.convert.ConversionException; import org.springframework.core.convert.ConversionFailedException; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java index 02a389eb66..a2e98b321a 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java @@ -52,7 +52,6 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter { } @Override - @SuppressWarnings("unchecked") public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { if (source == null) { return null; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java index 7d91ee8ab0..2049dca6b8 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java @@ -56,7 +56,6 @@ final class StringToCollectionConverter implements ConditionalGenericConverter { } @Override - @SuppressWarnings("unchecked") public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { if (source == null) { return null; diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java index bcf88fa127..234c073baa 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java +++ b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java @@ -30,14 +30,14 @@ import org.springframework.util.StringUtils; */ public class ClassRelativeResourceLoader extends DefaultResourceLoader { - private final Class clazz; + private final Class clazz; /** * Create a new ClassRelativeResourceLoader for the given class. * @param clazz the class to load resources through */ - public ClassRelativeResourceLoader(Class clazz) { + public ClassRelativeResourceLoader(Class clazz) { Assert.notNull(clazz, "Class must not be null"); this.clazz = clazz; setClassLoader(clazz.getClassLoader()); @@ -55,9 +55,9 @@ public class ClassRelativeResourceLoader extends DefaultResourceLoader { */ private static class ClassRelativeContextResource extends ClassPathResource implements ContextResource { - private final Class clazz; + private final Class clazz; - public ClassRelativeContextResource(String path, Class clazz) { + public ClassRelativeContextResource(String path, Class clazz) { super(path, clazz); this.clazz = clazz; } diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java index 503f2bb1bb..b05cfc5bb9 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java @@ -175,9 +175,9 @@ public abstract class PropertiesLoaderUtils { clToUse = ClassUtils.getDefaultClassLoader(); } Properties props = new Properties(); - Enumeration urls = clToUse.getResources(resourceName); + Enumeration urls = clToUse.getResources(resourceName); while (urls.hasMoreElements()) { - URL url = (URL) urls.nextElement(); + URL url = urls.nextElement(); URLConnection con = url.openConnection(); ResourceUtils.useCachesIfNecessary(con); InputStream is = con.getInputStream(); diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java index a0063b2374..e32986f629 100644 --- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java +++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java @@ -57,20 +57,20 @@ public class DefaultValueStyler implements ValueStyler { return "\'" + value + "\'"; } else if (value instanceof Class) { - return ClassUtils.getShortName((Class) value); + return ClassUtils.getShortName((Class) value); } else if (value instanceof Method) { Method method = (Method) value; return method.getName() + "@" + ClassUtils.getShortName(method.getDeclaringClass()); } else if (value instanceof Map) { - return style((Map) value); + return style((Map) value); } else if (value instanceof Map.Entry) { - return style((Map.Entry) value); + return style((Map.Entry) value); } else if (value instanceof Collection) { - return style((Collection) value); + return style((Collection) value); } else if (value.getClass().isArray()) { return styleArray(ObjectUtils.toObjectArray(value)); @@ -80,11 +80,11 @@ public class DefaultValueStyler implements ValueStyler { } } - private String style(Map value) { + private String style(Map value) { StringBuilder result = new StringBuilder(value.size() * 8 + 16); result.append(MAP + "["); - for (Iterator it = value.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); + for (Iterator> it = value.entrySet().iterator(); it.hasNext();) { + Map.Entry entry = it.next(); result.append(style(entry)); if (it.hasNext()) { result.append(',').append(' '); @@ -97,14 +97,14 @@ public class DefaultValueStyler implements ValueStyler { return result.toString(); } - private String style(Map.Entry value) { + private String style(Map.Entry value) { return style(value.getKey()) + " -> " + style(value.getValue()); } - private String style(Collection value) { + private String style(Collection value) { StringBuilder result = new StringBuilder(value.size() * 8 + 16); result.append(getCollectionTypeString(value)).append('['); - for (Iterator i = value.iterator(); i.hasNext();) { + for (Iterator i = value.iterator(); i.hasNext();) { result.append(style(i.next())); if (i.hasNext()) { result.append(',').append(' '); @@ -117,7 +117,7 @@ public class DefaultValueStyler implements ValueStyler { return result.toString(); } - private String getCollectionTypeString(Collection value) { + private String getCollectionTypeString(Collection value) { if (value instanceof List) { return LIST; } diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java index 1b62d91c46..1c56f4ff8a 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java @@ -30,14 +30,14 @@ import org.springframework.util.Assert; */ public class StandardClassMetadata implements ClassMetadata { - private final Class introspectedClass; + private final Class introspectedClass; /** * Create a new StandardClassMetadata wrapper for the given Class. * @param introspectedClass the Class to introspect */ - public StandardClassMetadata(Class introspectedClass) { + public StandardClassMetadata(Class introspectedClass) { Assert.notNull(introspectedClass, "Class must not be null"); this.introspectedClass = introspectedClass; } @@ -45,7 +45,7 @@ public class StandardClassMetadata implements ClassMetadata { /** * Return the underlying Class. */ - public final Class getIntrospectedClass() { + public final Class getIntrospectedClass() { return this.introspectedClass; } @@ -89,7 +89,7 @@ public class StandardClassMetadata implements ClassMetadata { @Override public String getEnclosingClassName() { - Class enclosingClass = this.introspectedClass.getEnclosingClass(); + Class enclosingClass = this.introspectedClass.getEnclosingClass(); return (enclosingClass != null ? enclosingClass.getName() : null); } @@ -100,13 +100,13 @@ public class StandardClassMetadata implements ClassMetadata { @Override public String getSuperClassName() { - Class superClass = this.introspectedClass.getSuperclass(); + Class superClass = this.introspectedClass.getSuperclass(); return (superClass != null ? superClass.getName() : null); } @Override public String[] getInterfaceNames() { - Class[] ifcs = this.introspectedClass.getInterfaces(); + Class[] ifcs = this.introspectedClass.getInterfaces(); String[] ifcNames = new String[ifcs.length]; for (int i = 0; i < ifcs.length; i++) { ifcNames[i] = ifcs[i].getName(); diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java index 82189cc29f..50e7395978 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java @@ -60,7 +60,7 @@ abstract class AnnotationReadingVisitorUtils { } else if (value instanceof Type[]) { Type[] array = (Type[]) value; - Object[] convArray = (classValuesAsString ? new String[array.length] : new Class[array.length]); + Object[] convArray = (classValuesAsString ? new String[array.length] : new Class[array.length]); for (int i = 0; i < array.length; i++) { convArray[i] = (classValuesAsString ? array[i].getClassName() : classLoader.loadClass(array[i].getClassName())); diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java index 82afe352cc..e55eca50e9 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java @@ -26,14 +26,14 @@ package org.springframework.core.type.filter; */ public class AssignableTypeFilter extends AbstractTypeHierarchyTraversingFilter { - private final Class targetType; + private final Class targetType; /** * Create a new AssignableTypeFilter for the given type. * @param targetType the type to match */ - public AssignableTypeFilter(Class targetType) { + public AssignableTypeFilter(Class targetType) { super(true, true); this.targetType = targetType; } @@ -63,7 +63,7 @@ public class AssignableTypeFilter extends AbstractTypeHierarchyTraversingFilter } else if (typeName.startsWith("java.")) { try { - Class clazz = getClass().getClassLoader().loadClass(typeName); + Class clazz = getClass().getClassLoader().loadClass(typeName); return Boolean.valueOf(this.targetType.isAssignableFrom(clazz)); } catch (ClassNotFoundException ex) { diff --git a/spring-core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java index 55b2325d51..0a28cac76f 100644 --- a/spring-core/src/main/java/org/springframework/util/Assert.java +++ b/spring-core/src/main/java/org/springframework/util/Assert.java @@ -263,7 +263,7 @@ public abstract class Assert { * @param message the exception message to use if the assertion fails * @throws IllegalArgumentException if the collection is {@code null} or has no elements */ - public static void notEmpty(Collection collection, String message) { + public static void notEmpty(Collection collection, String message) { if (CollectionUtils.isEmpty(collection)) { throw new IllegalArgumentException(message); } @@ -276,7 +276,7 @@ public abstract class Assert { * @param collection the collection to check * @throws IllegalArgumentException if the collection is {@code null} or has no elements */ - public static void notEmpty(Collection collection) { + public static void notEmpty(Collection collection) { notEmpty(collection, "[Assertion failed] - this collection must not be empty: it must contain at least 1 element"); } @@ -289,7 +289,7 @@ public abstract class Assert { * @param message the exception message to use if the assertion fails * @throws IllegalArgumentException if the map is {@code null} or has no entries */ - public static void notEmpty(Map map, String message) { + public static void notEmpty(Map map, String message) { if (CollectionUtils.isEmpty(map)) { throw new IllegalArgumentException(message); } @@ -302,7 +302,7 @@ public abstract class Assert { * @param map the map to check * @throws IllegalArgumentException if the map is {@code null} or has no entries */ - public static void notEmpty(Map map) { + public static void notEmpty(Map map) { notEmpty(map, "[Assertion failed] - this map must not be empty; it must contain at least one entry"); } diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java index d58e0acd81..9efa171fd1 100644 --- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java +++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java @@ -123,7 +123,7 @@ public class AutoPopulatingList implements List, Serializable { } @Override - public boolean containsAll(Collection c) { + public boolean containsAll(Collection c) { return this.backingList.containsAll(c); } diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java index c7d586413a..1877f2aa48 100644 --- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java @@ -894,13 +894,13 @@ public abstract class ClassUtils { return true; } if (lhsType.isPrimitive()) { - Class resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType); + Class resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType); if (resolvedPrimitive != null && lhsType.equals(resolvedPrimitive)) { return true; } } else { - Class resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType); + Class resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType); if (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper)) { return true; } @@ -1002,7 +1002,7 @@ public abstract class ClassUtils { * @return a String of form "[com.foo.Bar, com.foo.Baz]" * @see java.util.AbstractCollection#toString() */ - public static String classNamesToString(Class... classes) { + public static String classNamesToString(Class... classes) { return classNamesToString(Arrays.asList(classes)); } @@ -1015,13 +1015,13 @@ public abstract class ClassUtils { * @return a String of form "[com.foo.Bar, com.foo.Baz]" * @see java.util.AbstractCollection#toString() */ - public static String classNamesToString(Collection classes) { + public static String classNamesToString(Collection> classes) { if (CollectionUtils.isEmpty(classes)) { return "[]"; } StringBuilder sb = new StringBuilder("["); - for (Iterator it = classes.iterator(); it.hasNext(); ) { - Class clazz = it.next(); + for (Iterator> it = classes.iterator(); it.hasNext(); ) { + Class clazz = it.next(); sb.append(clazz.getName()); if (it.hasNext()) { sb.append(", "); @@ -1077,8 +1077,8 @@ public abstract class ClassUtils { * @return all interfaces that the given object implements as array */ public static Class[] getAllInterfacesForClass(Class clazz, ClassLoader classLoader) { - Set ifcs = getAllInterfacesForClassAsSet(clazz, classLoader); - return ifcs.toArray(new Class[ifcs.size()]); + Set> ifcs = getAllInterfacesForClassAsSet(clazz, classLoader); + return ifcs.toArray(new Class[ifcs.size()]); } /** @@ -1087,7 +1087,7 @@ public abstract class ClassUtils { * @param instance the instance to analyze for interfaces * @return all interfaces that the given instance implements as Set */ - public static Set getAllInterfacesAsSet(Object instance) { + public static Set> getAllInterfacesAsSet(Object instance) { Assert.notNull(instance, "Instance must not be null"); return getAllInterfacesForClassAsSet(instance.getClass()); } @@ -1099,7 +1099,7 @@ public abstract class ClassUtils { * @param clazz the class to analyze for interfaces * @return all interfaces that the given object implements as Set */ - public static Set getAllInterfacesForClassAsSet(Class clazz) { + public static Set> getAllInterfacesForClassAsSet(Class clazz) { return getAllInterfacesForClassAsSet(clazz, null); } @@ -1112,12 +1112,12 @@ public abstract class ClassUtils { * (may be {@code null} when accepting all declared interfaces) * @return all interfaces that the given object implements as Set */ - public static Set getAllInterfacesForClassAsSet(Class clazz, ClassLoader classLoader) { + public static Set> getAllInterfacesForClassAsSet(Class clazz, ClassLoader classLoader) { Assert.notNull(clazz, "Class must not be null"); if (clazz.isInterface() && isVisible(clazz, classLoader)) { - return Collections.singleton(clazz); + return Collections.>singleton(clazz); } - Set interfaces = new LinkedHashSet(); + Set> interfaces = new LinkedHashSet>(); while (clazz != null) { Class[] ifcs = clazz.getInterfaces(); for (Class ifc : ifcs) { diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java index a16d5fecd4..2f27225605 100644 --- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java @@ -47,7 +47,7 @@ public abstract class CollectionUtils { * @param collection the Collection to check * @return whether the given Collection is empty */ - public static boolean isEmpty(Collection collection) { + public static boolean isEmpty(Collection collection) { return (collection == null || collection.isEmpty()); } @@ -57,7 +57,7 @@ public abstract class CollectionUtils { * @param map the Map to check * @return whether the given Map is empty */ - public static boolean isEmpty(Map map) { + public static boolean isEmpty(Map map) { return (map == null || map.isEmpty()); } @@ -70,8 +70,9 @@ public abstract class CollectionUtils { * @return the converted List result * @see ObjectUtils#toObjectArray(Object) */ - public static List arrayToList(Object source) { - return Arrays.asList(ObjectUtils.toObjectArray(source)); + @SuppressWarnings("unchecked") + public static List arrayToList(Object source) { + return (List) Arrays.asList(ObjectUtils.toObjectArray(source)); } /** @@ -80,13 +81,13 @@ public abstract class CollectionUtils { * @param collection the target Collection to merge the array into */ @SuppressWarnings("unchecked") - public static void mergeArrayIntoCollection(Object array, Collection collection) { + public static void mergeArrayIntoCollection(Object array, Collection collection) { if (collection == null) { throw new IllegalArgumentException("Collection must not be null"); } Object[] arr = ObjectUtils.toObjectArray(array); for (Object elem : arr) { - collection.add(elem); + collection.add((E) elem); } } @@ -99,19 +100,19 @@ public abstract class CollectionUtils { * @param map the target Map to merge the properties into */ @SuppressWarnings("unchecked") - public static void mergePropertiesIntoMap(Properties props, Map map) { + public static void mergePropertiesIntoMap(Properties props, Map map) { if (map == null) { throw new IllegalArgumentException("Map must not be null"); } if (props != null) { - for (Enumeration en = props.propertyNames(); en.hasMoreElements();) { + for (Enumeration en = props.propertyNames(); en.hasMoreElements();) { String key = (String) en.nextElement(); Object value = props.getProperty(key); if (value == null) { // Potentially a non-String value... value = props.get(key); } - map.put(key, value); + map.put((K) key, (V) value); } } } @@ -123,7 +124,7 @@ public abstract class CollectionUtils { * @param element the element to look for * @return {@code true} if found, {@code false} else */ - public static boolean contains(Iterator iterator, Object element) { + public static boolean contains(Iterator iterator, Object element) { if (iterator != null) { while (iterator.hasNext()) { Object candidate = iterator.next(); @@ -141,7 +142,7 @@ public abstract class CollectionUtils { * @param element the element to look for * @return {@code true} if found, {@code false} else */ - public static boolean contains(Enumeration enumeration, Object element) { + public static boolean contains(Enumeration enumeration, Object element) { if (enumeration != null) { while (enumeration.hasMoreElements()) { Object candidate = enumeration.nextElement(); @@ -161,7 +162,7 @@ public abstract class CollectionUtils { * @param element the element to look for * @return {@code true} if found, {@code false} else */ - public static boolean containsInstance(Collection collection, Object element) { + public static boolean containsInstance(Collection collection, Object element) { if (collection != null) { for (Object candidate : collection) { if (candidate == element) { @@ -179,7 +180,7 @@ public abstract class CollectionUtils { * @param candidates the candidates to search for * @return whether any of the candidates has been found */ - public static boolean containsAny(Collection source, Collection candidates) { + public static boolean containsAny(Collection source, Collection candidates) { if (isEmpty(source) || isEmpty(candidates)) { return false; } @@ -200,13 +201,14 @@ public abstract class CollectionUtils { * @param candidates the candidates to search for * @return the first present object, or {@code null} if not found */ - public static Object findFirstMatch(Collection source, Collection candidates) { + @SuppressWarnings("unchecked") + public static E findFirstMatch(Collection source, Collection candidates) { if (isEmpty(source) || isEmpty(candidates)) { return null; } for (Object candidate : candidates) { if (source.contains(candidate)) { - return candidate; + return (E) candidate; } } return null; @@ -265,7 +267,7 @@ public abstract class CollectionUtils { * @return {@code true} if the collection contains a single reference or * multiple references to the same instance, {@code false} else */ - public static boolean hasUniqueObject(Collection collection) { + public static boolean hasUniqueObject(Collection collection) { if (isEmpty(collection)) { return false; } @@ -289,7 +291,7 @@ public abstract class CollectionUtils { * @return the common element type, or {@code null} if no clear * common type has been found (or the collection was empty) */ - public static Class findCommonElementType(Collection collection) { + public static Class findCommonElementType(Collection collection) { if (isEmpty(collection)) { return null; } diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java index b1bd04ccb3..fa013d14f3 100644 --- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java +++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java @@ -168,7 +168,7 @@ public class MethodInvoker { } Object[] arguments = getArguments(); - Class[] argTypes = new Class[arguments.length]; + Class[] argTypes = new Class[arguments.length]; for (int i = 0; i < arguments.length; ++i) { argTypes[i] = (arguments[i] != null ? arguments[i].getClass() : Object.class); } @@ -216,7 +216,7 @@ public class MethodInvoker { for (Method candidate : candidates) { if (candidate.getName().equals(targetMethod)) { - Class[] paramTypes = candidate.getParameterTypes(); + Class[] paramTypes = candidate.getParameterTypes(); if (paramTypes.length == argCount) { int typeDiffWeight = getTypeDifferenceWeight(paramTypes, arguments); if (typeDiffWeight < minTypeDiffWeight) { diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java index 47f38a0b83..102709b34d 100644 --- a/spring-core/src/main/java/org/springframework/util/NumberUtils.java +++ b/spring-core/src/main/java/org/springframework/util/NumberUtils.java @@ -115,7 +115,7 @@ public abstract class NumberUtils { * @param number the number we tried to convert * @param targetClass the target class we tried to convert to */ - private static void raiseOverflowException(Number number, Class targetClass) { + private static void raiseOverflowException(Number number, Class targetClass) { throw new IllegalArgumentException("Could not convert number [" + number + "] of type [" + number.getClass().getName() + "] to target class [" + targetClass.getName() + "]: overflow"); } diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java index 09980f1e2c..bd4768b58a 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -69,7 +69,7 @@ public abstract class ObjectUtils { * @param declaredExceptions the exceptions declared in the throws clause * @return whether the given exception is compatible */ - public static boolean isCompatibleWithThrowsClause(Throwable ex, Class[] declaredExceptions) { + public static boolean isCompatibleWithThrowsClause(Throwable ex, Class[] declaredExceptions) { if (!isCheckedException(ex)) { return true; } @@ -218,7 +218,7 @@ public abstract class ObjectUtils { if (length == 0) { return new Object[0]; } - Class wrapperType = Array.get(source, 0).getClass(); + Class wrapperType = Array.get(source, 0).getClass(); Object[] newArray = (Object[]) Array.newInstance(wrapperType, length); for (int i = 0; i < length; i++) { newArray[i] = Array.get(source, i); @@ -286,7 +286,7 @@ public abstract class ObjectUtils { /** * Return as hash code for the given object; typically the value of - * {@code {@link Object#hashCode()}}. If the object is an array, + * {@code Object#hashCode()}}. If the object is an array, * this method will delegate to any of the {@code nullSafeHashCode} * methods for arrays in this class. If the object is {@code null}, * this method returns 0. diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java index ede9504b8f..1b56bc73c4 100644 --- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java @@ -133,7 +133,7 @@ public abstract class ReflectionUtils { * @return the Method object, or {@code null} if none found */ public static Method findMethod(Class clazz, String name) { - return findMethod(clazz, name, new Class[0]); + return findMethod(clazz, name, new Class[0]); } /** diff --git a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java index 2ce4b7901e..1a48675726 100644 --- a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java +++ b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java @@ -53,7 +53,7 @@ public class WeakReferenceMonitor { private static final ReferenceQueue handleQueue = new ReferenceQueue(); // All tracked entries (WeakReference => ReleaseListener) - private static final Map trackedEntries = new HashMap(); + private static final Map, ReleaseListener> trackedEntries = new HashMap, ReleaseListener>(); // Thread polling handleQueue, lazy initialized private static Thread monitoringThread = null; @@ -84,7 +84,7 @@ public class WeakReferenceMonitor { * @param ref reference to tracked handle * @param entry the associated entry */ - private static void addEntry(Reference ref, ReleaseListener entry) { + private static void addEntry(Reference ref, ReleaseListener entry) { synchronized (WeakReferenceMonitor.class) { // Add entry, the key is given reference. trackedEntries.put(ref, entry); @@ -103,7 +103,7 @@ public class WeakReferenceMonitor { * @param reference the reference that should be removed * @return entry object associated with given reference */ - private static ReleaseListener removeEntry(Reference reference) { + private static ReleaseListener removeEntry(Reference reference) { synchronized (WeakReferenceMonitor.class) { return trackedEntries.remove(reference); } @@ -138,7 +138,7 @@ public class WeakReferenceMonitor { // Check if there are any tracked entries left. while (keepMonitoringThreadAlive()) { try { - Reference reference = handleQueue.remove(); + Reference reference = handleQueue.remove(); // Stop tracking this reference. ReleaseListener entry = removeEntry(reference); if (entry != null) { diff --git a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java index 20652a3288..a20eab1882 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java @@ -37,10 +37,10 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 1.2.2 */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "rawtypes" }) public class CompoundComparator implements Comparator, Serializable { - private final List> comparators; + private final List comparators; /** @@ -49,7 +49,7 @@ public class CompoundComparator implements Comparator, Serializable { * IllegalStateException is thrown. */ public CompoundComparator() { - this.comparators = new ArrayList>(); + this.comparators = new ArrayList(); } /** @@ -62,7 +62,7 @@ public class CompoundComparator implements Comparator, Serializable { @SuppressWarnings({ "unchecked", "rawtypes" }) public CompoundComparator(Comparator... comparators) { Assert.notNull(comparators, "Comparators must not be null"); - this.comparators = new ArrayList>(comparators.length); + this.comparators = new ArrayList(comparators.length); for (Comparator comparator : comparators) { this.addComparator(comparator); } @@ -76,12 +76,13 @@ public class CompoundComparator implements Comparator, Serializable { * @param comparator the Comparator to add to the end of the chain * @see InvertibleComparator */ - public void addComparator(Comparator comparator) { + @SuppressWarnings("unchecked") + public void addComparator(Comparator comparator) { if (comparator instanceof InvertibleComparator) { - this.comparators.add((InvertibleComparator) comparator); + this.comparators.add((InvertibleComparator) comparator); } else { - this.comparators.add(new InvertibleComparator(comparator)); + this.comparators.add(new InvertibleComparator(comparator)); } } @@ -90,8 +91,9 @@ public class CompoundComparator implements Comparator, Serializable { * @param comparator the Comparator to add to the end of the chain * @param ascending the sort order: ascending (true) or descending (false) */ - public void addComparator(Comparator comparator, boolean ascending) { - this.comparators.add(new InvertibleComparator(comparator, ascending)); + @SuppressWarnings("unchecked") + public void addComparator(Comparator comparator, boolean ascending) { + this.comparators.add(new InvertibleComparator(comparator, ascending)); } /** @@ -102,12 +104,13 @@ public class CompoundComparator implements Comparator, Serializable { * @param comparator the Comparator to place at the given index * @see InvertibleComparator */ - public void setComparator(int index, Comparator comparator) { + @SuppressWarnings("unchecked") + public void setComparator(int index, Comparator comparator) { if (comparator instanceof InvertibleComparator) { - this.comparators.set(index, (InvertibleComparator) comparator); + this.comparators.set(index, (InvertibleComparator) comparator); } else { - this.comparators.set(index, new InvertibleComparator(comparator)); + this.comparators.set(index, new InvertibleComparator(comparator)); } } @@ -126,7 +129,7 @@ public class CompoundComparator implements Comparator, Serializable { * comparator. */ public void invertOrder() { - for (InvertibleComparator comparator : this.comparators) { + for (InvertibleComparator comparator : this.comparators) { comparator.invertOrder(); } } @@ -163,10 +166,11 @@ public class CompoundComparator implements Comparator, Serializable { } @Override + @SuppressWarnings("unchecked") public int compare(T o1, T o2) { Assert.state(this.comparators.size() > 0, "No sort definitions have been added to this CompoundComparator to compare"); - for (InvertibleComparator comparator : this.comparators) { + for (InvertibleComparator comparator : this.comparators) { int result = comparator.compare(o1, o2); if (result != 0) { return result; diff --git a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java index ebff3488c2..f18b374d58 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java @@ -64,7 +64,7 @@ public class NullSafeComparator implements Comparator { * @see #NULLS_LOW * @see #NULLS_HIGH */ - @SuppressWarnings({ "unchecked"}) + @SuppressWarnings({ "unchecked", "rawtypes"}) private NullSafeComparator(boolean nullsLow) { this.nonNullComparator = new ComparableComparator(); this.nullsLow = nullsLow; diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java index 12940934c4..eb36607110 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java +++ b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java @@ -184,7 +184,7 @@ public abstract class DomUtils { /** * Matches the given node's name and local name against the given desired names. */ - private static boolean nodeNameMatch(Node node, Collection desiredNames) { + private static boolean nodeNameMatch(Node node, Collection desiredNames) { return (desiredNames.contains(node.getNodeName()) || desiredNames.contains(node.getLocalName())); } diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java index 2908fa9148..f865c9566d 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java +++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java @@ -63,12 +63,12 @@ public class SimpleNamespaceContext implements NamespaceContext { @Override public String getPrefix(String namespaceUri) { - List prefixes = getPrefixesInternal(namespaceUri); + List prefixes = getPrefixesInternal(namespaceUri); return prefixes.isEmpty() ? null : (String) prefixes.get(0); } @Override - public Iterator getPrefixes(String namespaceUri) { + public Iterator getPrefixes(String namespaceUri) { return getPrefixesInternal(namespaceUri).iterator(); } @@ -155,7 +155,7 @@ public class SimpleNamespaceContext implements NamespaceContext { } else { String namespaceUri = prefixToNamespaceUri.remove(prefix); - List prefixes = getPrefixesInternal(namespaceUri); + List prefixes = getPrefixesInternal(namespaceUri); prefixes.remove(prefix); } } diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java index 54505a587c..f48bad5c6d 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java @@ -19,6 +19,7 @@ package org.springframework.util.xml; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.stream.Location; @@ -29,11 +30,10 @@ import javax.xml.stream.events.Namespace; import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.XMLEventConsumer; +import org.springframework.util.StringUtils; import org.xml.sax.Attributes; import org.xml.sax.Locator; -import org.springframework.util.StringUtils; - /** * SAX {@code ContentHandler} that transforms callback calls to {@code XMLEvent}s * and writes them to a {@code XMLEventConsumer}. @@ -92,15 +92,15 @@ class StaxEventContentHandler extends AbstractStaxContentHandler { protected void startElementInternal(QName name, Attributes atts, SimpleNamespaceContext namespaceContext) throws XMLStreamException { - List attributes = getAttributes(atts); - List namespaces = createNamespaces(namespaceContext); + List attributes = getAttributes(atts); + List namespaces = createNamespaces(namespaceContext); consumeEvent(this.eventFactory.createStartElement(name, attributes.iterator(), (namespaces != null ? namespaces.iterator() : null))); } @Override protected void endElementInternal(QName name, SimpleNamespaceContext namespaceContext) throws XMLStreamException { - List namespaces = createNamespaces(namespaceContext); + List namespaces = createNamespaces(namespaceContext); consumeEvent(this.eventFactory.createEndElement(name, namespaces != null ? namespaces.iterator() : null)); } @@ -136,8 +136,8 @@ class StaxEventContentHandler extends AbstractStaxContentHandler { if (StringUtils.hasLength(defaultNamespaceUri)) { namespaces.add(this.eventFactory.createNamespace(defaultNamespaceUri)); } - for (Iterator iterator = namespaceContext.getBoundPrefixes(); iterator.hasNext();) { - String prefix = (String) iterator.next(); + for (Iterator iterator = namespaceContext.getBoundPrefixes(); iterator.hasNext();) { + String prefix = iterator.next(); String namespaceUri = namespaceContext.getNamespaceURI(prefix); namespaces.add(this.eventFactory.createNamespace(prefix, namespaceUri)); } diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java index 16b10fe03a..490b9de86d 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java @@ -17,8 +17,7 @@ package org.springframework.util.xml; import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; + import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLEventReader; @@ -38,14 +37,13 @@ import javax.xml.stream.events.StartDocument; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.ext.Locator2; import org.xml.sax.helpers.AttributesImpl; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; - /** * SAX {@code XMLReader} that reads from a StAX {@code XMLEventReader}. Consumes {@code XMLEvents} from * an {@code XMLEventReader}, and calls the corresponding methods on the SAX callback interfaces. @@ -58,14 +56,13 @@ import org.springframework.util.StringUtils; * @see #setEntityResolver(org.xml.sax.EntityResolver) * @see #setErrorHandler(org.xml.sax.ErrorHandler) */ +@SuppressWarnings("rawtypes") class StaxEventXMLReader extends AbstractStaxXMLReader { private static final String DEFAULT_XML_VERSION = "1.0"; private final XMLEventReader reader; - private final Map namespaces = new LinkedHashMap(); - private String xmlVersion = DEFAULT_XML_VERSION; private String encoding; diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java index 731d7bc9a2..fcfbf307b5 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java @@ -17,6 +17,7 @@ package org.springframework.util.xml; import java.util.Iterator; + import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.stream.Location; @@ -38,6 +39,7 @@ import javax.xml.stream.events.XMLEvent; * @since 3.0 * @see StaxUtils#createEventStreamReader(javax.xml.stream.XMLEventReader) */ +@SuppressWarnings("rawtypes") class XMLEventStreamReader extends AbstractXMLStreamReader { private XMLEvent event; diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java index 8c9e3ad0fb..b2aae5f44f 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java +++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java @@ -19,6 +19,7 @@ package org.springframework.util.xml; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventFactory; @@ -38,6 +39,7 @@ import org.springframework.util.Assert; * @since 3.0.5 * @see StaxUtils#createEventStreamWriter(javax.xml.stream.XMLEventWriter, javax.xml.stream.XMLEventFactory) */ +@SuppressWarnings("rawtypes") class XMLEventStreamWriter implements XMLStreamWriter { private static final String DEFAULT_ENCODING = "UTF-8"; diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index fc060cc8a3..bf31eb5550 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -75,6 +75,7 @@ public class GenericTypeResolverTests { } @Test + @Deprecated public void testResolveType() { Method intMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class); MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0); @@ -100,6 +101,7 @@ public class GenericTypeResolverTests { } @Test + @Deprecated public void testGetTypeVariableMap() throws Exception { Map map; diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 04e727d804..da7884153b 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -1230,11 +1230,13 @@ public class ResolvableTypeTests { } + @SuppressWarnings("serial") static class ExtendsList extends ArrayList { } + @SuppressWarnings("serial") static class ExtendsMap extends HashMap { } diff --git a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java index 9ad7ef41fe..3074d77617 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java @@ -840,6 +840,7 @@ public class TypeDescriptorTests { public PassDownGeneric passDownGeneric = new PassDownGeneric(); + @SuppressWarnings("serial") public static class PassDownGeneric extends ArrayList>> { } diff --git a/spring-expression/src/main/java/org/springframework/expression/Expression.java b/spring-expression/src/main/java/org/springframework/expression/Expression.java index b72a353d70..a48c527799 100644 --- a/spring-expression/src/main/java/org/springframework/expression/Expression.java +++ b/spring-expression/src/main/java/org/springframework/expression/Expression.java @@ -112,7 +112,7 @@ public interface Expression { * @return the most general type of value that can be set on this context * @throws EvaluationException if there is a problem determining the type */ - Class getValueType() throws EvaluationException; + Class getValueType() throws EvaluationException; /** * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)} @@ -121,7 +121,7 @@ public interface Expression { * @return the most general type of value that can be set on this context * @throws EvaluationException if there is a problem determining the type */ - Class getValueType(Object rootObject) throws EvaluationException; + Class getValueType(Object rootObject) throws EvaluationException; /** * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)} @@ -130,7 +130,7 @@ public interface Expression { * @return the most general type of value that can be set on this context * @throws EvaluationException if there is a problem determining the type */ - Class getValueType(EvaluationContext context) throws EvaluationException; + Class getValueType(EvaluationContext context) throws EvaluationException; /** * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)} @@ -140,7 +140,7 @@ public interface Expression { * @return the most general type of value that can be set on this context * @throws EvaluationException if there is a problem determining the type */ - Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException; + Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException; /** * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)} diff --git a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java index a8222c25ab..619390125f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java @@ -40,7 +40,7 @@ public interface PropertyAccessor { * @return an array of classes that this resolver is suitable for (or null if a * general resolver) */ - Class[] getSpecificTargetClasses(); + Class[] getSpecificTargetClasses(); /** * Called to determine if a resolver instance is able to access a specified property diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java index 1ddd5f9143..7a2abd0398 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java @@ -26,15 +26,15 @@ import org.springframework.expression.TypedValue; * Represents a template expression broken into pieces. Each piece will be an Expression * but pure text parts to the template will be represented as LiteralExpression objects. * An example of a template expression might be: - * + * * 
  * "Hello ${getName()}"
  *
- * + * * which will be represented as a CompositeStringExpression of two parts. The first part * being a LiteralExpression representing 'Hello ' and the second part being a real * expression that will call {@code getName()} when invoked. - * + * * @author Andy Clement * @author Juergen Hoeller * @since 3.0 @@ -107,12 +107,12 @@ public class CompositeStringExpression implements Expression { } @Override - public Class getValueType(EvaluationContext context) { + public Class getValueType(EvaluationContext context) { return String.class; } @Override - public Class getValueType() { + public Class getValueType() { return String.class; } @@ -167,12 +167,12 @@ public class CompositeStringExpression implements Expression { } @Override - public Class getValueType(Object rootObject) throws EvaluationException { + public Class getValueType(Object rootObject) throws EvaluationException { return String.class; } @Override - public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException { + public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException { return String.class; } diff --git a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java index aec7afde1e..1ae6f498d7 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java @@ -63,7 +63,7 @@ public class LiteralExpression implements Expression { } @Override - public Class getValueType(EvaluationContext context) { + public Class getValueType(EvaluationContext context) { return String.class; } @@ -100,7 +100,7 @@ public class LiteralExpression implements Expression { } @Override - public Class getValueType() { + public Class getValueType() { return String.class; } @@ -122,12 +122,12 @@ public class LiteralExpression implements Expression { } @Override - public Class getValueType(Object rootObject) throws EvaluationException { + public Class getValueType(Object rootObject) throws EvaluationException { return String.class; } @Override - public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException { + public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException { return String.class; } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java index 8719f49526..3494a1de90 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java @@ -66,7 +66,7 @@ public class FormatHelper { StringBuilder fmtd = new StringBuilder(); if (clazz.isArray()) { int dims = 1; - Class baseClass = clazz.getComponentType(); + Class baseClass = clazz.getComponentType(); while (baseClass.isArray()) { baseClass = baseClass.getComponentType(); dims++; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java index f913035d0c..1047e7729f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java @@ -73,7 +73,7 @@ public abstract class SpelNodeImpl implements SpelNode { /** * @return true if the next child is one of the specified classes */ - protected boolean nextChildIs(Class... clazzes) { + protected boolean nextChildIs(Class... clazzes) { if (this.parent != null) { SpelNodeImpl[] peers = this.parent.children; for (int i = 0, max = peers.length; i < max; i++) { @@ -82,8 +82,8 @@ public abstract class SpelNodeImpl implements SpelNode { return false; } - Class clazz = peers[i + 1].getClass(); - for (Class desiredClazz : clazzes) { + Class clazz = peers[i + 1].getClass(); + for (Class desiredClazz : clazzes) { if (clazz.equals(desiredClazz)) { return true; } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java index 9471486338..ade0d20f31 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeReference.java @@ -60,7 +60,7 @@ public class TypeReference extends SpelNodeImpl { return new TypedValue(clazz); } - private Class makeArrayIfNecessary(Class clazz) { + private Class makeArrayIfNecessary(Class clazz) { if (this.dimensions!=0) { for (int i=0;i paramTypeClazz = paramType.getType(); if (paramTypeClazz.isPrimitive()) { paramTypeClazz = Object.class; } - Class superClass = argType.getClass().getSuperclass(); + Class superClass = argType.getClass().getSuperclass(); while (superClass != null) { if (paramType.equals(superClass)) { result = result + 2; @@ -216,7 +216,7 @@ public class ReflectionHelper { else { // Now... we have the final argument in the method we are checking as a match and we have 0 or more other // arguments left to pass to it. - Class varargsParameterType = expectedArgTypes.get(expectedArgTypes.size() - 1).getElementTypeDescriptor().getType(); + Class varargsParameterType = expectedArgTypes.get(expectedArgTypes.size() - 1).getElementTypeDescriptor().getType(); // All remaining parameters must be of this type or convertable to this type for (int i = expectedArgTypes.size() - 1; i < suppliedArgTypes.size(); i++) { @@ -319,7 +319,7 @@ public class ReflectionHelper { public static void convertAllArguments(TypeConverter converter, Object[] arguments, Method method) throws SpelEvaluationException { Integer varargsPosition = null; if (method.isVarArgs()) { - Class[] paramTypes = method.getParameterTypes(); + Class[] paramTypes = method.getParameterTypes(); varargsPosition = paramTypes.length - 1; } for (int argPosition = 0; argPosition < arguments.length; argPosition++) { @@ -361,7 +361,7 @@ public class ReflectionHelper { * @param args the arguments to be setup ready for the invocation * @return a repackaged array of arguments where any varargs setup has been done */ - public static Object[] setupArgumentsForVarargsInvocation(Class[] requiredParameterTypes, Object... args) { + public static Object[] setupArgumentsForVarargsInvocation(Class[] requiredParameterTypes, Object... args) { // Check if array already built for final argument int parameterCount = requiredParameterTypes.length; int argumentCount = args.length; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java index 46202c5274..f9a350a7ad 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java @@ -46,7 +46,7 @@ class ReflectiveConstructorExecutor implements ConstructorExecutor { public ReflectiveConstructorExecutor(Constructor ctor, int[] argsRequiringConversion) { this.ctor = ctor; if (ctor.isVarArgs()) { - Class[] paramTypes = ctor.getParameterTypes(); + Class[] paramTypes = ctor.getParameterTypes(); this.varargsPosition = paramTypes.length - 1; } else { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java index 3d26c61c49..4ee1094e48 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java @@ -59,23 +59,23 @@ public class ReflectiveConstructorResolver implements ConstructorResolver { try { TypeConverter typeConverter = context.getTypeConverter(); Class type = context.getTypeLocator().findType(typename); - Constructor[] ctors = type.getConstructors(); + Constructor[] ctors = type.getConstructors(); - Arrays.sort(ctors, new Comparator() { + Arrays.sort(ctors, new Comparator>() { @Override - public int compare(Constructor c1, Constructor c2) { + public int compare(Constructor c1, Constructor c2) { int c1pl = c1.getParameterTypes().length; int c2pl = c2.getParameterTypes().length; return (new Integer(c1pl)).compareTo(c2pl); } }); - Constructor closeMatch = null; + Constructor closeMatch = null; int[] argsToConvert = null; - Constructor matchRequiringConversion = null; + Constructor matchRequiringConversion = null; - for (Constructor ctor : ctors) { - Class[] paramTypes = ctor.getParameterTypes(); + for (Constructor ctor : ctors) { + Class[] paramTypes = ctor.getParameterTypes(); List paramDescriptors = new ArrayList(paramTypes.length); for (int i = 0; i < paramTypes.length; i++) { paramDescriptors.add(new TypeDescriptor(new MethodParameter(ctor, i))); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java index 1b4da4b284..ab8daee28f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java @@ -45,7 +45,7 @@ class ReflectiveMethodExecutor implements MethodExecutor { public ReflectiveMethodExecutor(Method theMethod, int[] argumentsRequiringConversion) { this.method = theMethod; if (theMethod.isVarArgs()) { - Class[] paramTypes = theMethod.getParameterTypes(); + Class[] paramTypes = theMethod.getParameterTypes(); this.varargsPosition = paramTypes.length - 1; } else { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java index 7443896b58..f594808f12 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java @@ -487,13 +487,13 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { private static class CacheKey { - private final Class clazz; + private final Class clazz; private final String name; private boolean targetIsClass; - public CacheKey(Class clazz, String name, boolean targetIsClass) { + public CacheKey(Class clazz, String name, boolean targetIsClass) { this.clazz = clazz; this.name = name; this.targetIsClass = targetIsClass; @@ -560,7 +560,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { } @Override - public Class[] getSpecificTargetClasses() { + public Class[] getSpecificTargetClasses() { throw new UnsupportedOperationException("Should not be called on an OptimalPropertyAccessor"); } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java index f42308ec88..9974ffc535 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java @@ -73,7 +73,7 @@ public class StandardTypeComparator implements TypeComparator { try { if (left instanceof Comparable) { - return ((Comparable) left).compareTo(right); + return ((Comparable) left).compareTo(right); } } catch (ClassCastException cce) { throw new SpelEvaluationException(cce, SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass()); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index cc6a36af06..78ef848cc4 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -1943,6 +1943,11 @@ public class SpelReproTests extends ExpressionTestCase { this.string = string; } + @Override + public int hashCode() { + return 0; + } + public boolean equals(Object o) { if (o instanceof TestClass2) { return string.equals(((TestClass2)o).string); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/A.java b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/A.java index 3098b293c7..d5fad894e6 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/A.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/A.java @@ -19,6 +19,7 @@ package org.springframework.expression.spel.spr10210; import org.springframework.expression.spel.spr10210.comp.B; import org.springframework.expression.spel.spr10210.infra.C; +@SuppressWarnings("serial") abstract class A extends B { public void bridgeMethod() { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/D.java b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/D.java index e4776d70e6..4ddbe7c4d1 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/D.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/D.java @@ -16,5 +16,6 @@ package org.springframework.expression.spel.spr10210; +@SuppressWarnings("serial") public class D extends A { } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/comp/B.java b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/comp/B.java index 3250836265..98a8ddb28f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/comp/B.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/spr10210/comp/B.java @@ -20,5 +20,6 @@ import java.io.Serializable; import org.springframework.expression.spel.spr10210.infra.C; +@SuppressWarnings("serial") public class B implements Serializable { } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java index f52aea49db..9db420e002 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java @@ -59,7 +59,7 @@ public class ArgumentTypePreparedStatementSetter implements PreparedStatementSet for (int i = 0; i < this.args.length; i++) { Object arg = this.args[i]; if (arg instanceof Collection && this.argTypes[i] != Types.ARRAY) { - Collection entries = (Collection) arg; + Collection entries = (Collection) arg; for (Object entry : entries) { if (entry instanceof Object[]) { Object[] valueArray = ((Object[]) entry); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index 78e0a92fdc..37946c5e41 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -371,7 +371,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { protected Connection createConnectionProxy(Connection con) { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), - new Class[] {ConnectionProxy.class}, + new Class[] {ConnectionProxy.class}, new CloseSuppressingInvocationHandler(con)); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java index db9c03e7cc..95ae0d9c19 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java @@ -194,13 +194,13 @@ public class PreparedStatementCreatorFactory { private final String actualSql; - private final List parameters; + private final List parameters; public PreparedStatementCreatorImpl(List parameters) { this(sql, parameters); } - public PreparedStatementCreatorImpl(String actualSql, List parameters) { + public PreparedStatementCreatorImpl(String actualSql, List parameters) { this.actualSql = actualSql; Assert.notNull(parameters, "Parameters List must not be null"); this.parameters = parameters; @@ -283,7 +283,7 @@ public class PreparedStatementCreatorFactory { declaredParameter = declaredParameters.get(i); } if (in instanceof Collection && declaredParameter.getSqlType() != Types.ARRAY) { - Collection entries = (Collection) in; + Collection entries = (Collection) in; for (Object entry : entries) { if (entry instanceof Object[]) { Object[] valueArray = ((Object[])entry); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java index 7c17163747..ca515b5bbc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java @@ -25,11 +25,11 @@ package org.springframework.jdbc.core; */ public class ResultSetSupportingSqlParameter extends SqlParameter { - private ResultSetExtractor resultSetExtractor; + private ResultSetExtractor resultSetExtractor; private RowCallbackHandler rowCallbackHandler; - private RowMapper rowMapper; + private RowMapper rowMapper; /** @@ -68,7 +68,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rse ResultSetExtractor to use for parsing the ResultSet */ - public ResultSetSupportingSqlParameter(String name, int sqlType, ResultSetExtractor rse) { + public ResultSetSupportingSqlParameter(String name, int sqlType, ResultSetExtractor rse) { super(name, sqlType); this.resultSetExtractor = rse; } @@ -90,7 +90,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rm RowMapper to use for parsing the ResultSet */ - public ResultSetSupportingSqlParameter(String name, int sqlType, RowMapper rm) { + public ResultSetSupportingSqlParameter(String name, int sqlType, RowMapper rm) { super(name, sqlType); this.rowMapper = rm; } @@ -107,7 +107,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter { /** * Return the ResultSetExtractor held by this parameter, if any. */ - public ResultSetExtractor getResultSetExtractor() { + public ResultSetExtractor getResultSetExtractor() { return this.resultSetExtractor; } @@ -121,7 +121,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter { /** * Return the RowMapper held by this parameter, if any. */ - public RowMapper getRowMapper() { + public RowMapper getRowMapper() { return this.rowMapper; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java index 2597b09743..1749385394 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java @@ -121,7 +121,7 @@ public class SingleColumnRowMapper implements RowMapper { * @see org.springframework.jdbc.support.JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class) * @see #getColumnValue(java.sql.ResultSet, int) */ - protected Object getColumnValue(ResultSet rs, int index, Class requiredType) throws SQLException { + protected Object getColumnValue(ResultSet rs, int index, Class requiredType) throws SQLException { if (requiredType != null) { return JdbcUtils.getResultSetValue(rs, index, requiredType); } @@ -164,18 +164,18 @@ public class SingleColumnRowMapper implements RowMapper { * @see #getColumnValue(java.sql.ResultSet, int, Class) */ @SuppressWarnings("unchecked") - protected Object convertValueToRequiredType(Object value, Class requiredType) { + protected Object convertValueToRequiredType(Object value, Class requiredType) { if (String.class.equals(requiredType)) { return value.toString(); } else if (Number.class.isAssignableFrom(requiredType)) { if (value instanceof Number) { // Convert original Number to target Number class. - return NumberUtils.convertNumberToTargetClass(((Number) value), requiredType); + return NumberUtils.convertNumberToTargetClass(((Number) value), (Class) requiredType); } else { // Convert stringified value to target Number class. - return NumberUtils.parseNumber(value.toString(), requiredType); + return NumberUtils.parseNumber(value.toString(),(Class) requiredType); } } else { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java index 9bdb7f0a9f..1c25a16b85 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java @@ -77,7 +77,7 @@ public class SqlInOutParameter extends SqlOutParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rse ResultSetExtractor to use for parsing the ResultSet */ - public SqlInOutParameter(String name, int sqlType, ResultSetExtractor rse) { + public SqlInOutParameter(String name, int sqlType, ResultSetExtractor rse) { super(name, sqlType, rse); } @@ -97,7 +97,7 @@ public class SqlInOutParameter extends SqlOutParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rm RowMapper to use for parsing the ResultSet */ - public SqlInOutParameter(String name, int sqlType, RowMapper rm) { + public SqlInOutParameter(String name, int sqlType, RowMapper rm) { super(name, sqlType, rm); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java index 9454e2bdaf..0baba25d2f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlOutParameter.java @@ -83,7 +83,7 @@ public class SqlOutParameter extends ResultSetSupportingSqlParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rse ResultSetExtractor to use for parsing the ResultSet */ - public SqlOutParameter(String name, int sqlType, ResultSetExtractor rse) { + public SqlOutParameter(String name, int sqlType, ResultSetExtractor rse) { super(name, sqlType, rse); } @@ -103,7 +103,7 @@ public class SqlOutParameter extends ResultSetSupportingSqlParameter { * @param sqlType SQL type of the parameter according to java.sql.Types * @param rm RowMapper to use for parsing the ResultSet */ - public SqlOutParameter(String name, int sqlType, RowMapper rm) { + public SqlOutParameter(String name, int sqlType, RowMapper rm) { super(name, sqlType, rm); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java index 1120d8f83a..02e956c291 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java @@ -35,7 +35,7 @@ public class SqlReturnResultSet extends ResultSetSupportingSqlParameter { * @param name name of the parameter, as used in input and output maps * @param extractor ResultSetExtractor to use for parsing the {@link java.sql.ResultSet} */ - public SqlReturnResultSet(String name, ResultSetExtractor extractor) { + public SqlReturnResultSet(String name, ResultSetExtractor extractor) { super(name, 0, extractor); } @@ -53,7 +53,7 @@ public class SqlReturnResultSet extends ResultSetSupportingSqlParameter { * @param name name of the parameter, as used in input and output maps * @param mapper RowMapper to use for parsing the {@link java.sql.ResultSet} */ - public SqlReturnResultSet(String name, RowMapper mapper) { + public SqlReturnResultSet(String name, RowMapper mapper) { super(name, 0, mapper); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java index a0db5625a4..dd0f94a66e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java @@ -18,6 +18,7 @@ package org.springframework.jdbc.core; import java.sql.ResultSet; import java.sql.SQLException; + import javax.sql.rowset.CachedRowSet; import javax.sql.rowset.RowSetFactory; import javax.sql.rowset.RowSetProvider; @@ -133,9 +134,27 @@ public class SqlRowSetResultSetExtractor implements ResultSetExtractor IMPLEMENTATION_CLASS; + static { + try { + IMPLEMENTATION_CLASS = Class.forName("com.sun.rowset.CachedRowSetImpl"); + } + catch (ClassNotFoundException ex) { + throw new IllegalStateException(ex); + } + } + @Override public CachedRowSet createCachedRowSet() throws SQLException { - return new com.sun.rowset.CachedRowSetImpl(); + try { + return (CachedRowSet) IMPLEMENTATION_CLASS.newInstance(); + } + catch (InstantiationException ex) { + throw new IllegalStateException(ex); + } + catch (IllegalAccessException ex) { + throw new IllegalStateException(ex); + } } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java index 62eb086861..1644ce1596 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java @@ -60,7 +60,7 @@ public abstract class StatementCreatorUtils { private static final Log logger = LogFactory.getLog(StatementCreatorUtils.class); - private static Map javaTypeToSqlTypeMap = new HashMap(32); + private static Map, Integer> javaTypeToSqlTypeMap = new HashMap, Integer>(32); static { /* JDBC 3.0 only - not compatible with e.g. MySQL at present @@ -94,7 +94,7 @@ public abstract class StatementCreatorUtils { * @param javaType the Java type to translate * @return the corresponding SQL type, or {@code null} if none found */ - public static int javaTypeToSqlParameterType(Class javaType) { + public static int javaTypeToSqlParameterType(Class javaType) { Integer sqlType = javaTypeToSqlTypeMap.get(javaType); if (sqlType != null) { return sqlType; @@ -362,7 +362,7 @@ public abstract class StatementCreatorUtils { /** * Check whether the given value can be treated as a String value. */ - private static boolean isStringValue(Class inValueType) { + private static boolean isStringValue(Class inValueType) { // Consider any CharSequence (including StringBuffer and StringBuilder) as a String. return (CharSequence.class.isAssignableFrom(inValueType) || StringWriter.class.isAssignableFrom(inValueType)); @@ -372,7 +372,7 @@ public abstract class StatementCreatorUtils { * Check whether the given value is a {@code java.util.Date} * (but not one of the JDBC-specific subclasses). */ - private static boolean isDateValue(Class inValueType) { + private static boolean isDateValue(Class inValueType) { return (java.util.Date.class.isAssignableFrom(inValueType) && !(java.sql.Date.class.isAssignableFrom(inValueType) || java.sql.Time.class.isAssignableFrom(inValueType) || @@ -399,7 +399,7 @@ public abstract class StatementCreatorUtils { * @see DisposableSqlTypeValue#cleanup() * @see org.springframework.jdbc.core.support.SqlLobValue#cleanup() */ - public static void cleanupParameters(Collection paramValues) { + public static void cleanupParameters(Collection paramValues) { if (paramValues != null) { for (Object inValue : paramValues) { if (inValue instanceof DisposableSqlTypeValue) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index dacff255ec..80a0011486 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -224,7 +224,7 @@ public class CallMetaDataContext { * @param rowMapper a RowMapper implementation used to map the data returned in the result set * @return the appropriate SqlParameter */ - public SqlParameter createReturnResultSetParameter(String parameterName, RowMapper rowMapper) { + public SqlParameter createReturnResultSetParameter(String parameterName, RowMapper rowMapper) { if (this.metaDataProvider.isReturnResultSetSupported()) { return new SqlReturnResultSet(parameterName, rowMapper); } @@ -434,7 +434,7 @@ public class CallMetaDataContext { public Map matchInParameterValuesWithCallParameters(SqlParameterSource parameterSource) { // For parameter source lookups we need to provide case-insensitive lookup support // since the database metadata is not necessarily providing case sensitive parameter names. - Map caseInsensitiveParameterNames = + Map caseInsensitiveParameterNames = SqlParameterSourceUtils.extractCaseInsensitiveParameterNames(parameterSource); Map callParameterNames = new HashMap(this.callParameters.size()); @@ -467,7 +467,7 @@ public class CallMetaDataContext { } else { if (caseInsensitiveParameterNames.containsKey(lowerCaseName)) { - String sourceName = (String) caseInsensitiveParameterNames.get(lowerCaseName); + String sourceName = caseInsensitiveParameterNames.get(lowerCaseName); matchedParameters.put(parameterName, SqlParameterSourceUtils.getTypedValue(parameterSource, sourceName)); } else { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java index 75ba14dc10..b298aa6fb4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java @@ -107,7 +107,7 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider { ReflectionUtils.makeAccessible(getIncludeSynonyms); originalValueForIncludeSynonyms = (Boolean) getIncludeSynonyms.invoke(con); - setIncludeSynonyms = con.getClass().getMethod("setIncludeSynonyms", new Class[] {boolean.class}); + setIncludeSynonyms = con.getClass().getMethod("setIncludeSynonyms", new Class[] {boolean.class}); ReflectionUtils.makeAccessible(setIncludeSynonyms); setIncludeSynonyms.invoke(con, Boolean.TRUE); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java index 31f73add5f..380de1d90a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java @@ -239,7 +239,7 @@ public class TableMetaDataContext { List values = new ArrayList(); // for parameter source lookups we need to provide caseinsensitive lookup support since the // database metadata is not necessarily providing case sensitive column names - Map caseInsensitiveParameterNames = + Map caseInsensitiveParameterNames = SqlParameterSourceUtils.extractCaseInsensitiveParameterNames(parameterSource); for (String column : this.tableColumns) { if (parameterSource.hasValue(column)) { @@ -259,7 +259,7 @@ public class TableMetaDataContext { if (caseInsensitiveParameterNames.containsKey(lowerCaseName)) { values.add( SqlParameterSourceUtils.getTypedValue(parameterSource, - (String) caseInsensitiveParameterNames.get(lowerCaseName))); + caseInsensitiveParameterNames.get(lowerCaseName))); } else { values.add(null); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java index 364b075b61..1726eabf3f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java @@ -99,7 +99,7 @@ public class BeanPropertySqlParameterSource extends AbstractSqlParameterSource { if (sqlType != TYPE_UNKNOWN) { return sqlType; } - Class propType = this.beanWrapper.getPropertyType(paramName); + Class propType = this.beanWrapper.getPropertyType(paramName); return StatementCreatorUtils.javaTypeToSqlParameterType(propType); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java index 31f84b50e5..6ddba8f262 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java @@ -252,10 +252,10 @@ public abstract class NamedParameterUtils { public static String substituteNamedParameters(ParsedSql parsedSql, SqlParameterSource paramSource) { String originalSql = parsedSql.getOriginalSql(); StringBuilder actualSql = new StringBuilder(); - List paramNames = parsedSql.getParameterNames(); + List paramNames = parsedSql.getParameterNames(); int lastIndex = 0; for (int i = 0; i < paramNames.size(); i++) { - String paramName = (String) paramNames.get(i); + String paramName = paramNames.get(i); int[] indexes = parsedSql.getParameterIndexes(i); int startIndex = indexes[0]; int endIndex = indexes[1]; @@ -266,7 +266,7 @@ public abstract class NamedParameterUtils { value = ((SqlParameterValue) value).getValue(); } if (value instanceof Collection) { - Iterator entryIter = ((Collection) value).iterator(); + Iterator entryIter = ((Collection) value).iterator(); int k = 0; while (entryIter.hasNext()) { if (k > 0) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java index b23eb8ca4b..e9f3f04e68 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java @@ -35,10 +35,10 @@ public class SqlParameterSourceUtils { * @param valueMaps array of Maps containing the values to be used * @return an array of SqlParameterSource */ - public static SqlParameterSource[] createBatch(Map[] valueMaps) { + public static SqlParameterSource[] createBatch(Map[] valueMaps) { MapSqlParameterSource[] batch = new MapSqlParameterSource[valueMaps.length]; for (int i = 0; i < valueMaps.length; i++) { - Map valueMap = valueMaps[i]; + Map valueMap = valueMaps[i]; batch[i] = new MapSqlParameterSource(valueMap); } return batch; @@ -80,13 +80,13 @@ public class SqlParameterSourceUtils { } } -/** - * Create a Map of case insensitive parameter names together with the original name. - * @param parameterSource the source of paramer names - * @return the Map that can be used for case insensitive matching of parameter names - */ - public static Map extractCaseInsensitiveParameterNames(SqlParameterSource parameterSource) { - Map caseInsensitiveParameterNames = new HashMap(); + /** + * Create a Map of case insensitive parameter names together with the original name. + * @param parameterSource the source of paramer names + * @return the Map that can be used for case insensitive matching of parameter names + */ + public static Map extractCaseInsensitiveParameterNames(SqlParameterSource parameterSource) { + Map caseInsensitiveParameterNames = new HashMap(); if (parameterSource instanceof BeanPropertySqlParameterSource) { String[] propertyNames = ((BeanPropertySqlParameterSource)parameterSource).getReadablePropertyNames(); for (int i = 0; i < propertyNames.length; i++) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java index 70ed57c654..b9cbee53f6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java @@ -57,7 +57,7 @@ public abstract class AbstractJdbcCall { private final List declaredParameters = new ArrayList(); /** List of RefCursor/ResultSet RowMapper objects */ - private final Map declaredRowMappers = new LinkedHashMap(); + private final Map> declaredRowMappers = new LinkedHashMap>(); /** * Has this operation been compiled? Compilation means at @@ -219,7 +219,7 @@ public abstract class AbstractJdbcCall { * @param parameterName name of parameter or column * @param rowMapper the RowMapper implementation to use */ - public void addDeclaredRowMapper(String parameterName, RowMapper rowMapper) { + public void addDeclaredRowMapper(String parameterName, RowMapper rowMapper) { this.declaredRowMappers.put(parameterName, rowMapper); if (logger.isDebugEnabled()) { logger.debug("Added row mapper for [" + getProcedureName() + "]: " + parameterName); @@ -279,7 +279,7 @@ public abstract class AbstractJdbcCall { this.callMetaDataContext.initializeMetaData(getJdbcTemplate().getDataSource()); // iterate over the declared RowMappers and register the corresponding SqlParameter - for (Map.Entry entry : this.declaredRowMappers.entrySet()) { + for (Map.Entry> entry : this.declaredRowMappers.entrySet()) { SqlParameter resultSetParameter = this.callMetaDataContext.createReturnResultSetParameter(entry.getKey(), entry.getValue()); this.declaredParameters.add(resultSetParameter); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java index d011e8ad91..0ca8ef0e4e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java @@ -544,10 +544,10 @@ public abstract class AbstractJdbcInsert { * @param batch array of Maps with parameter names and values to be used in batch insert * @return array of number of rows affected */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected int[] doExecuteBatch(Map[] batch) { checkCompiled(); - List[] batchValues = new ArrayList[batch.length]; + List[] batchValues = new ArrayList[batch.length]; int i = 0; for (Map args : batch) { List values = matchInParameterValuesWithInsertColumns(args); @@ -561,10 +561,10 @@ public abstract class AbstractJdbcInsert { * @param batch array of SqlParameterSource with parameter names and values to be used in insert * @return array of number of rows affected */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected int[] doExecuteBatch(SqlParameterSource[] batch) { checkCompiled(); - List[] batchValues = new ArrayList[batch.length]; + List[] batchValues = new ArrayList[batch.length]; int i = 0; for (SqlParameterSource parameterSource : batch) { List values = matchInParameterValuesWithInsertColumns(parameterSource); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java index 1535db535a..06b9fad030 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java @@ -128,7 +128,7 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp } @Override - public SimpleJdbcCall returningResultSet(String parameterName, RowMapper rowMapper) { + public SimpleJdbcCall returningResultSet(String parameterName, RowMapper rowMapper) { addDeclaredRowMapper(parameterName, rowMapper); return this; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java index c1d31013bc..468856dbfe 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java @@ -92,7 +92,7 @@ public interface SimpleJdbcCallOperations { * @param parameterName the name of the returned results and/or the name of the ref cursor parameter * @param rowMapper the RowMapper implementation that will map the data returned for each row * */ - SimpleJdbcCallOperations returningResultSet(String parameterName, RowMapper rowMapper); + SimpleJdbcCallOperations returningResultSet(String parameterName, RowMapper rowMapper); /** * Turn off any processing of parameter meta data information obtained via JDBC. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java index 4a15e97fd4..496bbdbfbe 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java @@ -53,7 +53,7 @@ import org.springframework.jdbc.core.ResultSetExtractor; * @see org.springframework.jdbc.support.lob.LobHandler * @see org.springframework.jdbc.LobRetrievalFailureException */ -public abstract class AbstractLobStreamingResultSetExtractor implements ResultSetExtractor { +public abstract class AbstractLobStreamingResultSetExtractor implements ResultSetExtractor { /** * Delegates to handleNoRowFound, handleMultipleRowsFound and streamData, @@ -65,7 +65,7 @@ public abstract class AbstractLobStreamingResultSetExtractor implements ResultSe * @see org.springframework.jdbc.LobRetrievalFailureException */ @Override - public final Object extractData(ResultSet rs) throws SQLException, DataAccessException { + public final T extractData(ResultSet rs) throws SQLException, DataAccessException { if (!rs.next()) { handleNoRowFound(); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java index 4b931564a9..9df9e096cd 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java @@ -219,7 +219,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { public Connection getConnection() throws SQLException { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), - new Class[] {ConnectionProxy.class}, + new Class[] {ConnectionProxy.class}, new LazyConnectionInvocationHandler()); } @@ -237,7 +237,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { public Connection getConnection(String username, String password) throws SQLException { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), - new Class[] {ConnectionProxy.class}, + new Class[] {ConnectionProxy.class}, new LazyConnectionInvocationHandler(username, password)); } @@ -289,12 +289,12 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { return System.identityHashCode(proxy); } else if (method.getName().equals("unwrap")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return proxy; } } else if (method.getName().equals("isWrapperFor")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return true; } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java index 4ee8e3c573..9d1411e906 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java @@ -278,7 +278,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource protected Connection getCloseSuppressingConnectionProxy(Connection target) { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), - new Class[] {ConnectionProxy.class}, + new Class[] {ConnectionProxy.class}, new CloseSuppressingInvocationHandler(target)); } @@ -307,12 +307,12 @@ public class SingleConnectionDataSource extends DriverManagerDataSource return System.identityHashCode(proxy); } else if (method.getName().equals("unwrap")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return proxy; } } else if (method.getName().equals("isWrapperFor")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return true; } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java index 81953eb2e3..81f94b62bb 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java @@ -138,7 +138,7 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource { protected Connection getTransactionAwareConnectionProxy(DataSource targetDataSource) { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), - new Class[] {ConnectionProxy.class}, + new Class[] {ConnectionProxy.class}, new TransactionAwareInvocationHandler(targetDataSource)); } @@ -198,12 +198,12 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource { return sb.toString(); } else if (method.getName().equals("unwrap")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return proxy; } } else if (method.getName().equals("isWrapperFor")) { - if (((Class) args[0]).isInstance(proxy)) { + if (((Class) args[0]).isInstance(proxy)) { return true; } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java index 6a3c6c534e..ec29246bb2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java @@ -69,7 +69,7 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter protected final Log logger = LogFactory.getLog(getClass()); - private Class wsDataSourceClass; + private Class wsDataSourceClass; private Method newJdbcConnSpecMethod; @@ -91,16 +91,16 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter public WebSphereDataSourceAdapter() { try { this.wsDataSourceClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.WSDataSource"); - Class jdbcConnSpecClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.JDBCConnectionSpec"); - Class wsrraFactoryClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.WSRRAFactory"); - this.newJdbcConnSpecMethod = wsrraFactoryClass.getMethod("createJDBCConnectionSpec", (Class[]) null); + Class jdbcConnSpecClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.JDBCConnectionSpec"); + Class wsrraFactoryClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.WSRRAFactory"); + this.newJdbcConnSpecMethod = wsrraFactoryClass.getMethod("createJDBCConnectionSpec", (Class[]) null); this.wsDataSourceGetConnectionMethod = - this.wsDataSourceClass.getMethod("getConnection", new Class[] {jdbcConnSpecClass}); + this.wsDataSourceClass.getMethod("getConnection", new Class[] {jdbcConnSpecClass}); this.setTransactionIsolationMethod = - jdbcConnSpecClass.getMethod("setTransactionIsolation", new Class[] {int.class}); - this.setReadOnlyMethod = jdbcConnSpecClass.getMethod("setReadOnly", new Class[] {Boolean.class}); - this.setUserNameMethod = jdbcConnSpecClass.getMethod("setUserName", new Class[] {String.class}); - this.setPasswordMethod = jdbcConnSpecClass.getMethod("setPassword", new Class[] {String.class}); + jdbcConnSpecClass.getMethod("setTransactionIsolation", new Class[] {int.class}); + this.setReadOnlyMethod = jdbcConnSpecClass.getMethod("setReadOnly", new Class[] {Boolean.class}); + this.setUserNameMethod = jdbcConnSpecClass.getMethod("setUserName", new Class[] {String.class}); + this.setPasswordMethod = jdbcConnSpecClass.getMethod("setPassword", new Class[] {String.class}); } catch (Exception ex) { throw new IllegalStateException( diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java index 610c9e6309..7e688c6afe 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java @@ -113,7 +113,7 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple throw new IllegalArgumentException("Property 'targetDataSources' is required"); } this.resolvedDataSources = new HashMap(this.targetDataSources.size()); - for (Map.Entry entry : this.targetDataSources.entrySet()) { + for (Map.Entry entry : this.targetDataSources.entrySet()) { Object lookupKey = resolveSpecifiedLookupKey(entry.getKey()); DataSource dataSource = resolveSpecifiedDataSource(entry.getValue()); this.resolvedDataSources.put(lookupKey, dataSource); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java index 3b0b7342bf..6854921db9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java @@ -22,13 +22,14 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.util.Assert; import org.springframework.dao.InvalidDataAccessResourceUsageException; -public class GenericSqlQuery extends SqlQuery { +public class GenericSqlQuery extends SqlQuery { - Class rowMapperClass; + Class rowMapperClass; - RowMapper rowMapper; + RowMapper rowMapper; - public void setRowMapperClass(Class rowMapperClass) + @SuppressWarnings("rawtypes") + public void setRowMapperClass(Class rowMapperClass) throws IllegalAccessException, InstantiationException { this.rowMapperClass = rowMapperClass; if (!RowMapper.class.isAssignableFrom(rowMapperClass)) @@ -44,9 +45,10 @@ public class GenericSqlQuery extends SqlQuery { } @Override - protected RowMapper newRowMapper(Object[] parameters, Map context) { + @SuppressWarnings("unchecked") + protected RowMapper newRowMapper(Object[] parameters, Map context) { try { - return (RowMapper) rowMapperClass.newInstance(); + return (RowMapper) rowMapperClass.newInstance(); } catch (InstantiationException e) { throw new InvalidDataAccessResourceUsageException("Unable to instantiate RowMapper", e); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java index 1f3ec18701..e88a9c82a1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java @@ -59,7 +59,7 @@ public abstract class MappingSqlQuery extends MappingSqlQueryWithParameters context) throws SQLException { return mapRow(rs, rowNum); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java index 37db4a54ce..ae0b5fc32b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java @@ -70,7 +70,7 @@ public abstract class MappingSqlQueryWithParameters extends SqlQuery { * implementation of the mapRow() method. */ @Override - protected RowMapper newRowMapper(Object[] parameters, Map context) { + protected RowMapper newRowMapper(Object[] parameters, Map context) { return new RowMapperImpl(parameters, context); } @@ -89,7 +89,7 @@ public abstract class MappingSqlQueryWithParameters extends SqlQuery { * Subclasses can simply not catch SQLExceptions, relying on the * framework to clean up. */ - protected abstract T mapRow(ResultSet rs, int rowNum, Object[] parameters, Map context) + protected abstract T mapRow(ResultSet rs, int rowNum, Object[] parameters, Map context) throws SQLException; @@ -101,12 +101,12 @@ public abstract class MappingSqlQueryWithParameters extends SqlQuery { private final Object[] params; - private final Map context; + private final Map context; /** * Use an array results. More efficient if we know how many results to expect. */ - public RowMapperImpl(Object[] parameters, Map context) { + public RowMapperImpl(Object[] parameters, Map context) { this.params = parameters; this.context = context; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java index 6067251bac..337e4d6137 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java @@ -401,7 +401,7 @@ public abstract class RdbmsOperation implements InitializingBean { */ protected void validateNamedParameters(Map parameters) throws InvalidDataAccessApiUsageException { checkCompiled(); - Map paramsToUse = (parameters != null ? parameters : Collections.emptyMap()); + Map paramsToUse = (parameters != null ? parameters : Collections. emptyMap()); int declaredInParameters = 0; for (SqlParameter param : this.declaredParameters) { if (param.isInputValueProvided()) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java index 58f8f3d24b..ea4d858270 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java @@ -106,7 +106,7 @@ public abstract class SqlQuery extends SqlOperation { * @return a List of objects, one per row of the ResultSet. Normally all these * will be of the same class, although it is possible to use different types. */ - public List execute(Object[] params, Map context) throws DataAccessException { + public List execute(Object[] params, Map context) throws DataAccessException { validateParameters(params); RowMapper rowMapper = newRowMapper(params, context); return getJdbcTemplate().query(newPreparedStatementCreator(params), rowMapper); @@ -126,7 +126,7 @@ public abstract class SqlQuery extends SqlOperation { * Convenient method to execute without parameters. * @param context the contextual information for object creation */ - public List execute(Map context) throws DataAccessException { + public List execute(Map context) throws DataAccessException { return execute((Object[]) null, context); } @@ -142,7 +142,7 @@ public abstract class SqlQuery extends SqlOperation { * @param p1 single int parameter * @param context the contextual information for object creation */ - public List execute(int p1, Map context) throws DataAccessException { + public List execute(int p1, Map context) throws DataAccessException { return execute(new Object[] {p1}, context); } @@ -160,7 +160,7 @@ public abstract class SqlQuery extends SqlOperation { * @param p2 second int parameter * @param context the contextual information for object creation */ - public List execute(int p1, int p2, Map context) throws DataAccessException { + public List execute(int p1, int p2, Map context) throws DataAccessException { return execute(new Object[] {p1, p2}, context); } @@ -178,7 +178,7 @@ public abstract class SqlQuery extends SqlOperation { * @param p1 single long parameter * @param context the contextual information for object creation */ - public List execute(long p1, Map context) throws DataAccessException { + public List execute(long p1, Map context) throws DataAccessException { return execute(new Object[] {p1}, context); } @@ -195,7 +195,7 @@ public abstract class SqlQuery extends SqlOperation { * @param p1 single String parameter * @param context the contextual information for object creation */ - public List execute(String p1, Map context) throws DataAccessException { + public List execute(String p1, Map context) throws DataAccessException { return execute(new Object[] {p1}, context); } @@ -219,7 +219,7 @@ public abstract class SqlQuery extends SqlOperation { * @return a List of objects, one per row of the ResultSet. Normally all these * will be of the same class, although it is possible to use different types. */ - public List executeByNamedParam(Map paramMap, Map context) throws DataAccessException { + public List executeByNamedParam(Map paramMap, Map context) throws DataAccessException { validateNamedParameters(paramMap); ParsedSql parsedSql = getParsedSql(); MapSqlParameterSource paramSource = new MapSqlParameterSource(paramMap); @@ -248,7 +248,7 @@ public abstract class SqlQuery extends SqlOperation { * choose to treat this as an error and throw an exception. * @see org.springframework.dao.support.DataAccessUtils#singleResult */ - public T findObject(Object[] params, Map context) throws DataAccessException { + public T findObject(Object[] params, Map context) throws DataAccessException { List results = execute(params, context); return DataAccessUtils.singleResult(results); } @@ -264,7 +264,7 @@ public abstract class SqlQuery extends SqlOperation { * Convenient method to find a single object given a single int parameter * and a context. */ - public T findObject(int p1, Map context) throws DataAccessException { + public T findObject(int p1, Map context) throws DataAccessException { return findObject(new Object[] {p1}, context); } @@ -279,7 +279,7 @@ public abstract class SqlQuery extends SqlOperation { * Convenient method to find a single object given two int parameters * and a context. */ - public T findObject(int p1, int p2, Map context) throws DataAccessException { + public T findObject(int p1, int p2, Map context) throws DataAccessException { return findObject(new Object[] {p1, p2}, context); } @@ -294,7 +294,7 @@ public abstract class SqlQuery extends SqlOperation { * Convenient method to find a single object given a single long parameter * and a context. */ - public T findObject(long p1, Map context) throws DataAccessException { + public T findObject(long p1, Map context) throws DataAccessException { return findObject(new Object[] {p1}, context); } @@ -309,7 +309,7 @@ public abstract class SqlQuery extends SqlOperation { * Convenient method to find a single object given a single String parameter * and a context. */ - public T findObject(String p1, Map context) throws DataAccessException { + public T findObject(String p1, Map context) throws DataAccessException { return findObject(new Object[] {p1}, context); } @@ -331,7 +331,7 @@ public abstract class SqlQuery extends SqlOperation { * @return a List of objects, one per row of the ResultSet. Normally all these * will be of the same class, although it is possible to use different types. */ - public T findObjectByNamedParam(Map paramMap, Map context) throws DataAccessException { + public T findObjectByNamedParam(Map paramMap, Map context) throws DataAccessException { List results = executeByNamedParam(paramMap, context); return DataAccessUtils.singleResult(results); } @@ -358,6 +358,6 @@ public abstract class SqlQuery extends SqlOperation { * but it can be useful for creating the objects of the result list. * @see #execute */ - protected abstract RowMapper newRowMapper(Object[] parameters, Map context); + protected abstract RowMapper newRowMapper(Object[] parameters, Map context); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java index 3ceb131d7f..7f4acdbcda 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java @@ -60,7 +60,7 @@ public abstract class UpdatableSqlQuery extends SqlQuery { * implementation of the {@code updateRow()} method. */ @Override - protected RowMapper newRowMapper(Object[] parameters, Map context) { + protected RowMapper newRowMapper(Object[] parameters, Map context) { return new RowMapperImpl(context); } @@ -79,7 +79,7 @@ public abstract class UpdatableSqlQuery extends SqlQuery { * Subclasses can simply not catch SQLExceptions, relying on the * framework to clean up. */ - protected abstract T updateRow(ResultSet rs, int rowNum, Map context) throws SQLException; + protected abstract T updateRow(ResultSet rs, int rowNum, Map context) throws SQLException; /** @@ -88,9 +88,9 @@ public abstract class UpdatableSqlQuery extends SqlQuery { */ protected class RowMapperImpl implements RowMapper { - private final Map context; + private final Map context; - public RowMapperImpl(Map context) { + public RowMapperImpl(Map context) { this.context = context; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java index 82954fd435..7727510879 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLErrorCodesTranslation.java @@ -32,7 +32,7 @@ public class CustomSQLErrorCodesTranslation { private String[] errorCodes = new String[0]; - private Class exceptionClass; + private Class exceptionClass; /** @@ -52,7 +52,7 @@ public class CustomSQLErrorCodesTranslation { /** * Set the exception class for the specified error codes. */ - public void setExceptionClass(Class exceptionClass) { + public void setExceptionClass(Class exceptionClass) { if (!DataAccessException.class.isAssignableFrom(exceptionClass)) { throw new IllegalArgumentException("Invalid exception class [" + exceptionClass + "]: needs to be a subclass of [org.springframework.dao.DataAccessException]"); @@ -63,7 +63,7 @@ public class CustomSQLErrorCodesTranslation { /** * Return the exception class for the specified error codes. */ - public Class getExceptionClass() { + public Class getExceptionClass() { return this.exceptionClass; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java index 8e682e1315..ea6be1ab01 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java @@ -129,7 +129,7 @@ public abstract class JdbcUtils { * @return the value object * @throws SQLException if thrown by the JDBC API */ - public static Object getResultSetValue(ResultSet rs, int index, Class requiredType) throws SQLException { + public static Object getResultSetValue(ResultSet rs, int index, Class requiredType) throws SQLException { if (requiredType == null) { return getResultSetValue(rs, index); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java index 232952148d..31da42194a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java @@ -313,14 +313,14 @@ public class SQLErrorCodeSQLExceptionTranslator extends AbstractFallbackSQLExcep * @see CustomSQLErrorCodesTranslation#setExceptionClass */ protected DataAccessException createCustomException( - String task, String sql, SQLException sqlEx, Class exceptionClass) { + String task, String sql, SQLException sqlEx, Class exceptionClass) { // find appropriate constructor try { int constructorType = 0; - Constructor[] constructors = exceptionClass.getConstructors(); - for (Constructor constructor : constructors) { - Class[] parameterTypes = constructor.getParameterTypes(); + Constructor[] constructors = exceptionClass.getConstructors(); + for (Constructor constructor : constructors) { + Class[] parameterTypes = constructor.getParameterTypes(); if (parameterTypes.length == 1 && parameterTypes[0].equals(String.class)) { if (constructorType < MESSAGE_ONLY_CONSTRUCTOR) constructorType = MESSAGE_ONLY_CONSTRUCTOR; @@ -348,30 +348,30 @@ public class SQLErrorCodeSQLExceptionTranslator extends AbstractFallbackSQLExcep } // invoke constructor - Constructor exceptionConstructor; + Constructor exceptionConstructor; switch (constructorType) { case MESSAGE_SQL_SQLEX_CONSTRUCTOR: - Class[] messageAndSqlAndSqlExArgsClass = new Class[] {String.class, String.class, SQLException.class}; + Class[] messageAndSqlAndSqlExArgsClass = new Class[] {String.class, String.class, SQLException.class}; Object[] messageAndSqlAndSqlExArgs = new Object[] {task, sql, sqlEx}; exceptionConstructor = exceptionClass.getConstructor(messageAndSqlAndSqlExArgsClass); return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndSqlExArgs); case MESSAGE_SQL_THROWABLE_CONSTRUCTOR: - Class[] messageAndSqlAndThrowableArgsClass = new Class[] {String.class, String.class, Throwable.class}; + Class[] messageAndSqlAndThrowableArgsClass = new Class[] {String.class, String.class, Throwable.class}; Object[] messageAndSqlAndThrowableArgs = new Object[] {task, sql, sqlEx}; exceptionConstructor = exceptionClass.getConstructor(messageAndSqlAndThrowableArgsClass); return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndThrowableArgs); case MESSAGE_SQLEX_CONSTRUCTOR: - Class[] messageAndSqlExArgsClass = new Class[] {String.class, SQLException.class}; + Class[] messageAndSqlExArgsClass = new Class[] {String.class, SQLException.class}; Object[] messageAndSqlExArgs = new Object[] {task + ": " + sqlEx.getMessage(), sqlEx}; exceptionConstructor = exceptionClass.getConstructor(messageAndSqlExArgsClass); return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlExArgs); case MESSAGE_THROWABLE_CONSTRUCTOR: - Class[] messageAndThrowableArgsClass = new Class[] {String.class, Throwable.class}; + Class[] messageAndThrowableArgsClass = new Class[] {String.class, Throwable.class}; Object[] messageAndThrowableArgs = new Object[] {task + ": " + sqlEx.getMessage(), sqlEx}; exceptionConstructor = exceptionClass.getConstructor(messageAndThrowableArgsClass); return (DataAccessException)exceptionConstructor.newInstance(messageAndThrowableArgs); case MESSAGE_ONLY_CONSTRUCTOR: - Class[] messageOnlyArgsClass = new Class[] {String.class}; + Class[] messageOnlyArgsClass = new Class[] {String.class}; Object[] messageOnlyArgs = new Object[] {task + ": " + sqlEx.getMessage()}; exceptionConstructor = exceptionClass.getConstructor(messageOnlyArgsClass); return (DataAccessException) exceptionConstructor.newInstance(messageOnlyArgs); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java index 3584557999..c1ae28cba2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java @@ -200,6 +200,7 @@ public class DefaultLobHandler extends AbstractLobHandler { } @Override + @SuppressWarnings("resource") public LobCreator getLobCreator() { return (this.createTemporaryLob ? new TemporaryLobCreator() : new DefaultLobCreator()); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java index b5b3b93154..0861b92d22 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java @@ -111,15 +111,15 @@ public class OracleLobHandler extends AbstractLobHandler { private Boolean releaseResourcesAfterRead = Boolean.FALSE; - private Class blobClass; + private Class blobClass; - private Class clobClass; + private Class clobClass; - private final Map durationSessionConstants = new HashMap(2); + private final Map, Integer> durationSessionConstants = new HashMap, Integer>(2); - private final Map modeReadWriteConstants = new HashMap(2); + private final Map, Integer> modeReadWriteConstants = new HashMap, Integer>(2); - private final Map modeReadOnlyConstants = new HashMap(2); + private final Map, Integer> modeReadOnlyConstants = new HashMap, Integer>(2); /** @@ -569,7 +569,7 @@ public class OracleLobHandler extends AbstractLobHandler { /** * Create and open an oracle.sql.BLOB/CLOB instance via reflection. */ - protected Object prepareLob(Connection con, Class lobClass) throws Exception { + protected Object prepareLob(Connection con, Class lobClass) throws Exception { /* BLOB blob = BLOB.createTemporary(con, false, BLOB.DURATION_SESSION); blob.open(BLOB.MODE_READWRITE); @@ -589,7 +589,7 @@ public class OracleLobHandler extends AbstractLobHandler { @Override public void close() { try { - for (Iterator it = this.temporaryLobs.iterator(); it.hasNext();) { + for (Iterator it = this.temporaryLobs.iterator(); it.hasNext();) { /* BLOB blob = (BLOB) it.next(); blob.freeTemporary(); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java index 186b28baba..d109506b4e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java @@ -63,7 +63,7 @@ public class C3P0NativeJdbcExtractor extends NativeJdbcExtractorAdapter { public C3P0NativeJdbcExtractor() { try { - this.getRawConnectionMethod = getClass().getMethod("getRawConnection", new Class[] {Connection.class}); + this.getRawConnectionMethod = getClass().getMethod("getRawConnection", new Class[] {Connection.class}); } catch (NoSuchMethodException ex) { throw new IllegalStateException("Internal error in C3P0NativeJdbcExtractor: " + ex.getMessage()); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java index 964f31d511..ee7d46f0c4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java @@ -63,7 +63,7 @@ public class CommonsDbcpNativeJdbcExtractor extends NativeJdbcExtractorAdapter { return null; } try { - Class classToAnalyze = obj.getClass(); + Class classToAnalyze = obj.getClass(); while (!Modifier.isPublic(classToAnalyze.getModifiers())) { classToAnalyze = classToAnalyze.getSuperclass(); if (classToAnalyze == null) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java index 81b2d2ae5f..e85a1efedf 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java @@ -55,11 +55,11 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private static final String JBOSS_RESOURCE_PREFIX = "org.jboss.resource.adapter.jdbc."; - private Class wrappedConnectionClass; + private Class wrappedConnectionClass; - private Class wrappedStatementClass; + private Class wrappedStatementClass; - private Class wrappedResultSetClass; + private Class wrappedResultSetClass; private Method getUnderlyingConnectionMethod; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java index 09129320e5..aa77ddca68 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java @@ -46,7 +46,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private static final String JDBC_EXTENSION_NAME = "weblogic.jdbc.extensions.WLConnection"; - private final Class jdbcExtensionClass; + private final Class jdbcExtensionClass; private final Method getVendorConnectionMethod; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java index b225ea19d2..55e818d381 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java @@ -45,7 +45,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private static final String JDBC_ADAPTER_UTIL_NAME = "com.ibm.ws.rsadapter.jdbc.WSJdbcUtil"; - private Class webSphereConnectionClass; + private Class webSphereConnectionClass; private Method webSphereNativeConnectionMethod; @@ -57,9 +57,9 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { public WebSphereNativeJdbcExtractor() { try { this.webSphereConnectionClass = getClass().getClassLoader().loadClass(JDBC_ADAPTER_CONNECTION_NAME); - Class jdbcAdapterUtilClass = getClass().getClassLoader().loadClass(JDBC_ADAPTER_UTIL_NAME); + Class jdbcAdapterUtilClass = getClass().getClassLoader().loadClass(JDBC_ADAPTER_UTIL_NAME); this.webSphereNativeConnectionMethod = - jdbcAdapterUtilClass.getMethod("getNativeConnection", new Class[] {this.webSphereConnectionClass}); + jdbcAdapterUtilClass.getMethod("getNativeConnection", new Class[] {this.webSphereConnectionClass}); } catch (Exception ex) { throw new IllegalStateException( diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java index ed9d66190c..0234cf59b2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java @@ -23,13 +23,14 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLXML; + +import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.w3c.dom.Document; - import org.springframework.dao.DataAccessResourceFailureException; +import org.w3c.dom.Document; /** * Default implementation of the {@link SqlXmlHandler} interface. @@ -81,14 +82,12 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { } @Override - @SuppressWarnings("unchecked") - public Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException { + public Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException { return rs.getSQLXML(columnName).getSource(sourceClass != null ? sourceClass : DOMSource.class); } @Override - @SuppressWarnings("unchecked") - public Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException { + public Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException { return rs.getSQLXML(columnIndex).getSource(sourceClass != null ? sourceClass : DOMSource.class); } @@ -128,10 +127,9 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { } @Override - public SqlXmlValue newSqlXmlValue(final Class resultClass, final XmlResultProvider provider) { + public SqlXmlValue newSqlXmlValue(final Class resultClass, final XmlResultProvider provider) { return new AbstractJdbc4SqlXmlValue() { @Override - @SuppressWarnings("unchecked") protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { provider.provideXml(xmlObject.setResult(resultClass)); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java index 2a702794ee..a7a59318e4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java @@ -21,6 +21,7 @@ import java.io.Reader; import java.sql.ResultSet; import java.sql.SQLException; +import javax.xml.transform.Result; import javax.xml.transform.Source; import org.w3c.dom.Document; @@ -146,7 +147,7 @@ public interface SqlXmlHandler { * @see java.sql.ResultSet#getSQLXML * @see java.sql.SQLXML#getSource */ - Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException; + Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException; /** * Retrieve the given column as Source implemented using the specified source class @@ -161,7 +162,7 @@ public interface SqlXmlHandler { * @see java.sql.ResultSet#getSQLXML * @see java.sql.SQLXML#getSource */ - Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException; + Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException; //------------------------------------------------------------------------- @@ -207,7 +208,7 @@ public interface SqlXmlHandler { * @see SqlXmlValue * @see java.sql.SQLXML#setResult(Class) */ - SqlXmlValue newSqlXmlValue(Class resultClass, XmlResultProvider provider); + SqlXmlValue newSqlXmlValue(Class resultClass, XmlResultProvider provider); /** * Create a {@code SqlXmlValue} instance for the given XML data, diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java index ffc246037c..4ff2ce09df 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java @@ -47,7 +47,7 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis private static final Method getDeliveryDelayMethod = ClassUtils.getMethodIfAvailable(MessageProducer.class, "getDeliveryDelay"); - private static Class completionListenerClass; + private static Class completionListenerClass; private static Method sendWithCompletionListenerMethod; @@ -254,7 +254,7 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis public MessageProducer getProxyIfNecessary() { if (completionListenerClass != null) { return (MessageProducer) Proxy.newProxyInstance(CachedMessageProducer.class.getClassLoader(), - new Class[] {MessageProducer.class, QueueSender.class, TopicPublisher.class}, + new Class[] {MessageProducer.class, QueueSender.class, TopicPublisher.class}, new Jms2MessageProducerInvocationHandler()); } else { diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java index c9068787d9..ec586de9cb 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java @@ -250,7 +250,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory { * @return the wrapped Session */ protected Session getCachedSessionProxy(Session target, LinkedList sessionList) { - List classes = new ArrayList(3); + List> classes = new ArrayList>(3); classes.add(SessionProxy.class); if (target instanceof QueueSession) { classes.add(QueueSession.class); @@ -260,7 +260,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory { } return (Session) Proxy.newProxyInstance( SessionProxy.class.getClassLoader(), - classes.toArray(new Class[classes.size()]), + classes.toArray(new Class[classes.size()]), new CachedSessionInvocationHandler(target, sessionList)); } diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java index db0d74aa1e..21e8af20c7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java @@ -452,7 +452,7 @@ public class SingleConnectionFactory * @return the wrapped Connection */ protected Connection getSharedConnectionProxy(Connection target) { - List classes = new ArrayList(3); + List> classes = new ArrayList>(3); classes.add(Connection.class); if (target instanceof QueueConnection) { classes.add(QueueConnection.class); @@ -462,7 +462,7 @@ public class SingleConnectionFactory } return (Connection) Proxy.newProxyInstance( Connection.class.getClassLoader(), - classes.toArray(new Class[classes.size()]), + classes.toArray(new Class[classes.size()]), new SharedConnectionInvocationHandler(target)); } diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java index de2b64c1fa..f14e9b2015 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java @@ -196,7 +196,7 @@ public class TransactionAwareConnectionFactoryProxy * @return the wrapped Connection */ protected Connection getTransactionAwareConnectionProxy(Connection target) { - List classes = new ArrayList(3); + List> classes = new ArrayList>(3); classes.add(Connection.class); if (target instanceof QueueConnection) { classes.add(QueueConnection.class); @@ -206,7 +206,7 @@ public class TransactionAwareConnectionFactoryProxy } return (Connection) Proxy.newProxyInstance( Connection.class.getClassLoader(), - classes.toArray(new Class[classes.size()]), + classes.toArray(new Class[classes.size()]), new TransactionAwareConnectionInvocationHandler(target)); } @@ -268,7 +268,7 @@ public class TransactionAwareConnectionFactoryProxy } private Session getCloseSuppressingSessionProxy(Session target) { - List classes = new ArrayList(3); + List> classes = new ArrayList>(3); classes.add(SessionProxy.class); if (target instanceof QueueSession) { classes.add(QueueSession.class); @@ -278,7 +278,7 @@ public class TransactionAwareConnectionFactoryProxy } return (Session) Proxy.newProxyInstance( SessionProxy.class.getClassLoader(), - classes.toArray(new Class[classes.size()]), + classes.toArray(new Class[classes.size()]), new CloseSuppressingSessionInvocationHandler(target)); } } diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java index 23ead10e33..a35b56149b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java @@ -329,7 +329,7 @@ public class MessageListenerAdapter if (delegate != this) { if (delegate instanceof SessionAwareMessageListener) { if (session != null) { - ((SessionAwareMessageListener) delegate).onMessage(message, session); + ((SessionAwareMessageListener) delegate).onMessage(message, session); return; } else if (!(delegate instanceof MessageListener)) { diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java index c0e008f560..85c9179298 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java @@ -73,7 +73,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa * "ActivationSpecImpl" in the same package as the ResourceAdapter class. */ @Override - protected Class determineActivationSpecClass(ResourceAdapter adapter) { + protected Class determineActivationSpecClass(ResourceAdapter adapter) { String adapterClassName = adapter.getClass().getName(); if (adapterClassName.endsWith(RESOURCE_ADAPTER_SUFFIX)) { diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java index 62ac11d7d2..fafb5e335c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java @@ -50,7 +50,7 @@ import org.springframework.jms.support.destination.DestinationResolver; */ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactory { - private Class activationSpecClass; + private Class activationSpecClass; private Map defaultProperties; @@ -61,7 +61,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor * Specify the fully-qualified ActivationSpec class name for the target * provider (e.g. "org.apache.activemq.ra.ActiveMQActivationSpec"). */ - public void setActivationSpecClass(Class activationSpecClass) { + public void setActivationSpecClass(Class activationSpecClass) { this.activationSpecClass = activationSpecClass; } @@ -93,7 +93,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor @Override public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) { - Class activationSpecClassToUse = this.activationSpecClass; + Class activationSpecClassToUse = this.activationSpecClass; if (activationSpecClassToUse == null) { activationSpecClassToUse = determineActivationSpecClass(adapter); if (activationSpecClassToUse == null) { @@ -118,7 +118,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor * if not determinable * @see #setActivationSpecClass */ - protected Class determineActivationSpecClass(ResourceAdapter adapter) { + protected Class determineActivationSpecClass(ResourceAdapter adapter) { return null; } diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java index 0bfe3407af..1a6986964e 100644 --- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java +++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java @@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils; public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor implements FactoryBean, BeanClassLoaderAware { - private Class serviceInterface; + private Class serviceInterface; private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); @@ -57,7 +57,7 @@ public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor * is {@code null}, or if the supplied {@code serviceInterface} * is not an interface type */ - public void setServiceInterface(Class serviceInterface) { + public void setServiceInterface(Class serviceInterface) { if (serviceInterface == null || !serviceInterface.isInterface()) { throw new IllegalArgumentException("'serviceInterface' must be an interface"); } diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java index fd5e4be5a0..8c391b68c5 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; + import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -68,7 +69,7 @@ public class SimpleMessageConverter implements MessageConverter { return createMessageForByteArray((byte[]) object, session); } else if (object instanceof Map) { - return createMessageForMap((Map) object, session); + return createMessageForMap((Map) object, session); } else if (object instanceof Serializable) { return createMessageForSerializable(((Serializable) object), session); @@ -146,7 +147,7 @@ public class SimpleMessageConverter implements MessageConverter { */ protected MapMessage createMessageForMap(Map map, Session session) throws JMSException { MapMessage message = session.createMapMessage(); - for (Map.Entry entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { if (!(entry.getKey() instanceof String)) { throw new MessageConversionException("Cannot convert non-String key of type [" + ObjectUtils.nullSafeClassName(entry.getKey()) + "] to JMS MapMessage entry"); @@ -197,11 +198,12 @@ public class SimpleMessageConverter implements MessageConverter { * @return the resulting Map * @throws JMSException if thrown by JMS methods */ - protected Map extractMapFromMessage(MapMessage message) throws JMSException { + @SuppressWarnings("unchecked") + protected Map extractMapFromMessage(MapMessage message) throws JMSException { Map map = new HashMap(); - Enumeration en = message.getMapNames(); + Enumeration en = message.getMapNames(); while (en.hasMoreElements()) { - String key = (String) en.nextElement(); + String key = en.nextElement(); map.put(key, message.getObject(key)); } return map; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java index 5ed8476495..ccd7c14166 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java @@ -140,7 +140,7 @@ public class JndiDestinationResolver extends JndiLocatorSupport implements Cachi * {@code false} in case of a Queue */ protected void validateDestination(Destination destination, String destinationName, boolean pubSubDomain) { - Class targetClass = Queue.class; + Class targetClass = Queue.class; if (pubSubDomain) { targetClass = Topic.class; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolver.java index 3158bd290a..79e4c4af5c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolver.java @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.messaging.core; - /** + * Strategy interface that resolves a given name to a destination. + * * @author Mark Fisher * @since 4.0 */ public interface DestinationResolver { - /** - * @param name - * @return - * @throws DestinationResolutionException + * Resolve the given {@code name} to a destination. + * @param name the name to resolve + * @return the destination (must not be {@code null}) + * @throws DestinationResolutionException if the name cannot be resolved */ D resolveDestination(String name) throws DestinationResolutionException; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java index 019aa4e396..fd10a0f78b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java @@ -140,7 +140,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH else { SendTo sendTo = returnType.getMethodAnnotation(SendTo.class); String[] destinations = getTargetDestinations(sendTo, inputHeaders, this.defaultDestinationPrefix); - for (String destination : getTargetDestinations(sendTo, inputHeaders, this.defaultDestinationPrefix)) { + for (String destination : destinations) { this.messagingTemplate.convertAndSend(destination, returnValue, postProcessor); } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java index ab499f450a..a3a5796eef 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java @@ -16,20 +16,17 @@ package org.springframework.messaging.simp.handler; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.messaging.core.MessageSendingOperations; -import org.springframework.messaging.simp.SimpMessageHeaderAccessor; -import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import java.util.Set; - - /** * Provides support for messages sent to "user" destinations, translating the * destination to one or more user-specific destination(s) and then sending message(s) diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java index c1c46bc248..3e74495609 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java @@ -16,8 +16,6 @@ package org.springframework.orm.hibernate4.support; -import java.util.concurrent.Callable; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -31,9 +29,9 @@ import org.springframework.orm.hibernate4.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.AsyncWebRequestInterceptor; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.WebRequest; -import org.springframework.web.context.request.async.*; +import org.springframework.web.context.request.async.WebAsyncManager; +import org.springframework.web.context.request.async.WebAsyncUtils; /** * Spring web request interceptor that binds a Hibernate {@code Session} to the diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java index efd648ce11..2fd001c342 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java @@ -49,7 +49,7 @@ public class ObjectOptimisticLockingFailureException extends OptimisticLockingFa * @param persistentClass the persistent class * @param identifier the ID of the object for which the locking failed */ - public ObjectOptimisticLockingFailureException(Class persistentClass, Object identifier) { + public ObjectOptimisticLockingFailureException(Class persistentClass, Object identifier) { this(persistentClass, identifier, null); } @@ -61,7 +61,7 @@ public class ObjectOptimisticLockingFailureException extends OptimisticLockingFa * @param cause the source exception */ public ObjectOptimisticLockingFailureException( - Class persistentClass, Object identifier, Throwable cause) { + Class persistentClass, Object identifier, Throwable cause) { this(persistentClass, identifier, "Object of class [" + persistentClass.getName() + "] with identifier [" + identifier + @@ -77,7 +77,7 @@ public class ObjectOptimisticLockingFailureException extends OptimisticLockingFa * @param cause the source exception */ public ObjectOptimisticLockingFailureException( - Class persistentClass, Object identifier, String msg, Throwable cause) { + Class persistentClass, Object identifier, String msg, Throwable cause) { super(msg, cause); this.persistentClass = persistentClass; @@ -130,8 +130,8 @@ public class ObjectOptimisticLockingFailureException extends OptimisticLockingFa * Return the persistent class of the object for which the locking failed. * If no Class was specified, this method returns null. */ - public Class getPersistentClass() { - return (this.persistentClass instanceof Class ? (Class) this.persistentClass : null); + public Class getPersistentClass() { + return (this.persistentClass instanceof Class ? (Class) this.persistentClass : null); } /** @@ -140,7 +140,7 @@ public class ObjectOptimisticLockingFailureException extends OptimisticLockingFa */ public String getPersistentClassName() { if (this.persistentClass instanceof Class) { - return ((Class) this.persistentClass).getName(); + return ((Class) this.persistentClass).getName(); } return (this.persistentClass != null ? this.persistentClass.toString() : null); } diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java index c2306d33af..0603e74697 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java @@ -49,7 +49,7 @@ public class ObjectRetrievalFailureException extends DataRetrievalFailureExcepti * @param persistentClass the persistent class * @param identifier the ID of the object that should have been retrieved */ - public ObjectRetrievalFailureException(Class persistentClass, Object identifier) { + public ObjectRetrievalFailureException(Class persistentClass, Object identifier) { this(persistentClass, identifier, "Object of class [" + persistentClass.getName() + "] with identifier [" + identifier + "]: not found", null); @@ -64,7 +64,7 @@ public class ObjectRetrievalFailureException extends DataRetrievalFailureExcepti * @param cause the source exception */ public ObjectRetrievalFailureException( - Class persistentClass, Object identifier, String msg, Throwable cause) { + Class persistentClass, Object identifier, String msg, Throwable cause) { super(msg, cause); this.persistentClass = persistentClass; @@ -104,8 +104,8 @@ public class ObjectRetrievalFailureException extends DataRetrievalFailureExcepti * Return the persistent class of the object that was not found. * If no Class was specified, this method returns null. */ - public Class getPersistentClass() { - return (this.persistentClass instanceof Class ? (Class) this.persistentClass : null); + public Class getPersistentClass() { + return (this.persistentClass instanceof Class ? (Class) this.persistentClass : null); } /** @@ -114,7 +114,7 @@ public class ObjectRetrievalFailureException extends DataRetrievalFailureExcepti */ public String getPersistentClassName() { if (this.persistentClass instanceof Class) { - return ((Class) this.persistentClass).getName(); + return ((Class) this.persistentClass).getName(); } return (this.persistentClass != null ? this.persistentClass.toString() : null); } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java index c284afd935..3647ca8bb8 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java @@ -94,7 +94,7 @@ public interface HibernateOperations { * @return a List result returned by the action, or {@code null} * @throws org.springframework.dao.DataAccessException in case of Hibernate errors */ - List executeFind(HibernateCallback action) throws DataAccessException; + List executeFind(HibernateCallback action) throws DataAccessException; //------------------------------------------------------------------------- @@ -245,7 +245,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException if there is a Hibernate error * @see org.hibernate.Session#createCriteria */ - List loadAll(Class entityClass) throws DataAccessException; + List loadAll(Class entityClass) throws DataAccessException; /** * Load the persistent instance with the given identifier @@ -567,7 +567,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#delete(Object) */ - void deleteAll(Collection entities) throws DataAccessException; + void deleteAll(Collection entities) throws DataAccessException; /** * Flush all pending saves, updates and deletes to the database. @@ -600,7 +600,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#createQuery */ - List find(String queryString) throws DataAccessException; + List find(String queryString) throws DataAccessException; /** * Execute an HQL query, binding one value to a "?" parameter in the @@ -611,7 +611,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#createQuery */ - List find(String queryString, Object value) throws DataAccessException; + List find(String queryString, Object value) throws DataAccessException; /** * Execute an HQL query, binding a number of values to "?" parameters @@ -622,7 +622,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#createQuery */ - List find(String queryString, Object... values) throws DataAccessException; + List find(String queryString, Object... values) throws DataAccessException; /** * Execute an HQL query, binding one value to a ":" named parameter @@ -634,7 +634,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedParam(String queryString, String paramName, Object value) + List findByNamedParam(String queryString, String paramName, Object value) throws DataAccessException; /** @@ -647,7 +647,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedParam(String queryString, String[] paramNames, Object[] values) + List findByNamedParam(String queryString, String[] paramNames, Object[] values) throws DataAccessException; /** @@ -660,7 +660,7 @@ public interface HibernateOperations { * @see org.hibernate.Query#setProperties * @see org.hibernate.Session#createQuery */ - List findByValueBean(String queryString, Object valueBean) throws DataAccessException; + List findByValueBean(String queryString, Object valueBean) throws DataAccessException; //------------------------------------------------------------------------- @@ -675,7 +675,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQuery(String queryName) throws DataAccessException; + List findByNamedQuery(String queryName) throws DataAccessException; /** * Execute a named query, binding one value to a "?" parameter in @@ -687,7 +687,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQuery(String queryName, Object value) throws DataAccessException; + List findByNamedQuery(String queryName, Object value) throws DataAccessException; /** * Execute a named query binding a number of values to "?" parameters @@ -699,7 +699,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQuery(String queryName, Object... values) throws DataAccessException; + List findByNamedQuery(String queryName, Object... values) throws DataAccessException; /** * Execute a named query, binding one value to a ":" named parameter @@ -712,7 +712,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQueryAndNamedParam(String queryName, String paramName, Object value) + List findByNamedQueryAndNamedParam(String queryName, String paramName, Object value) throws DataAccessException; /** @@ -726,7 +726,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQueryAndNamedParam(String queryName, String[] paramNames, Object[] values) + List findByNamedQueryAndNamedParam(String queryName, String[] paramNames, Object[] values) throws DataAccessException; /** @@ -740,7 +740,7 @@ public interface HibernateOperations { * @see org.hibernate.Query#setProperties * @see org.hibernate.Session#getNamedQuery(String) */ - List findByNamedQueryAndValueBean(String queryName, Object valueBean) + List findByNamedQueryAndValueBean(String queryName, Object valueBean) throws DataAccessException; @@ -757,7 +757,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.criterion.DetachedCriteria#getExecutableCriteria(org.hibernate.Session) */ - List findByCriteria(DetachedCriteria criteria) throws DataAccessException; + List findByCriteria(DetachedCriteria criteria) throws DataAccessException; /** * Execute a query based on the given Hibernate criteria object. @@ -774,7 +774,7 @@ public interface HibernateOperations { * @see org.hibernate.Criteria#setFirstResult(int) * @see org.hibernate.Criteria#setMaxResults(int) */ - List findByCriteria(DetachedCriteria criteria, int firstResult, int maxResults) throws DataAccessException; + List findByCriteria(DetachedCriteria criteria, int firstResult, int maxResults) throws DataAccessException; /** * Execute a query based on the given example entity object. @@ -784,7 +784,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.criterion.Example#create(Object) */ - List findByExample(Object exampleEntity) throws DataAccessException; + List findByExample(Object exampleEntity) throws DataAccessException; /** * Execute a query based on the given example entity object. @@ -795,7 +795,7 @@ public interface HibernateOperations { * @throws org.springframework.dao.DataAccessException in case of Hibernate errors * @see org.hibernate.criterion.Example#create(Object) */ - List findByExample(String entityName, Object exampleEntity) throws DataAccessException; + List findByExample(String entityName, Object exampleEntity) throws DataAccessException; /** * Execute a query based on a given example entity object. @@ -811,7 +811,7 @@ public interface HibernateOperations { * @see org.hibernate.Criteria#setFirstResult(int) * @see org.hibernate.Criteria#setMaxResults(int) */ - List findByExample(Object exampleEntity, int firstResult, int maxResults) throws DataAccessException; + List findByExample(Object exampleEntity, int firstResult, int maxResults) throws DataAccessException; /** * Execute a query based on a given example entity object. @@ -828,7 +828,7 @@ public interface HibernateOperations { * @see org.hibernate.Criteria#setFirstResult(int) * @see org.hibernate.Criteria#setMaxResults(int) */ - List findByExample(String entityName, Object exampleEntity, int firstResult, int maxResults) + List findByExample(String entityName, Object exampleEntity, int firstResult, int maxResults) throws DataAccessException; @@ -846,7 +846,7 @@ public interface HibernateOperations { * @see org.hibernate.Session#createQuery * @see org.hibernate.Query#iterate */ - Iterator iterate(String queryString) throws DataAccessException; + Iterator iterate(String queryString) throws DataAccessException; /** * Execute a query for persistent instances, binding one value @@ -860,7 +860,7 @@ public interface HibernateOperations { * @see org.hibernate.Session#createQuery * @see org.hibernate.Query#iterate */ - Iterator iterate(String queryString, Object value) throws DataAccessException; + Iterator iterate(String queryString, Object value) throws DataAccessException; /** * Execute a query for persistent instances, binding a number of @@ -874,7 +874,7 @@ public interface HibernateOperations { * @see org.hibernate.Session#createQuery * @see org.hibernate.Query#iterate */ - Iterator iterate(String queryString, Object... values) throws DataAccessException; + Iterator iterate(String queryString, Object... values) throws DataAccessException; /** * Immediately close an {@link Iterator} created by any of the various @@ -884,7 +884,7 @@ public interface HibernateOperations { * @throws DataAccessException if the {@code Iterator} could not be closed * @see org.hibernate.Hibernate#close */ - void closeIterator(Iterator it) throws DataAccessException; + void closeIterator(Iterator it) throws DataAccessException; /** * Update/delete all objects according to the given query. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java index 205738d84a..3e4c7dfc26 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java @@ -40,7 +40,6 @@ import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Example; import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; - import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.InvalidDataAccessApiUsageException; @@ -105,6 +104,7 @@ import org.springframework.util.Assert; * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor */ +@SuppressWarnings("deprecation") public class HibernateTemplate extends HibernateAccessor implements HibernateOperations { private boolean allowCreate = true; @@ -341,13 +341,14 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List executeFind(HibernateCallback action) throws DataAccessException { + @SuppressWarnings("unchecked") + public List executeFind(HibernateCallback action) throws DataAccessException { Object result = doExecute(action, false, false); if (result != null && !(result instanceof List)) { throw new InvalidDataAccessApiUsageException( "Result object returned from HibernateCallback isn't a List: [" + result + "]"); } - return (List) result; + return (List) result; } /** @@ -482,17 +483,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe * @see #prepareCriteria */ protected Session createSessionProxy(Session session) { - Class[] sessionIfcs = null; - Class mainIfc = (session instanceof org.hibernate.classic.Session ? + Class[] sessionIfcs = null; + Class mainIfc = (session instanceof org.hibernate.classic.Session ? org.hibernate.classic.Session.class : Session.class); if (session instanceof EventSource) { - sessionIfcs = new Class[] {mainIfc, EventSource.class}; + sessionIfcs = new Class[] {mainIfc, EventSource.class}; } else if (session instanceof SessionImplementor) { - sessionIfcs = new Class[] {mainIfc, SessionImplementor.class}; + sessionIfcs = new Class[] {mainIfc, SessionImplementor.class}; } else { - sessionIfcs = new Class[] {mainIfc}; + sessionIfcs = new Class[] {mainIfc}; } return (Session) Proxy.newProxyInstance( session.getClass().getClassLoader(), sessionIfcs, @@ -515,7 +516,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe return executeWithNativeSession(new HibernateCallback() { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked" }) public T doInHibernate(Session session) throws HibernateException { if (lockMode != null) { return (T) session.get(entityClass, id, lockMode); @@ -560,7 +561,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe return executeWithNativeSession(new HibernateCallback() { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked" }) public T doInHibernate(Session session) throws HibernateException { if (lockMode != null) { return (T) session.load(entityClass, id, lockMode); @@ -917,7 +918,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public void deleteAll(final Collection entities) throws DataAccessException { + public void deleteAll(final Collection entities) throws DataAccessException { executeWithNativeSession(new HibernateCallback() { @Override public Object doInHibernate(Session session) throws HibernateException { @@ -958,20 +959,21 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe //------------------------------------------------------------------------- @Override - public List find(String queryString) throws DataAccessException { + public List find(String queryString) throws DataAccessException { return find(queryString, (Object[]) null); } @Override - public List find(String queryString, Object value) throws DataAccessException { + public List find(String queryString, Object value) throws DataAccessException { return find(queryString, new Object[] {value}); } @Override - public List find(final String queryString, final Object... values) throws DataAccessException { - return executeWithNativeSession(new HibernateCallback() { + public List find(final String queryString, final Object... values) throws DataAccessException { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.createQuery(queryString); prepareQuery(queryObject); if (values != null) { @@ -985,22 +987,23 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List findByNamedParam(String queryString, String paramName, Object value) + public List findByNamedParam(String queryString, String paramName, Object value) throws DataAccessException { return findByNamedParam(queryString, new String[] {paramName}, new Object[] {value}); } @Override - public List findByNamedParam(final String queryString, final String[] paramNames, final Object[] values) + public List findByNamedParam(final String queryString, final String[] paramNames, final Object[] values) throws DataAccessException { if (paramNames.length != values.length) { throw new IllegalArgumentException("Length of paramNames array must match length of values array"); } - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.createQuery(queryString); prepareQuery(queryObject); if (values != null) { @@ -1014,12 +1017,13 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List findByValueBean(final String queryString, final Object valueBean) + public List findByValueBean(final String queryString, final Object valueBean) throws DataAccessException { - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.createQuery(queryString); prepareQuery(queryObject); queryObject.setProperties(valueBean); @@ -1034,20 +1038,21 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe //------------------------------------------------------------------------- @Override - public List findByNamedQuery(String queryName) throws DataAccessException { + public List findByNamedQuery(String queryName) throws DataAccessException { return findByNamedQuery(queryName, (Object[]) null); } @Override - public List findByNamedQuery(String queryName, Object value) throws DataAccessException { + public List findByNamedQuery(String queryName, Object value) throws DataAccessException { return findByNamedQuery(queryName, new Object[] {value}); } @Override - public List findByNamedQuery(final String queryName, final Object... values) throws DataAccessException { - return executeWithNativeSession(new HibernateCallback() { + public List findByNamedQuery(final String queryName, final Object... values) throws DataAccessException { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.getNamedQuery(queryName); prepareQuery(queryObject); if (values != null) { @@ -1061,23 +1066,24 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List findByNamedQueryAndNamedParam(String queryName, String paramName, Object value) + public List findByNamedQueryAndNamedParam(String queryName, String paramName, Object value) throws DataAccessException { return findByNamedQueryAndNamedParam(queryName, new String[] {paramName}, new Object[] {value}); } @Override - public List findByNamedQueryAndNamedParam( + public List findByNamedQueryAndNamedParam( final String queryName, final String[] paramNames, final Object[] values) throws DataAccessException { if (paramNames != null && values != null && paramNames.length != values.length) { throw new IllegalArgumentException("Length of paramNames array must match length of values array"); } - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.getNamedQuery(queryName); prepareQuery(queryObject); if (values != null) { @@ -1091,12 +1097,13 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List findByNamedQueryAndValueBean(final String queryName, final Object valueBean) + public List findByNamedQueryAndValueBean(final String queryName, final Object valueBean) throws DataAccessException { - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Query queryObject = session.getNamedQuery(queryName); prepareQuery(queryObject); queryObject.setProperties(valueBean); @@ -1111,18 +1118,19 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe //------------------------------------------------------------------------- @Override - public List findByCriteria(DetachedCriteria criteria) throws DataAccessException { + public List findByCriteria(DetachedCriteria criteria) throws DataAccessException { return findByCriteria(criteria, -1, -1); } @Override - public List findByCriteria(final DetachedCriteria criteria, final int firstResult, final int maxResults) + public List findByCriteria(final DetachedCriteria criteria, final int firstResult, final int maxResults) throws DataAccessException { Assert.notNull(criteria, "DetachedCriteria must not be null"); - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Criteria executableCriteria = criteria.getExecutableCriteria(session); prepareCriteria(executableCriteria); if (firstResult >= 0) { @@ -1137,29 +1145,30 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public List findByExample(Object exampleEntity) throws DataAccessException { + public List findByExample(Object exampleEntity) throws DataAccessException { return findByExample(null, exampleEntity, -1, -1); } @Override - public List findByExample(String entityName, Object exampleEntity) throws DataAccessException { + public List findByExample(String entityName, Object exampleEntity) throws DataAccessException { return findByExample(entityName, exampleEntity, -1, -1); } @Override - public List findByExample(Object exampleEntity, int firstResult, int maxResults) throws DataAccessException { + public List findByExample(Object exampleEntity, int firstResult, int maxResults) throws DataAccessException { return findByExample(null, exampleEntity, firstResult, maxResults); } @Override - public List findByExample( + public List findByExample( final String entityName, final Object exampleEntity, final int firstResult, final int maxResults) throws DataAccessException { Assert.notNull(exampleEntity, "Example entity must not be null"); - return executeWithNativeSession(new HibernateCallback() { + return executeWithNativeSession(new HibernateCallback>() { @Override - public List doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public List doInHibernate(Session session) throws HibernateException { Criteria executableCriteria = (entityName != null ? session.createCriteria(entityName) : session.createCriteria(exampleEntity.getClass())); executableCriteria.add(Example.create(exampleEntity)); @@ -1181,20 +1190,21 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe //------------------------------------------------------------------------- @Override - public Iterator iterate(String queryString) throws DataAccessException { + public Iterator iterate(String queryString) throws DataAccessException { return iterate(queryString, (Object[]) null); } @Override - public Iterator iterate(String queryString, Object value) throws DataAccessException { + public Iterator iterate(String queryString, Object value) throws DataAccessException { return iterate(queryString, new Object[] {value}); } @Override - public Iterator iterate(final String queryString, final Object... values) throws DataAccessException { - return executeWithNativeSession(new HibernateCallback() { + public Iterator iterate(final String queryString, final Object... values) throws DataAccessException { + return executeWithNativeSession(new HibernateCallback>() { @Override - public Iterator doInHibernate(Session session) throws HibernateException { + @SuppressWarnings("unchecked") + public Iterator doInHibernate(Session session) throws HibernateException { Query queryObject = session.createQuery(queryString); prepareQuery(queryObject); if (values != null) { @@ -1208,7 +1218,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe } @Override - public void closeIterator(Iterator it) throws DataAccessException { + public void closeIterator(Iterator it) throws DataAccessException { try { Hibernate.close(it); } @@ -1329,7 +1339,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe throws HibernateException { if (value instanceof Collection) { - queryObject.setParameterList(paramName, (Collection) value); + queryObject.setParameterList(paramName, (Collection) value); } else if (value instanceof Object[]) { queryObject.setParameterList(paramName, (Object[]) value); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index 07beecad49..be7559ba28 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -17,6 +17,7 @@ package org.springframework.orm.hibernate3; import java.sql.Connection; + import javax.sql.DataSource; import org.hibernate.ConnectionReleaseMode; @@ -29,7 +30,6 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.exception.GenericJDBCException; import org.hibernate.impl.SessionImpl; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -475,6 +475,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana } @Override + @SuppressWarnings("deprecation") protected void doBegin(Object transaction, TransactionDefinition definition) { HibernateTransactionObject txObject = (HibernateTransactionObject) transaction; @@ -706,6 +707,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana } @Override + @SuppressWarnings("deprecation") protected void doCleanupAfterCompletion(Object transaction) { HibernateTransactionObject txObject = (HibernateTransactionObject) transaction; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java index b23952bcc1..8b68dcb594 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java @@ -16,7 +16,6 @@ package org.springframework.orm.hibernate3; -import java.lang.reflect.Method; import java.util.Properties; import org.hibernate.cache.CacheDataDescription; @@ -29,8 +28,6 @@ import org.hibernate.cache.TimestampsRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cfg.Settings; -import org.springframework.util.ReflectionUtils; - /** * Proxy for a Hibernate RegionFactory, delegating to a Spring-managed * RegionFactory instance, determined by LocalSessionFactoryBean's diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java index 45507ecaee..fb21469075 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java @@ -114,10 +114,6 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen private static final ThreadLocal configTimeRegionFactoryHolder = new ThreadLocal(); - @SuppressWarnings("deprecation") - private static final ThreadLocal configTimeCacheProviderHolder = - new ThreadLocal(); - private static final ThreadLocal configTimeLobHandlerHolder = new ThreadLocal(); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java index d1ae6a3b86..1bdad06883 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; + import javax.sql.DataSource; import javax.transaction.Status; import javax.transaction.Transaction; @@ -56,7 +57,6 @@ import org.hibernate.exception.DataException; import org.hibernate.exception.JDBCConnectionException; import org.hibernate.exception.LockAcquisitionException; import org.hibernate.exception.SQLGrammarException; - import org.springframework.core.NamedThreadLocal; import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.DataAccessException; @@ -513,6 +513,7 @@ public abstract class SessionFactoryUtils { * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none * @return the new Session */ + @SuppressWarnings("deprecation") public static Session getNewSession(SessionFactory sessionFactory, Interceptor entityInterceptor) { Assert.notNull(sessionFactory, "No SessionFactory specified"); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java index 9a281edc0f..b6267ad475 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java @@ -17,6 +17,7 @@ package org.springframework.orm.hibernate3.annotation; import java.io.IOException; + import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; @@ -24,7 +25,6 @@ import javax.persistence.MappedSuperclass; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; - import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -81,7 +81,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem private static final String PACKAGE_INFO_SUFFIX = ".package-info"; - private Class[] annotatedClasses; + private Class[] annotatedClasses; private String[] annotatedPackages; @@ -101,7 +101,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem * class-level JDK 1.5+ annotation metadata. * @see org.hibernate.cfg.Configuration#addAnnotatedClass(Class) */ - public void setAnnotatedClasses(Class[] annotatedClasses) { + public void setAnnotatedClasses(Class[] annotatedClasses) { this.annotatedClasses = annotatedClasses; } @@ -150,7 +150,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem @Override protected void postProcessMappings(Configuration config) throws HibernateException { if (this.annotatedClasses != null) { - for (Class annotatedClass : this.annotatedClasses) { + for (Class annotatedClass : this.annotatedClasses) { config.addAnnotatedClass(annotatedClass); } } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java index 58bea92d6a..53af2572c1 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java @@ -148,6 +148,7 @@ public abstract class AbstractLobType implements UserType { * @see #nullSafeGetInternal */ @Override + @Deprecated public final Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException { @@ -171,6 +172,7 @@ public abstract class AbstractLobType implements UserType { * @see #nullSafeSetInternal */ @Override + @Deprecated public final void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java index a29ddc8068..4b469309d7 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java @@ -66,7 +66,7 @@ public class BlobByteArrayType extends AbstractLobType { } @Override - public Class returnedClass() { + public Class returnedClass() { return byte[].class; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java index 3b560b94f3..2943a3cb06 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java @@ -82,7 +82,7 @@ public class BlobSerializableType extends AbstractLobType { } @Override - public Class returnedClass() { + public Class returnedClass() { return Serializable.class; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java index 5f00c63ba4..d48d9b613a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java @@ -72,7 +72,7 @@ public class BlobStringType extends AbstractLobType { } @Override - public Class returnedClass() { + public Class returnedClass() { return String.class; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java index 97814b3fd7..259de92272 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java @@ -68,7 +68,7 @@ public class ClobStringType extends AbstractLobType { } @Override - public Class returnedClass() { + public Class returnedClass() { return String.class; } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java index ff962c9f5c..c83b5e0501 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java @@ -49,7 +49,7 @@ import org.hibernate.persister.entity.EntityPersister; * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map) */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "rawtypes", "deprecation" }) public class IdTransferringMergeEventListener extends DefaultMergeEventListener { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java index d42ce03c12..484d196c8f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java @@ -16,8 +16,6 @@ package org.springframework.orm.hibernate3.support; -import java.util.concurrent.Callable; - import org.hibernate.HibernateException; import org.hibernate.Session; import org.springframework.dao.DataAccessException; @@ -27,9 +25,9 @@ import org.springframework.orm.hibernate3.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.AsyncWebRequestInterceptor; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.WebRequest; -import org.springframework.web.context.request.async.*; +import org.springframework.web.context.request.async.WebAsyncManager; +import org.springframework.web.context.request.async.WebAsyncUtils; /** * Spring web request interceptor that binds a Hibernate {@code Session} to the diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java index 5010a81200..be15c504dd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java @@ -268,7 +268,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean props) { return JDOHelper.getPersistenceManagerFactory(props, this.beanClassLoader); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java index 249885b536..1abd98a598 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java @@ -79,7 +79,7 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe public void setTargetPersistenceManagerFactory(PersistenceManagerFactory target) { Assert.notNull(target, "Target PersistenceManagerFactory must not be null"); this.target = target; - Class[] ifcs = ClassUtils.getAllInterfacesForClass(target.getClass(), target.getClass().getClassLoader()); + Class[] ifcs = ClassUtils.getAllInterfacesForClass(target.getClass(), target.getClass().getClassLoader()); this.proxy = (PersistenceManagerFactory) Proxy.newProxyInstance( target.getClass().getClassLoader(), ifcs, new PersistenceManagerFactoryInvocationHandler()); } @@ -155,7 +155,7 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe PersistenceManagerFactory target = getTargetPersistenceManagerFactory(); PersistenceManager pm = PersistenceManagerFactoryUtils.doGetPersistenceManager(target, isAllowCreate()); - Class[] ifcs = ClassUtils.getAllInterfacesForClass(pm.getClass(), pm.getClass().getClassLoader()); + Class[] ifcs = ClassUtils.getAllInterfacesForClass(pm.getClass(), pm.getClass().getClassLoader()); return Proxy.newProxyInstance( pm.getClass().getClassLoader(), ifcs, new PersistenceManagerInvocationHandler(pm, target)); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java index c4e03c11cc..2945bd6b99 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java @@ -152,7 +152,7 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean[] {getPersistenceManagerInterface()}, new PersistenceManagerInvocationHandler()); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java index e1e41aedfe..0d784527e5 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java @@ -80,6 +80,7 @@ import org.springframework.util.CollectionUtils; * @see LocalEntityManagerFactoryBean * @see LocalContainerEntityManagerFactoryBean */ +@SuppressWarnings("serial") public abstract class AbstractEntityManagerFactoryBean implements FactoryBean, BeanClassLoaderAware, BeanFactoryAware, BeanNameAware, InitializingBean, DisposableBean, EntityManagerFactoryInfo, PersistenceExceptionTranslator, Serializable { @@ -338,7 +339,7 @@ public abstract class AbstractEntityManagerFactoryBean implements * @return proxy entity manager */ protected EntityManagerFactory createEntityManagerFactoryProxy(EntityManagerFactory emf) { - Set ifcs = new LinkedHashSet(); + Set> ifcs = new LinkedHashSet>(); if (this.entityManagerFactoryInterface != null) { ifcs.add(this.entityManagerFactoryInterface); } @@ -348,7 +349,7 @@ public abstract class AbstractEntityManagerFactoryBean implements ifcs.add(EntityManagerFactoryInfo.class); try { return (EntityManagerFactory) Proxy.newProxyInstance( - this.beanClassLoader, ifcs.toArray(new Class[ifcs.size()]), + this.beanClassLoader, ifcs.toArray(new Class[ifcs.size()]), new ManagedEntityManagerFactoryInvocationHandler(this)); } catch (IllegalArgumentException ex) { @@ -378,7 +379,7 @@ public abstract class AbstractEntityManagerFactoryBean implements // JPA 2.1's createEntityManager(SynchronizationType, Map) // Redirect to plain createEntityManager and add synchronization semantics through Spring proxy EntityManager rawEntityManager = (args.length > 1 ? - this.nativeEntityManagerFactory.createEntityManager((Map) args[1]) : + this.nativeEntityManagerFactory.createEntityManager((Map) args[1]) : this.nativeEntityManagerFactory.createEntityManager()); return ExtendedEntityManagerCreator.createApplicationManagedEntityManager(rawEntityManager, this, true); } @@ -532,7 +533,7 @@ public abstract class AbstractEntityManagerFactoryBean implements } else if (method.getName().equals("unwrap")) { // Handle JPA 2.1 unwrap method - could be a proxy match. - Class targetClass = (Class) args[0]; + Class targetClass = (Class) args[0]; if (targetClass == null || targetClass.isInstance(proxy)) { return proxy; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java index 2ab1a24133..341e5be804 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java @@ -18,6 +18,7 @@ package org.springframework.orm.jpa; import java.lang.reflect.Method; import java.util.Map; + import javax.persistence.EntityExistsException; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -34,7 +35,6 @@ import javax.persistence.TransactionRequiredException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -66,6 +66,7 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("unchecked") public abstract class EntityManagerFactoryUtils { /** @@ -85,7 +86,7 @@ public abstract class EntityManagerFactoryUtils { static { try { - @SuppressWarnings("unchecked") + @SuppressWarnings( "rawtypes" ) Class synchronizationTypeClass = (Class) ClassUtils.forName( "javax.persistence.SynchronizationType", EntityManagerFactoryUtils.class.getClassLoader()); createEntityManagerWithSynchronizationTypeMethod = EntityManagerFactory.class.getMethod( @@ -170,7 +171,7 @@ public abstract class EntityManagerFactoryUtils { * @throws DataAccessResourceFailureException if the EntityManager couldn't be obtained * @see JpaTransactionManager */ - public static EntityManager getTransactionalEntityManager(EntityManagerFactory emf, Map properties) + public static EntityManager getTransactionalEntityManager(EntityManagerFactory emf, Map properties) throws DataAccessResourceFailureException { try { return doGetTransactionalEntityManager(emf, properties, true); @@ -193,7 +194,7 @@ public abstract class EntityManagerFactoryUtils { * @see #getTransactionalEntityManager(javax.persistence.EntityManagerFactory) * @see JpaTransactionManager */ - public static EntityManager doGetTransactionalEntityManager(EntityManagerFactory emf, Map properties) + public static EntityManager doGetTransactionalEntityManager(EntityManagerFactory emf, Map properties) throws PersistenceException { return doGetTransactionalEntityManager(emf, properties, true); @@ -215,7 +216,7 @@ public abstract class EntityManagerFactoryUtils { * @see JpaTransactionManager */ public static EntityManager doGetTransactionalEntityManager( - EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) throws PersistenceException { + EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) throws PersistenceException { Assert.notNull(emf, "No EntityManagerFactory specified"); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java index f7f24f147e..5176794667 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java @@ -131,7 +131,7 @@ public abstract class ExtendedEntityManagerCreator { * in any managed transaction * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map) */ - public static EntityManager createContainerManagedEntityManager(EntityManagerFactory emf, Map properties) { + public static EntityManager createContainerManagedEntityManager(EntityManagerFactory emf, Map properties) { return createContainerManagedEntityManager(emf, properties, true); } @@ -150,7 +150,7 @@ public abstract class ExtendedEntityManagerCreator { * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map) */ public static EntityManager createContainerManagedEntityManager( - EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) { + EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) { Assert.notNull(emf, "EntityManagerFactory must not be null"); if (emf instanceof EntityManagerFactoryInfo) { @@ -211,7 +211,7 @@ public abstract class ExtendedEntityManagerCreator { boolean containerManaged, boolean synchronizedWithTransaction) { Assert.notNull(rawEm, "EntityManager must not be null"); - Set ifcs = new LinkedHashSet(); + Set> ifcs = new LinkedHashSet>(); if (emIfc != null) { ifcs.add(emIfc); } @@ -221,7 +221,7 @@ public abstract class ExtendedEntityManagerCreator { ifcs.add(EntityManagerProxy.class); return (EntityManager) Proxy.newProxyInstance( (cl != null ? cl : ExtendedEntityManagerCreator.class.getClassLoader()), - ifcs.toArray(new Class[ifcs.size()]), + ifcs.toArray(new Class[ifcs.size()]), new ExtendedEntityManagerInvocationHandler( rawEm, exceptionTranslator, jta, containerManaged, synchronizedWithTransaction)); } @@ -285,7 +285,7 @@ public abstract class ExtendedEntityManagerCreator { } else if (method.getName().equals("unwrap")) { // Handle JPA 2.0 unwrap method - could be a proxy match. - Class targetClass = (Class) args[0]; + Class targetClass = (Class) args[0]; if (targetClass == null || targetClass.isInstance(proxy)) { return proxy; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java index fbe42b33d8..966cd50851 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java @@ -73,7 +73,7 @@ public abstract class SharedEntityManagerCreator { * {@code createEntityManager} call (may be {@code null}) * @return a shareable transaction EntityManager proxy */ - public static EntityManager createSharedEntityManager(EntityManagerFactory emf, Map properties) { + public static EntityManager createSharedEntityManager(EntityManagerFactory emf, Map properties) { return createSharedEntityManager(emf, properties, true); } @@ -87,11 +87,11 @@ public abstract class SharedEntityManagerCreator { * @return a shareable transaction EntityManager proxy */ public static EntityManager createSharedEntityManager( - EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) { + EntityManagerFactory emf, Map properties, boolean synchronizedWithTransaction) { Class entityManagerInterface = (emf instanceof EntityManagerFactoryInfo ? ((EntityManagerFactoryInfo) emf).getEntityManagerInterface() : EntityManager.class); - return createSharedEntityManager(emf, properties, synchronizedWithTransaction, - (entityManagerInterface == null ? NO_ENTITY_MANAGER_INTERFACES : + return createSharedEntityManager(emf, properties, synchronizedWithTransaction, + (entityManagerInterface == null ? NO_ENTITY_MANAGER_INTERFACES : new Class[] { entityManagerInterface })); } @@ -105,7 +105,7 @@ public abstract class SharedEntityManagerCreator { * @return a shareable transactional EntityManager proxy */ public static EntityManager createSharedEntityManager( - EntityManagerFactory emf, Map properties, Class... entityManagerInterfaces) { + EntityManagerFactory emf, Map properties, Class... entityManagerInterfaces) { return createSharedEntityManager(emf, properties, true, entityManagerInterfaces); } @@ -121,14 +121,14 @@ public abstract class SharedEntityManagerCreator { * EntityManager. Allows the addition or specification of proprietary interfaces. * @return a shareable transactional EntityManager proxy */ - public static EntityManager createSharedEntityManager(EntityManagerFactory emf, Map properties, - boolean synchronizedWithTransaction, Class... entityManagerInterfaces) { + public static EntityManager createSharedEntityManager(EntityManagerFactory emf, Map properties, + boolean synchronizedWithTransaction, Class... entityManagerInterfaces) { ClassLoader cl = null; if (emf instanceof EntityManagerFactoryInfo) { cl = ((EntityManagerFactoryInfo) emf).getBeanClassLoader(); } - Class[] ifcs = new Class[entityManagerInterfaces.length + 1]; + Class[] ifcs = new Class[entityManagerInterfaces.length + 1]; System.arraycopy(entityManagerInterfaces, 0, ifcs, 0, entityManagerInterfaces.length); ifcs[entityManagerInterfaces.length] = EntityManagerProxy.class; return (EntityManager) Proxy.newProxyInstance( @@ -149,14 +149,14 @@ public abstract class SharedEntityManagerCreator { private final EntityManagerFactory targetFactory; - private final Map properties; + private final Map properties; private final boolean synchronizedWithTransaction; private transient volatile ClassLoader proxyClassLoader; public SharedEntityManagerInvocationHandler( - EntityManagerFactory target, Map properties, boolean synchronizedWithTransaction) { + EntityManagerFactory target, Map properties, boolean synchronizedWithTransaction) { this.targetFactory = target; this.properties = properties; this.synchronizedWithTransaction = synchronizedWithTransaction; @@ -203,7 +203,7 @@ public abstract class SharedEntityManagerCreator { } else if (method.getName().equals("unwrap")) { // JPA 2.0: handle unwrap method - could be a proxy match. - Class targetClass = (Class) args[0]; + Class targetClass = (Class) args[0]; if (targetClass == null || targetClass.isInstance(proxy)) { return proxy; } @@ -258,7 +258,7 @@ public abstract class SharedEntityManagerCreator { if (result instanceof Query) { Query query = (Query) result; if (isNewEm) { - Class[] ifcs = ClassUtils.getAllInterfacesForClass(query.getClass(), this.proxyClassLoader); + Class[] ifcs = ClassUtils.getAllInterfacesForClass(query.getClass(), this.proxyClassLoader); result = Proxy.newProxyInstance(this.proxyClassLoader, ifcs, new DeferredQueryInvocationHandler(query, target)); isNewEm = false; @@ -317,7 +317,7 @@ public abstract class SharedEntityManagerCreator { } else if (method.getName().equals("unwrap")) { // Handle JPA 2.0 unwrap method - could be a proxy match. - Class targetClass = (Class) args[0]; + Class targetClass = (Class) args[0]; if (targetClass == null || targetClass.isInstance(proxy)) { return proxy; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java index b518fe262d..11dcb2c297 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java @@ -17,7 +17,6 @@ package org.springframework.orm.jpa.support; import java.io.IOException; -import java.util.concurrent.Callable; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -33,8 +32,8 @@ import org.springframework.orm.jpa.EntityManagerHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.context.request.async.*; +import org.springframework.web.context.request.async.WebAsyncManager; +import org.springframework.web.context.request.async.WebAsyncUtils; import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java index dbc88b73e3..f34d3c7ddb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java @@ -16,7 +16,6 @@ package org.springframework.orm.jpa.support; -import java.util.concurrent.Callable; import javax.persistence.EntityManager; import javax.persistence.PersistenceException; @@ -28,9 +27,7 @@ import org.springframework.orm.jpa.EntityManagerHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.AsyncWebRequestInterceptor; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.WebRequest; -import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter; import org.springframework.web.context.request.async.WebAsyncManager; import org.springframework.web.context.request.async.WebAsyncUtils; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index e1367d3930..04d36f274b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -18,6 +18,7 @@ package org.springframework.orm.jpa.vendor; import java.util.HashMap; import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.spi.PersistenceProvider; @@ -32,11 +33,9 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.dialect.SybaseDialect; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.hibernate.ejb.HibernatePersistence; - import org.springframework.orm.jpa.JpaDialect; /** @@ -77,7 +76,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { jpaProperties.put(Environment.DIALECT, getDatabasePlatform()); } else if (getDatabase() != null) { - Class databaseDialectClass = determineDatabaseDialectClass(getDatabase()); + Class databaseDialectClass = determineDatabaseDialectClass(getDatabase()); if (databaseDialectClass != null) { jpaProperties.put(Environment.DIALECT, databaseDialectClass.getName()); } @@ -98,7 +97,8 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { * @param database the target database * @return the Hibernate database dialect class, or {@code null} if none found */ - protected Class determineDatabaseDialectClass(Database database) { + @SuppressWarnings("deprecation") + protected Class determineDatabaseDialectClass(Database database) { switch (database) { case DB2: return DB2Dialect.class; case DERBY: return DerbyDialect.class; @@ -109,7 +109,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { case ORACLE: return Oracle9iDialect.class; case POSTGRESQL: return PostgreSQLDialect.class; case SQL_SERVER: return SQLServerDialect.class; - case SYBASE: return SybaseDialect.class; + case SYBASE: return org.hibernate.dialect.SybaseDialect.class; default: return null; } } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java index 780f5efa83..1fd49402c1 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java @@ -271,14 +271,13 @@ public class XmlBeansMarshaller extends AbstractMarshaller { if (isValidating() && object != null) { // create a temporary xmlOptions just for validation XmlOptions validateOptions = getXmlOptions() != null ? getXmlOptions() : new XmlOptions(); - List errorsList = new ArrayList(); + List errorsList = new ArrayList(); validateOptions.setErrorListener(errorsList); if (!object.validate(validateOptions)) { StringBuilder builder = new StringBuilder("Could not validate XmlObject :"); - for (Object anErrorsList : errorsList) { - XmlError xmlError = (XmlError) anErrorsList; - if (xmlError instanceof XmlValidationError) { - builder.append(xmlError.toString()); + for (XmlError error : errorsList) { + if (error instanceof XmlValidationError) { + builder.append(error.toString()); } } throw new ValidationFailureException("XMLBeans validation failure", diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java index 94bb1998dc..8d9f4dfa45 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java @@ -46,6 +46,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter; public class CatchAllConverter implements Converter { @Override + @SuppressWarnings("rawtypes") public boolean canConvert(Class type) { return true; } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index e51ee27fc2..cd12a67306 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -27,6 +27,7 @@ import java.lang.reflect.Constructor; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; @@ -61,6 +62,7 @@ import com.thoughtworks.xstream.io.xml.XppDriver; import com.thoughtworks.xstream.mapper.CannotResolveClassException; import com.thoughtworks.xstream.mapper.Mapper; import com.thoughtworks.xstream.mapper.MapperWrapper; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -68,7 +70,6 @@ import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; - import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.oxm.MarshallingFailureException; @@ -480,7 +481,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin for (Map.Entry entry : this.useAttributeFor.entrySet()) { if (entry.getKey() instanceof String) { if (entry.getValue() instanceof Class) { - xstream.useAttributeFor((String) entry.getKey(), (Class) entry.getValue()); + xstream.useAttributeFor((String) entry.getKey(), (Class) entry.getValue()); } else { throw new IllegalArgumentException( @@ -493,7 +494,8 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin xstream.useAttributeFor(key, (String) entry.getValue()); } else if (entry.getValue() instanceof List) { - List listValue = (List) entry.getValue(); + @SuppressWarnings("unchecked") + List listValue = (List) entry.getValue(); for (Object element : listValue) { if (element instanceof String) { xstream.useAttributeFor(key, (String) element); diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java index f1c08e2774..fdb9a9f8fe 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java @@ -18,11 +18,6 @@ package org.springframework.mock.web; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.Expression; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.FunctionMapper; -import javax.servlet.jsp.el.VariableResolver; import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; @@ -42,7 +37,7 @@ import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager */ @SuppressWarnings("deprecation") -public class MockExpressionEvaluator extends ExpressionEvaluator { +public class MockExpressionEvaluator extends javax.servlet.jsp.el.ExpressionEvaluator { private final PageContext pageContext; @@ -58,13 +53,13 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { @Override @SuppressWarnings("rawtypes") - public Expression parseExpression(final String expression, final Class expectedType, - final FunctionMapper functionMapper) throws ELException { + public javax.servlet.jsp.el.Expression parseExpression(final String expression, final Class expectedType, + final javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException { - return new Expression() { + return new javax.servlet.jsp.el.Expression() { @Override - public Object evaluate(VariableResolver variableResolver) throws ELException { + public Object evaluate(javax.servlet.jsp.el.VariableResolver variableResolver) throws javax.servlet.jsp.el.ELException { return doEvaluate(expression, expectedType, functionMapper); } }; @@ -72,8 +67,8 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { @Override @SuppressWarnings("rawtypes") - public Object evaluate(String expression, Class expectedType, VariableResolver variableResolver, - FunctionMapper functionMapper) throws ELException { + public Object evaluate(String expression, Class expectedType, javax.servlet.jsp.el.VariableResolver variableResolver, + javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException { if (variableResolver != null) { throw new IllegalArgumentException("Custom VariableResolver not supported"); @@ -82,8 +77,8 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { } @SuppressWarnings("rawtypes") - protected Object doEvaluate(String expression, Class expectedType, FunctionMapper functionMapper) - throws ELException { + protected Object doEvaluate(String expression, Class expectedType, javax.servlet.jsp.el.FunctionMapper functionMapper) + throws javax.servlet.jsp.el.ELException { if (functionMapper != null) { throw new IllegalArgumentException("Custom FunctionMapper not supported"); @@ -92,7 +87,7 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { return ExpressionEvaluatorManager.evaluate("JSP EL expression", expression, expectedType, this.pageContext); } catch (JspException ex) { - throw new ELException("Parsing of JSP EL expression \"" + expression + "\" failed", ex); + throw new javax.servlet.jsp.el.ELException("Parsing of JSP EL expression \"" + expression + "\" failed", ex); } } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 492e951ca4..8086616953 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -647,6 +647,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } @Override + @Deprecated public String getRealPath(String path) { return this.servletContext.getRealPath(path); } @@ -1026,6 +1027,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } @Override + @Deprecated public boolean isRequestedSessionIdFromUrl() { return isRequestedSessionIdFromURL(); } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index 347ad8291e..17d5fcf08c 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -416,11 +416,13 @@ public class MockHttpServletResponse implements HttpServletResponse { } @Override + @Deprecated public String encodeUrl(String url) { return encodeURL(url); } @Override + @Deprecated public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } @@ -540,6 +542,7 @@ public class MockHttpServletResponse implements HttpServletResponse { } @Override + @Deprecated public void setStatus(int status, String errorMessage) { if(!this.isCommitted()) { this.status = status; diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java index d59c5e70f3..eeaa274c9a 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java @@ -28,7 +28,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; -import javax.servlet.http.HttpSessionContext; import org.springframework.util.Assert; @@ -138,7 +137,7 @@ public class MockHttpSession implements HttpSession { } @Override - public HttpSessionContext getSessionContext() { + public javax.servlet.http.HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } @@ -235,7 +234,7 @@ public class MockHttpSession implements HttpSession { /** * Convenience method for asserting that this session has not been * {@linkplain #invalidate() invalidated}. - * + * * @throws IllegalStateException if this session has been invalidated */ private void assertIsValid() { diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java index 122d38bea5..b1fbe21cd3 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java @@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; import org.springframework.util.Assert; @@ -289,7 +287,7 @@ public class MockPageContext extends PageContext { } @Override - public ExpressionEvaluator getExpressionEvaluator() { + public javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() { return new MockExpressionEvaluator(this); } @@ -299,7 +297,7 @@ public class MockPageContext extends PageContext { } @Override - public VariableResolver getVariableResolver() { + public javax.servlet.jsp.el.VariableResolver getVariableResolver() { return null; } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java index 23f5010d7c..8e4d74c721 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java @@ -30,6 +30,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; + import javax.activation.FileTypeMap; import javax.servlet.Filter; import javax.servlet.FilterRegistration; @@ -44,7 +45,6 @@ import javax.servlet.descriptor.JspConfigDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -408,16 +408,19 @@ public class MockServletContext implements ServletContext { } @Override + @Deprecated public Servlet getServlet(String name) { return null; } @Override + @Deprecated public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } @Override + @Deprecated public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } @@ -428,6 +431,7 @@ public class MockServletContext implements ServletContext { } @Override + @Deprecated public void log(Exception ex, String message) { logger.info(message, ex); } diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java index ef60606b0a..30a2799494 100644 --- a/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java @@ -588,7 +588,6 @@ abstract class ContextLoaderUtils { * taking into account context hierarchies declared via * {@link ContextHierarchy @ContextHierarchy} and * {@link ContextConfiguration @ContextConfiguration}. - * * @param testClass the test class for which the {@code MergedContextConfiguration} * should be built (must not be {@code null}) * @param defaultContextLoaderClassName the name of the default {@code ContextLoader} @@ -599,7 +598,7 @@ abstract class ContextLoaderUtils { * @see #buildContextHierarchyMap(Class) * @see #buildMergedContextConfiguration(Class, List, String, MergedContextConfiguration, CacheAwareContextLoaderDelegate) */ - @SuppressWarnings({ "javadoc", "unchecked" }) + @SuppressWarnings({ "unchecked" }) static MergedContextConfiguration buildMergedContextConfiguration(Class testClass, String defaultContextLoaderClassName, CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate) { diff --git a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java index b891c0f2d9..de842020d0 100644 --- a/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java @@ -26,7 +26,7 @@ import static org.springframework.core.annotation.AnnotationUtils.*; /** * TODO Document MetaAnnotationUtils. - * + * * @author Sam Brannen * @since 4.0 */ @@ -148,7 +148,7 @@ abstract class MetaAnnotationUtils { * Given the following example, if we are searching for the {@code @Transactional} * annotation on the {@code UserRepositoryTests} class, then the * properties of the {@code AnnotationDescriptor} would be as follows. - * + * *
    *
  • declaringClass: {@code UserRepositoryTests} class object
    • *
  • stereotype: instance of the {@code RepositoryTests} annotation
    • @@ -238,7 +238,7 @@ abstract class MetaAnnotationUtils { throw new IllegalArgumentException(message); } - for (Class clazz : annotationTypes) { + for (Class clazz : annotationTypes) { if (!Annotation.class.isAssignableFrom(clazz)) { throw new IllegalArgumentException("Array elements must be of type Annotation"); } diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java index c3d6c8f5c7..adb9acc305 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java @@ -19,7 +19,6 @@ package org.springframework.test.context.junit4.statements; import java.util.ArrayList; import java.util.List; -import org.junit.internal.runners.model.MultipleFailureException; import org.junit.runners.model.Statement; import org.springframework.test.context.TestContextManager; @@ -87,6 +86,6 @@ public class RunAfterTestClassCallbacks extends Statement { if (errors.size() == 1) { throw errors.get(0); } - throw new MultipleFailureException(errors); + throw new org.junit.internal.runners.model.MultipleFailureException(errors); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java index 0fa60566eb..05305bd9e1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.junit.internal.runners.model.MultipleFailureException; import org.junit.runners.model.Statement; import org.springframework.test.context.TestContextManager; @@ -100,6 +99,6 @@ public class RunAfterTestMethodCallbacks extends Statement { if (errors.size() == 1) { throw errors.get(0); } - throw new MultipleFailureException(errors); + throw new org.junit.internal.runners.model.MultipleFailureException(errors); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java index 1f65000a26..562d36b098 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java @@ -70,7 +70,6 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener * @see #setUpRequestContextIfNecessary(TestContext) */ @Override - @SuppressWarnings("javadoc") public void prepareTestInstance(TestContext testContext) throws Exception { setUpRequestContextIfNecessary(testContext); } @@ -83,7 +82,6 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener * @see #setUpRequestContextIfNecessary(TestContext) */ @Override - @SuppressWarnings("javadoc") public void beforeTestMethod(TestContext testContext) throws Exception { setUpRequestContextIfNecessary(testContext); } diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java index 4f7df08790..9bbcece3c4 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java @@ -132,6 +132,7 @@ public abstract class MockRestRequestMatchers { /** * Assert request header values with the given Hamcrest matcher. */ + @SuppressWarnings("unchecked") public static RequestMatcher header(final String name, final Matcher... matchers) { return new RequestMatcher() { @Override diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java index 9cb798d8f2..fd9c0b9d49 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java @@ -42,7 +42,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Rob Winch * @since 3.2 */ -public class DefaultMockMvcBuilder extends MockMvcBuilderSupport +public class DefaultMockMvcBuilder> extends MockMvcBuilderSupport implements MockMvcBuilder { private final WebApplicationContext webAppContext; @@ -89,7 +89,7 @@ public class DefaultMockMvcBuilder extends M * @param filters the filters to add */ @SuppressWarnings("unchecked") - public final T addFilters(Filter... filters) { + public final T addFilters(Filter... filters) { Assert.notNull(filters, "filters cannot be null"); for(Filter f : filters) { @@ -121,7 +121,7 @@ public class DefaultMockMvcBuilder extends M * @param urlPatterns URL patterns to map to; if empty, "/*" is used by default */ @SuppressWarnings("unchecked") - public final T addFilter(Filter filter, String... urlPatterns) { + public final T addFilter(Filter filter, String... urlPatterns) { Assert.notNull(filter, "filter cannot be null"); Assert.notNull(urlPatterns, "urlPatterns cannot be null"); @@ -148,7 +148,7 @@ public class DefaultMockMvcBuilder extends M * . */ @SuppressWarnings("unchecked") - public final T defaultRequest(RequestBuilder requestBuilder) { + public final T defaultRequest(RequestBuilder requestBuilder) { this.defaultRequestBuilder = requestBuilder; return (T) this; } @@ -162,7 +162,7 @@ public class DefaultMockMvcBuilder extends M * {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers} */ @SuppressWarnings("unchecked") - public final T alwaysExpect(ResultMatcher resultMatcher) { + public final T alwaysExpect(ResultMatcher resultMatcher) { this.globalResultMatchers.add(resultMatcher); return (T) this; } @@ -176,7 +176,7 @@ public class DefaultMockMvcBuilder extends M * {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers} */ @SuppressWarnings("unchecked") - public final T alwaysDo(ResultHandler resultHandler) { + public final T alwaysDo(ResultHandler resultHandler) { this.globalResultHandlers.add(resultHandler); return (T) this; } @@ -187,7 +187,7 @@ public class DefaultMockMvcBuilder extends M * @see DispatcherServlet#setDispatchOptionsRequest(boolean) */ @SuppressWarnings("unchecked") - public final T dispatchOptions(boolean dispatchOptions) { + public final T dispatchOptions(boolean dispatchOptions) { this.dispatchOptions = dispatchOptions; return (T) this; } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java index b171f6b43b..676c8bda9b 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java @@ -42,8 +42,8 @@ public class MockMvcBuilders { * application controllers in it. The context must have been configured with * a {@link ServletContext}. */ - public static DefaultMockMvcBuilder> webAppContextSetup(WebApplicationContext context) { - return new DefaultMockMvcBuilder>(context); + public static > DefaultMockMvcBuilder webAppContextSetup(WebApplicationContext context) { + return new DefaultMockMvcBuilder(context); } /** diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java index d4c086695e..0b1faf18f7 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java @@ -172,7 +172,7 @@ public abstract class DataAccessUtils { * @throws TypeMismatchDataAccessException if the unique object * in the collection is not convertable to an int */ - public static int intResult(Collection results) + public static int intResult(Collection results) throws IncorrectResultSizeDataAccessException, TypeMismatchDataAccessException { return objectResult(results, Number.class).intValue(); @@ -191,7 +191,7 @@ public abstract class DataAccessUtils { * @throws TypeMismatchDataAccessException if the unique object * in the collection is not convertable to a long */ - public static long longResult(Collection results) + public static long longResult(Collection results) throws IncorrectResultSizeDataAccessException, TypeMismatchDataAccessException { return objectResult(results, Number.class).longValue(); diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java index 40a50b80dd..1e62916e62 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java @@ -213,7 +213,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory impleme protected Connection getCloseSuppressingConnectionProxy(Connection target) { return (Connection) Proxy.newProxyInstance( Connection.class.getClassLoader(), - new Class[] {Connection.class}, + new Class[] {Connection.class}, new CloseSuppressingInvocationHandler(target)); } diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java index 7fd30b3a9b..88f0cf6f02 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java @@ -108,7 +108,7 @@ public class TransactionAwareConnectionFactoryProxy extends DelegatingConnection protected Connection getTransactionAwareConnectionProxy(Connection target, ConnectionFactory cf) { return (Connection) Proxy.newProxyInstance( Connection.class.getClassLoader(), - new Class[] {Connection.class}, + new Class[] {Connection.class}, new TransactionAwareInvocationHandler(target, cf)); } diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java index c792c2af1f..0220b564a6 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java @@ -140,7 +140,7 @@ public abstract class MappingRecordOperation extends EisOperation { * Implementation of RecordExtractor that calls the enclosing * class's {@code extractOutputData} method. */ - protected class RecordExtractorImpl implements RecordExtractor { + protected class RecordExtractorImpl implements RecordExtractor { @Override public Object extractData(Record record) throws ResourceException, SQLException, DataAccessException { diff --git a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java index 8d3fd3d236..2a81efc182 100644 --- a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java +++ b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java @@ -66,7 +66,7 @@ public class ResourceAdapterFactoryBean implements FactoryBean, * through the "resourceAdapter" property. * @see #setResourceAdapter */ - public void setResourceAdapterClass(Class resourceAdapterClass) { + public void setResourceAdapterClass(Class resourceAdapterClass) { Assert.isAssignable(ResourceAdapter.class, resourceAdapterClass); this.resourceAdapter = (ResourceAdapter) BeanUtils.instantiateClass(resourceAdapterClass); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java index 43518ee930..2af9b448ce 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java @@ -83,7 +83,7 @@ public class TransactionSystemException extends TransactionException { } @Override - public boolean contains(Class exType) { + public boolean contains(Class exType) { return super.contains(exType) || (exType != null && exType.isInstance(this.applicationException)); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java index 01b5909912..9b6a8814a2 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java @@ -57,13 +57,13 @@ public class JtaTransactionAnnotationParser implements TransactionAnnotationPars rbta.setPropagationBehaviorName( RuleBasedTransactionAttribute.PREFIX_PROPAGATION + attributes.getEnum("value").toString()); ArrayList rollBackRules = new ArrayList(); - Class[] rbf = attributes.getClassArray("rollbackOn"); - for (Class rbRule : rbf) { + Class[] rbf = attributes.getClassArray("rollbackOn"); + for (Class rbRule : rbf) { RollbackRuleAttribute rule = new RollbackRuleAttribute(rbRule); rollBackRules.add(rule); } - Class[] nrbf = attributes.getClassArray("dontRollbackOn"); - for (Class rbRule : nrbf) { + Class[] nrbf = attributes.getClassArray("dontRollbackOn"); + for (Class rbRule : nrbf) { NoRollbackRuleAttribute rule = new NoRollbackRuleAttribute(rbRule); rollBackRules.add(rule); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java index f9d45cc294..739a4611eb 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java @@ -62,8 +62,8 @@ public class SpringTransactionAnnotationParser implements TransactionAnnotationP rbta.setReadOnly(attributes.getBoolean("readOnly")); rbta.setQualifier(attributes.getString("value")); ArrayList rollBackRules = new ArrayList(); - Class[] rbf = attributes.getClassArray("rollbackFor"); - for (Class rbRule : rbf) { + Class[] rbf = attributes.getClassArray("rollbackFor"); + for (Class rbRule : rbf) { RollbackRuleAttribute rule = new RollbackRuleAttribute(rbRule); rollBackRules.add(rule); } @@ -72,8 +72,8 @@ public class SpringTransactionAnnotationParser implements TransactionAnnotationP RollbackRuleAttribute rule = new RollbackRuleAttribute(rbRule); rollBackRules.add(rule); } - Class[] nrbf = attributes.getClassArray("noRollbackFor"); - for (Class rbRule : nrbf) { + Class[] nrbf = attributes.getClassArray("noRollbackFor"); + for (Class rbRule : nrbf) { NoRollbackRuleAttribute rule = new NoRollbackRuleAttribute(rbRule); rollBackRules.add(rule); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java index a1dcc33b39..9e56e887d8 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java @@ -203,9 +203,9 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran private final Method method; - private final Class targetClass; + private final Class targetClass; - public DefaultCacheKey(Method method, Class targetClass) { + public DefaultCacheKey(Method method, Class targetClass) { this.method = method; this.targetClass = targetClass; } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java index 77b26a5f25..81d5297240 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java @@ -128,7 +128,7 @@ public class MethodMapTransactionAttributeSource } String className = name.substring(0, lastDotIndex); String methodName = name.substring(lastDotIndex + 1); - Class clazz = ClassUtils.resolveClassName(className, this.beanClassLoader); + Class clazz = ClassUtils.resolveClassName(className, this.beanClassLoader); addTransactionalMethod(clazz, methodName, attr); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java index 83b6cd0f6a..571a5cdd9a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java @@ -74,7 +74,7 @@ public class NameMatchTransactionAttributeSource implements TransactionAttribute */ public void setProperties(Properties transactionAttributes) { TransactionAttributeEditor tae = new TransactionAttributeEditor(); - Enumeration propNames = transactionAttributes.propertyNames(); + Enumeration propNames = transactionAttributes.propertyNames(); while (propNames.hasMoreElements()) { String methodName = (String) propNames.nextElement(); String value = transactionAttributes.getProperty(methodName); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java index f6748ef890..0212da8cc0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java @@ -32,7 +32,7 @@ public class NoRollbackRuleAttribute extends RollbackRuleAttribute { * @param clazz the {@code Throwable} class * @see RollbackRuleAttribute#RollbackRuleAttribute(Class) */ - public NoRollbackRuleAttribute(Class clazz) { + public NoRollbackRuleAttribute(Class clazz) { super(clazz); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java index 0f605308ad..14c4817e7e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java @@ -59,7 +59,7 @@ public class RollbackRuleAttribute implements Serializable{ * @throws IllegalArgumentException if the supplied {@code clazz} is * not a {@code Throwable} type or is {@code null} */ - public RollbackRuleAttribute(Class clazz) { + public RollbackRuleAttribute(Class clazz) { Assert.notNull(clazz, "'clazz' cannot be null."); if (!Throwable.class.isAssignableFrom(clazz)) { throw new IllegalArgumentException( @@ -110,7 +110,7 @@ public class RollbackRuleAttribute implements Serializable{ } - private int getDepth(Class exceptionClass, int depth) { + private int getDepth(Class exceptionClass, int depth) { if (exceptionClass.getName().indexOf(this.exceptionName) != -1) { // Found it! return depth; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java index 2e25955913..67281101c6 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java @@ -244,7 +244,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * @return the return value of the method, if any * @throws Throwable propagated from the target invocation */ - protected Object invokeWithinTransaction(Method method, Class targetClass, final InvocationCallback invocation) + protected Object invokeWithinTransaction(Method method, Class targetClass, final InvocationCallback invocation) throws Throwable { // If the transaction attribute is null, the method is non-transactional. @@ -347,7 +347,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * @return a String representation identifying this method * @see org.springframework.util.ClassUtils#getQualifiedMethodName */ - protected String methodIdentification(Method method, Class targetClass) { + protected String methodIdentification(Method method, Class targetClass) { String simpleMethodId = methodIdentification(method); if (simpleMethodId != null) { return simpleMethodId; @@ -381,7 +381,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * {@link #createTransactionIfNecessary(PlatformTransactionManager, TransactionAttribute, String)} */ @Deprecated - protected TransactionInfo createTransactionIfNecessary(Method method, Class targetClass) { + protected TransactionInfo createTransactionIfNecessary(Method method, Class targetClass) { // If the transaction attribute is null, the method is non-transactional. TransactionAttribute txAttr = getTransactionAttributeSource().getTransactionAttribute(method, targetClass); PlatformTransactionManager tm = determineTransactionManager(txAttr); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java index 21e8e92baf..e182d33b4c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java @@ -59,7 +59,7 @@ public class TransactionAttributeSourceEditor extends PropertyEditorSupport { // Now we have properties, process each one individually. TransactionAttributeEditor tae = new TransactionAttributeEditor(); - Enumeration propNames = props.propertyNames(); + Enumeration propNames = props.propertyNames(); while (propNames.hasMoreElements()) { String name = (String) propNames.nextElement(); String value = props.getProperty(name); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java index 13b23dfcfd..eca02e8b32 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java @@ -33,7 +33,7 @@ import org.springframework.util.ObjectUtils; abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { @Override - public boolean matches(Method method, Class targetClass) { + public boolean matches(Method method, Class targetClass) { TransactionAttributeSource tas = getTransactionAttributeSource(); return (tas == null || tas.getTransactionAttribute(method, targetClass) != null); } diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java index c876d8fe70..2bd3856506 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java +++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java @@ -56,7 +56,7 @@ public class HttpEntity { /** * The empty {@code HttpEntity}, with no body or headers. */ - public static final HttpEntity EMPTY = new HttpEntity(); + public static final HttpEntity EMPTY = new HttpEntity(); private final HttpHeaders headers; diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index f5391599d8..2b8281e916 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.TimeZone; import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java index 3aaa777d89..efd6ba13c6 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java @@ -16,16 +16,14 @@ package org.springframework.http.client; +import java.io.IOException; +import java.io.InputStream; + import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.util.EntityUtils; import org.springframework.http.HttpHeaders; -import java.io.IOException; -import java.io.InputStream; - /** * {@link ClientHttpResponse} implementation that uses * Apache HttpComponents HttpClient to execute requests. diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java index e4e84ce90f..38351cf837 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java @@ -21,19 +21,16 @@ import java.net.URI; import java.util.List; import java.util.Map; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.impl.client.CloseableHttpClient; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; - import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.protocol.HTTP; import org.apache.http.protocol.HttpContext; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; /** * {@link org.springframework.http.client.ClientHttpRequest} implementation that uses diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java index 136bf6f881..64d4b0b5e0 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java @@ -161,6 +161,7 @@ final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpR } @Override + @Deprecated public void consumeContent() throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java index d1b25f7c35..e4f801f504 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java @@ -47,7 +47,7 @@ public class ByteArrayHttpMessageConverter extends AbstractHttpMessageConverter< } @Override - public byte[] readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException { + public byte[] readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException { long contentLength = inputMessage.getHeaders().getContentLength(); ByteArrayOutputStream bos = new ByteArrayOutputStream(contentLength >= 0 ? (int) contentLength : StreamUtils.BUFFER_SIZE); StreamUtils.copy(inputMessage.getBody(), bos); diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java index e91f05d15f..92247824d7 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java @@ -271,7 +271,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter entity = getEntity(part); writePart(name, entity, os); writeNewLine(os); } @@ -286,30 +286,29 @@ public class FormHttpMessageConverter implements HttpMessageConverter getEntity(Object part) { if (part instanceof HttpEntity) { - return (HttpEntity) part; + return (HttpEntity) part; } else { - return new HttpEntity(part); + return new HttpEntity(part); } } @SuppressWarnings("unchecked") - private void writePart(String name, HttpEntity partEntity, OutputStream os) throws IOException { + private void writePart(String name, HttpEntity partEntity, OutputStream os) throws IOException { Object partBody = partEntity.getBody(); Class partType = partBody.getClass(); HttpHeaders partHeaders = partEntity.getHeaders(); MediaType partContentType = partHeaders.getContentType(); - for (HttpMessageConverter messageConverter : partConverters) { + for (HttpMessageConverter messageConverter : partConverters) { if (messageConverter.canWrite(partType, partContentType)) { HttpOutputMessage multipartOutputMessage = new MultipartHttpOutputMessage(os); multipartOutputMessage.getHeaders().setContentDispositionFormData(name, getFilename(partBody)); if (!partHeaders.isEmpty()) { multipartOutputMessage.getHeaders().putAll(partHeaders); } - messageConverter.write(partBody, partContentType, multipartOutputMessage); + ((HttpMessageConverter) messageConverter).write(partBody, partContentType, multipartOutputMessage); return; } } diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java index cfe402e2f6..438b88a4b6 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java @@ -15,9 +15,10 @@ */ package org.springframework.http.converter.support; +import javax.xml.transform.Source; + import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; import org.springframework.util.ClassUtils; @@ -43,8 +44,9 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader()); + @SuppressWarnings("deprecation") public AllEncompassingFormHttpMessageConverter() { - addPartConverter(new SourceHttpMessageConverter()); + addPartConverter(new SourceHttpMessageConverter()); if (jaxb2Present) { addPartConverter(new Jaxb2RootElementHttpMessageConverter()); } @@ -52,7 +54,7 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv addPartConverter(new MappingJackson2HttpMessageConverter()); } else if (jacksonPresent) { - addPartConverter(new MappingJacksonHttpMessageConverter()); + addPartConverter(new org.springframework.http.converter.json.MappingJacksonHttpMessageConverter()); } } diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java index 3a0bce583a..e2ba765a5c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; */ public abstract class AbstractJaxb2HttpMessageConverter extends AbstractXmlHttpMessageConverter { - private final ConcurrentMap jaxbContexts = new ConcurrentHashMap(64); + private final ConcurrentMap, JAXBContext> jaxbContexts = new ConcurrentHashMap, JAXBContext>(64); /** @@ -44,7 +44,7 @@ public abstract class AbstractJaxb2HttpMessageConverter extends AbstractXmlHt * @return the {@code Marshaller} * @throws HttpMessageConversionException in case of JAXB errors */ - protected final Marshaller createMarshaller(Class clazz) { + protected final Marshaller createMarshaller(Class clazz) { try { JAXBContext jaxbContext = getJaxbContext(clazz); return jaxbContext.createMarshaller(); @@ -61,7 +61,7 @@ public abstract class AbstractJaxb2HttpMessageConverter extends AbstractXmlHt * @return the {@code Unmarshaller} * @throws HttpMessageConversionException in case of JAXB errors */ - protected final Unmarshaller createUnmarshaller(Class clazz) throws JAXBException { + protected final Unmarshaller createUnmarshaller(Class clazz) throws JAXBException { try { JAXBContext jaxbContext = getJaxbContext(clazz); return jaxbContext.createUnmarshaller(); @@ -78,7 +78,7 @@ public abstract class AbstractJaxb2HttpMessageConverter extends AbstractXmlHt * @return the {@code JAXBContext} * @throws HttpMessageConversionException in case of JAXB errors */ - protected final JAXBContext getJaxbContext(Class clazz) { + protected final JAXBContext getJaxbContext(Class clazz) { Assert.notNull(clazz, "'clazz' must not be null"); JAXBContext jaxbContext = this.jaxbContexts.get(clazz); if (jaxbContext == null) { diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java index 848842be53..e4a540e584 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java @@ -54,6 +54,7 @@ import org.springframework.http.converter.HttpMessageNotReadableException; * @author Arjen Poutsma * @since 3.2 */ +@SuppressWarnings("rawtypes") public class Jaxb2CollectionHttpMessageConverter extends AbstractJaxb2HttpMessageConverter implements GenericHttpMessageConverter { @@ -121,6 +122,7 @@ public class Jaxb2CollectionHttpMessageConverter } @Override + @SuppressWarnings("unchecked") public T read(Type type, Class contextClass, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java index 89d5bd0bd2..676f6d6056 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java @@ -74,7 +74,7 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa return unmarshaller.unmarshal(source); } else { - JAXBElement jaxbElement = unmarshaller.unmarshal(source, clazz); + JAXBElement jaxbElement = unmarshaller.unmarshal(source, clazz); return jaxbElement.getValue(); } } @@ -90,7 +90,7 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa @Override protected void writeToResult(Object o, HttpHeaders headers, Result result) throws IOException { try { - Class clazz = ClassUtils.getUserClass(o); + Class clazz = ClassUtils.getUserClass(o); Marshaller marshaller = createMarshaller(clazz); setCharset(headers.getContentType(), marshaller); marshaller.marshal(o, result); diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java index 1236940d27..3b9fe81938 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java @@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -41,7 +42,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; - import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; @@ -89,6 +89,7 @@ public class SourceHttpMessageConverter extends AbstractHttpMe } @Override + @SuppressWarnings("unchecked") protected T readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java index 87cddf189f..e534359a6c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java @@ -16,6 +16,8 @@ package org.springframework.http.converter.xml; +import javax.xml.transform.Source; + import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; @@ -32,7 +34,7 @@ public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter { public XmlAwareFormHttpMessageConverter() { super(); - addPartConverter(new SourceHttpMessageConverter()); + addPartConverter(new SourceHttpMessageConverter()); } } diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java index 9249588d02..0bad39c30e 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java @@ -33,8 +33,8 @@ import com.caucho.hessian.io.HessianOutput; import com.caucho.hessian.io.HessianRemoteResolver; import com.caucho.hessian.io.SerializerFactory; import com.caucho.hessian.server.HessianSkeleton; -import org.apache.commons.logging.Log; +import org.apache.commons.logging.Log; import org.springframework.beans.factory.InitializingBean; import org.springframework.remoting.support.RemoteExporter; import org.springframework.util.Assert; @@ -155,9 +155,11 @@ public class HessianExporter extends RemoteExporter implements InitializingBean if (this.debugLogger != null && this.debugLogger.isDebugEnabled()) { PrintWriter debugWriter = new PrintWriter(new CommonsLogWriter(this.debugLogger)); + @SuppressWarnings("resource") HessianDebugInputStream dis = new HessianDebugInputStream(inputStream, debugWriter); - dis.startTop2(); + @SuppressWarnings("resource") HessianDebugOutputStream dos = new HessianDebugOutputStream(outputStream, debugWriter); + dis.startTop2(); dos.startTop2(); isToUse = dis; osToUse = dos; diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java index 222d63c989..1d38370f7c 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java @@ -28,15 +28,7 @@ import org.apache.http.NoHttpResponseException; import org.apache.http.StatusLine; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.scheme.PlainSocketFactory; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.conn.PoolingClientConnectionManager; -import org.apache.http.params.CoreConnectionPNames; - import org.springframework.context.i18n.LocaleContext; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.remoting.support.RemoteInvocationResult; @@ -58,6 +50,7 @@ import org.springframework.util.StringUtils; * @since 3.1 * @see org.springframework.remoting.httpinvoker.SimpleHttpInvokerRequestExecutor */ +@SuppressWarnings("deprecation") public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvokerRequestExecutor { private static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 100; @@ -74,15 +67,16 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke * {@link HttpClient} that uses a default {@link org.apache.http.impl.conn.PoolingClientConnectionManager}. */ public HttpComponentsHttpInvokerRequestExecutor() { - SchemeRegistry schemeRegistry = new SchemeRegistry(); - schemeRegistry.register(new Scheme("http", 80, PlainSocketFactory.getSocketFactory())); - schemeRegistry.register(new Scheme("https", 443, SSLSocketFactory.getSocketFactory())); + org.apache.http.conn.scheme.SchemeRegistry schemeRegistry = new org.apache.http.conn.scheme.SchemeRegistry(); + schemeRegistry.register(new org.apache.http.conn.scheme.Scheme("http", 80, org.apache.http.conn.scheme.PlainSocketFactory.getSocketFactory())); + schemeRegistry.register(new org.apache.http.conn.scheme.Scheme("https", 443, org.apache.http.conn.ssl.SSLSocketFactory.getSocketFactory())); - PoolingClientConnectionManager connectionManager = new PoolingClientConnectionManager(schemeRegistry); + org.apache.http.impl.conn.PoolingClientConnectionManager connectionManager = + new org.apache.http.impl.conn.PoolingClientConnectionManager(schemeRegistry); connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL_CONNECTIONS); connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_CONNECTIONS_PER_ROUTE); - this.httpClient = new DefaultHttpClient(connectionManager); + this.httpClient = new org.apache.http.impl.client.DefaultHttpClient(connectionManager); setReadTimeout(DEFAULT_READ_TIMEOUT_MILLISECONDS); } @@ -117,7 +111,7 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke */ public void setConnectTimeout(int timeout) { Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value"); - getHttpClient().getParams().setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout); + getHttpClient().getParams().setIntParameter(org.apache.http.params.CoreConnectionPNames.CONNECTION_TIMEOUT, timeout); } /** @@ -128,7 +122,7 @@ public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvoke */ public void setReadTimeout(int timeout) { Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value"); - getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout); + getHttpClient().getParams().setIntParameter(org.apache.http.params.CoreConnectionPNames.SO_TIMEOUT, timeout); } diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java index 3cb0b96b89..02885b55ea 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java +++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java @@ -202,7 +202,7 @@ public class EscapedErrors implements Errors { } @Override - public Class getFieldType(String field) { + public Class getFieldType(String field) { return this.source.getFieldType(field); } diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java index 4adf614f9a..c600059cc8 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java @@ -44,8 +44,7 @@ public class UnsatisfiedServletRequestParameterException extends ServletRequestB * @param paramConditions the parameter conditions that have been violated * @param actualParams the actual parameter Map associated with the ServletRequest */ - @SuppressWarnings("unchecked") - public UnsatisfiedServletRequestParameterException(String[] paramConditions, Map actualParams) { + public UnsatisfiedServletRequestParameterException(String[] paramConditions, Map actualParams) { super(""); this.paramConditions = paramConditions; this.actualParams = actualParams; diff --git a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java index b64080b18a..56ff681eeb 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java @@ -232,7 +232,7 @@ public class WebDataBinder extends DataBinder { if (pv.getName().startsWith(fieldMarkerPrefix)) { String field = pv.getName().substring(fieldMarkerPrefix.length()); if (getPropertyAccessor().isWritableProperty(field) && !mpvs.contains(field)) { - Class fieldType = getPropertyAccessor().getPropertyType(field); + Class fieldType = getPropertyAccessor().getPropertyType(field); mpvs.add(field, getEmptyValue(field, fieldType)); } mpvs.removePropertyValue(pv); @@ -250,7 +250,7 @@ public class WebDataBinder extends DataBinder { * @param fieldType the type of the field * @return the empty value (for most fields: null) */ - protected Object getEmptyValue(String field, Class fieldType) { + protected Object getEmptyValue(String field, Class fieldType) { if (fieldType != null && boolean.class.equals(fieldType) || Boolean.class.equals(fieldType)) { // Special handling of boolean property. return Boolean.FALSE; diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java index 04d7d8cb09..fce8db6e7d 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java @@ -71,6 +71,6 @@ public @interface SessionAttributes { * session or some conversational storage. All model attributes of this * type will be stored in the session, regardless of attribute name. */ - Class[] types() default {}; + Class[] types() default {}; } diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java index 4e77885aba..2929dab697 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java @@ -34,7 +34,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.BridgeMethodResolver; @@ -110,7 +109,7 @@ public class HandlerMethodInvoker { private final WebArgumentResolver[] customArgumentResolvers; - private final HttpMessageConverter[] messageConverters; + private final HttpMessageConverter[] messageConverters; private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus(); @@ -125,7 +124,7 @@ public class HandlerMethodInvoker { public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer, SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer, - WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters) { + WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters) { this.methodResolver = methodResolver; this.bindingInitializer = bindingInitializer; @@ -161,7 +160,7 @@ public class HandlerMethodInvoker { ReflectionUtils.makeAccessible(attributeMethodToInvoke); Object attrValue = attributeMethodToInvoke.invoke(handler, args); if ("".equals(attrName)) { - Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass()); + Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass()); attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue); } if (!implicitModel.containsAttribute(attrName)) { @@ -236,7 +235,7 @@ public class HandlerMethodInvoker { private Object[] resolveHandlerArguments(Method handlerMethod, Object handler, NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception { - Class[] paramTypes = handlerMethod.getParameterTypes(); + Class[] paramTypes = handlerMethod.getParameterTypes(); Object[] args = new Object[paramTypes.length]; for (int i = 0; i < args.length; i++) { @@ -412,7 +411,7 @@ public class HandlerMethodInvoker { private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod, WebDataBinder binder, NativeWebRequest webRequest) throws Exception { - Class[] initBinderParams = initBinderMethod.getParameterTypes(); + Class[] initBinderParams = initBinderMethod.getParameterTypes(); Object[] initBinderArgs = new Object[initBinderParams.length]; for (int i = 0; i < initBinderArgs.length; i++) { @@ -449,7 +448,7 @@ public class HandlerMethodInvoker { initBinderArgs[i] = argValue; } else { - Class paramType = initBinderParams[i]; + Class paramType = initBinderParams[i]; if (paramType.isInstance(binder)) { initBinderArgs[i] = binder; } @@ -482,7 +481,7 @@ public class HandlerMethodInvoker { Class paramType = methodParam.getParameterType(); if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) { - return resolveRequestParamMap((Class) paramType, webRequest); + return resolveRequestParamMap((Class>) paramType, webRequest); } if (paramName.length() == 0) { paramName = getRequiredParameterName(methodParam); @@ -515,7 +514,7 @@ public class HandlerMethodInvoker { return binder.convertIfNecessary(paramValue, paramType, methodParam); } - private Map resolveRequestParamMap(Class mapType, NativeWebRequest webRequest) { + private Map resolveRequestParamMap(Class> mapType, NativeWebRequest webRequest) { Map parameterMap = webRequest.getParameterMap(); if (MultiValueMap.class.isAssignableFrom(mapType)) { MultiValueMap result = new LinkedMultiValueMap(parameterMap.size()); @@ -544,7 +543,7 @@ public class HandlerMethodInvoker { Class paramType = methodParam.getParameterType(); if (Map.class.isAssignableFrom(paramType)) { - return resolveRequestHeaderMap((Class) paramType, webRequest); + return resolveRequestHeaderMap((Class>) paramType, webRequest); } if (headerName.length() == 0) { headerName = getRequiredParameterName(methodParam); @@ -568,7 +567,7 @@ public class HandlerMethodInvoker { return binder.convertIfNecessary(headerValue, paramType, methodParam); } - private Map resolveRequestHeaderMap(Class mapType, NativeWebRequest webRequest) { + private Map resolveRequestHeaderMap(Class> mapType, NativeWebRequest webRequest) { if (MultiValueMap.class.isAssignableFrom(mapType)) { MultiValueMap result; if (HttpHeaders.class.isAssignableFrom(mapType)) { @@ -605,7 +604,7 @@ public class HandlerMethodInvoker { return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType()); } - private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest) + private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest) throws Exception { HttpInputMessage inputMessage = createHttpInputMessage(webRequest); @@ -614,7 +613,8 @@ public class HandlerMethodInvoker { return new HttpEntity(body, inputMessage.getHeaders()); } - private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType) + @SuppressWarnings({ "unchecked", "rawtypes" }) + private Object readWithMessageConverters(MethodParameter methodParam, HttpInputMessage inputMessage, Class paramType) throws Exception { MediaType contentType = inputMessage.getHeaders().getContentType(); @@ -638,7 +638,7 @@ public class HandlerMethodInvoker { logger.debug("Reading [" + paramType.getName() + "] as \"" + contentType +"\" using [" + messageConverter + "]"); } - return messageConverter.read(paramType, inputMessage); + return messageConverter.read((Class) paramType, inputMessage); } } } @@ -694,7 +694,7 @@ public class HandlerMethodInvoker { * Resolves the given {@link CookieValue @CookieValue} annotation. *

    Throws an UnsupportedOperationException by default. */ - protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) + protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) throws Exception { throw new UnsupportedOperationException("@CookieValue not supported"); @@ -717,7 +717,7 @@ public class HandlerMethodInvoker { * Resolves the given {@link PathVariable @PathVariable} annotation. *

    Throws an UnsupportedOperationException by default. */ - protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest) + protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest) throws Exception { throw new UnsupportedOperationException("@PathVariable not supported"); @@ -733,7 +733,7 @@ public class HandlerMethodInvoker { return name; } - private Object checkValue(String name, Object value, Class paramType) { + private Object checkValue(String name, Object value, Class paramType) { if (value == null) { if (boolean.class.equals(paramType)) { return Boolean.FALSE; @@ -784,15 +784,15 @@ public class HandlerMethodInvoker { !(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass())); } - protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { + protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { throw new IllegalStateException("Missing parameter '" + paramName + "' of type [" + paramType.getName() + "]"); } - protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception { + protected void raiseMissingHeaderException(String headerName, Class paramType) throws Exception { throw new IllegalStateException("Missing header '" + headerName + "' of type [" + paramType.getName() + "]"); } - protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception { + protected void raiseMissingCookieException(String cookieName, Class paramType) throws Exception { throw new IllegalStateException( "Missing cookie value '" + cookieName + "' of type [" + paramType.getName() + "]"); } @@ -861,7 +861,7 @@ public class HandlerMethodInvoker { } // Resolution of standard parameter types... - Class paramType = methodParameter.getParameterType(); + Class paramType = methodParameter.getParameterType(); Object value = resolveStandardArgument(paramType, webRequest); if (value != WebArgumentResolver.UNRESOLVED && !ClassUtils.isAssignableValue(paramType, value)) { throw new IllegalStateException("Standard argument type [" + paramType.getName() + @@ -878,13 +878,13 @@ public class HandlerMethodInvoker { return WebArgumentResolver.UNRESOLVED; } - protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType, + protected final void addReturnValueAsModelAttribute(Method handlerMethod, Class handlerType, Object returnValue, ExtendedModelMap implicitModel) { ModelAttribute attr = AnnotationUtils.findAnnotation(handlerMethod, ModelAttribute.class); String attrName = (attr != null ? attr.value() : ""); if ("".equals(attrName)) { - Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType); + Class resolvedType = GenericTypeResolver.resolveReturnType(handlerMethod, handlerType); attrName = Conventions.getVariableNameForReturnType(handlerMethod, resolvedType, returnValue); } implicitModel.addAttribute(attrName, returnValue); diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java index ba3840f74e..1848a0001c 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java @@ -63,7 +63,7 @@ public class HandlerMethodResolver { private final Set sessionAttributeNames = new HashSet(); - private final Set sessionAttributeTypes = new HashSet(); + private final Set> sessionAttributeTypes = new HashSet>(); private final Set actualSessionAttributeNames = Collections.newSetFromMap(new ConcurrentHashMap(4)); @@ -153,7 +153,7 @@ public class HandlerMethodResolver { return this.sessionAttributesFound; } - public boolean isSessionAttribute(String attrName, Class attrType) { + public boolean isSessionAttribute(String attrName, Class attrType) { if (this.sessionAttributeNames.contains(attrName) || this.sessionAttributeTypes.contains(attrType)) { this.actualSessionAttributeNames.add(attrName); return true; diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java index f2b2528402..03ce53f4d2 100644 --- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java @@ -542,7 +542,6 @@ public class AsyncRestTemplate extends AsyncHttpAccessor implements AsyncRestOpe * be {@code null}) * @return an arbitrary object, as returned by the {@link ResponseExtractor} */ - @SuppressWarnings("unchecked") protected ListenableFuture doExecute(URI url, HttpMethod method, AsyncRequestCallback requestCallback, ResponseExtractor responseExtractor) throws RestClientException { diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java index 4fc24562a2..06ee23e167 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java @@ -77,16 +77,16 @@ public class HttpMessageConverterExtractor implements ResponseExtractor { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public T extractData(ClientHttpResponse response) throws IOException { if (!hasMessageBody(response)) { return null; } MediaType contentType = getContentType(response); - for (HttpMessageConverter messageConverter : this.messageConverters) { + for (HttpMessageConverter messageConverter : this.messageConverters) { if (messageConverter instanceof GenericHttpMessageConverter) { - GenericHttpMessageConverter genericMessageConverter = (GenericHttpMessageConverter) messageConverter; + GenericHttpMessageConverter genericMessageConverter = (GenericHttpMessageConverter) messageConverter; if (genericMessageConverter.canRead(this.responseType, null, contentType)) { if (logger.isDebugEnabled()) { logger.debug("Reading [" + this.responseType + "] as \"" + @@ -101,7 +101,7 @@ public class HttpMessageConverterExtractor implements ResponseExtractor { logger.debug("Reading [" + this.responseClass.getName() + "] as \"" + contentType + "\" using [" + messageConverter + "]"); } - return (T) messageConverter.read(this.responseClass, response); + return (T) messageConverter.read((Class) this.responseClass, response); } } } diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 767e4fe20b..7e73ef53a5 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.xml.transform.Source; + import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -42,7 +44,6 @@ import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.feed.AtomFeedHttpMessageConverter; import org.springframework.http.converter.feed.RssChannelHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; @@ -148,11 +149,12 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat /** * Create a new instance of the {@link RestTemplate} using default settings. */ + @SuppressWarnings("deprecation") public RestTemplate() { this.messageConverters.add(new ByteArrayHttpMessageConverter()); this.messageConverters.add(new StringHttpMessageConverter()); this.messageConverters.add(new ResourceHttpMessageConverter()); - this.messageConverters.add(new SourceHttpMessageConverter()); + this.messageConverters.add(new SourceHttpMessageConverter()); this.messageConverters.add(new AllEncompassingFormHttpMessageConverter()); if (romePresent) { this.messageConverters.add(new AtomFeedHttpMessageConverter()); @@ -165,7 +167,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat this.messageConverters.add(new MappingJackson2HttpMessageConverter()); } else if (jacksonPresent) { - this.messageConverters.add(new MappingJacksonHttpMessageConverter()); + this.messageConverters.add(new org.springframework.http.converter.json.MappingJacksonHttpMessageConverter()); } } @@ -604,7 +606,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat * Returns a response extractor for {@link ResponseEntity}. */ protected ResponseExtractor> responseEntityExtractor(Type responseType) { - return new ResponseEntityResponseExtractor(responseType); + return new ResponseEntityResponseExtractor(responseType); } /** @@ -627,12 +629,11 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } @Override - @SuppressWarnings("unchecked") public void doWithRequest(ClientHttpRequest request) throws IOException { if (responseType != null) { Class responseClass = null; if (responseType instanceof Class) { - responseClass = (Class) responseType; + responseClass = (Class) responseType; } List allSupportedMediaTypes = new ArrayList(); @@ -644,7 +645,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } else if (converter instanceof GenericHttpMessageConverter) { - GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter; + GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter; if (genericConverter.canRead(responseType, null, null)) { allSupportedMediaTypes.addAll(getSupportedMediaTypes(converter)); } @@ -682,20 +683,19 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat */ private class HttpEntityRequestCallback extends AcceptHeaderRequestCallback { - private final HttpEntity requestEntity; + private final HttpEntity requestEntity; private HttpEntityRequestCallback(Object requestBody) { this(requestBody, null); } - @SuppressWarnings("unchecked") private HttpEntityRequestCallback(Object requestBody, Type responseType) { super(responseType); if (requestBody instanceof HttpEntity) { - this.requestEntity = (HttpEntity) requestBody; + this.requestEntity = (HttpEntity) requestBody; } else if (requestBody != null) { - this.requestEntity = new HttpEntity(requestBody); + this.requestEntity = new HttpEntity(requestBody); } else { this.requestEntity = HttpEntity.EMPTY; @@ -721,7 +721,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat Class requestType = requestBody.getClass(); HttpHeaders requestHeaders = requestEntity.getHeaders(); MediaType requestContentType = requestHeaders.getContentType(); - for (HttpMessageConverter messageConverter : getMessageConverters()) { + for (HttpMessageConverter messageConverter : getMessageConverters()) { if (messageConverter.canWrite(requestType, requestContentType)) { if (!requestHeaders.isEmpty()) { httpRequest.getHeaders().putAll(requestHeaders); @@ -736,7 +736,8 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } } - messageConverter.write(requestBody, requestContentType, httpRequest); + ((HttpMessageConverter) messageConverter).write( + requestBody, requestContentType, httpRequest); return; } } diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java index 677ea452b1..b3c6218c5c 100644 --- a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java +++ b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java @@ -59,9 +59,9 @@ public class ContextCleanupListener implements ServletContextListener { * @param sc the ServletContext to check */ static void cleanupAttributes(ServletContext sc) { - Enumeration attrNames = sc.getAttributeNames(); + Enumeration attrNames = sc.getAttributeNames(); while (attrNames.hasMoreElements()) { - String attrName = (String) attrNames.nextElement(); + String attrName = attrNames.nextElement(); if (attrName.startsWith("org.springframework.")) { Object attrValue = sc.getAttribute(attrName); if (attrValue instanceof DisposableBean) { diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java index 0132583726..2d7c4053ce 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.config.Scope; public abstract class AbstractRequestAttributesScope implements Scope { @Override - public Object get(String name, ObjectFactory objectFactory) { + public Object get(String name, ObjectFactory objectFactory) { RequestAttributes attributes = RequestContextHolder.currentRequestAttributes(); Object scopedObject = attributes.getAttribute(name, getScope()); if (scopedObject == null) { diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java index 3c3f6437eb..73301c34a9 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java @@ -217,7 +217,7 @@ public class FacesRequestAttributes implements RequestAttributes { Object session = getExternalContext().getSession(true); try { // Both HttpSession and PortletSession have a getId() method. - Method getIdMethod = session.getClass().getMethod("getId", new Class[0]); + Method getIdMethod = session.getClass().getMethod("getId", new Class[0]); return ReflectionUtils.invokeMethod(getIdMethod, session).toString(); } catch (NoSuchMethodException ex) { diff --git a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java index 1696c1fcf4..9df39c4f5f 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java @@ -87,7 +87,7 @@ public class SessionScope extends AbstractRequestAttributesScope { } @Override - public Object get(String name, ObjectFactory objectFactory) { + public Object get(String name, ObjectFactory objectFactory) { Object mutex = RequestContextHolder.currentRequestAttributes().getSessionMutex(); synchronized (mutex) { return super.get(name, objectFactory); diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java index 68908ea241..9fbe286c2f 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java @@ -253,7 +253,7 @@ public final class WebAsyncManager { * @see #getConcurrentResult() * @see #getConcurrentResultContext() */ - @SuppressWarnings({"unchecked" }) + @SuppressWarnings({"unchecked", "rawtypes" }) public void startCallableProcessing(final Callable callable, Object... processingContext) throws Exception { Assert.notNull(callable, "Callable must not be null"); startCallableProcessing(new WebAsyncTask(callable), processingContext); diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java index 378bd8e6e5..ca457f2380 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java @@ -160,15 +160,20 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP } try { JarFile jarFile = new JarFile(jarFilePath); - for (Enumeration entries = jarFile.entries(); entries.hasMoreElements();) { - JarEntry entry = entries.nextElement(); - String entryPath = entry.getName(); - if (getPathMatcher().match(entryPattern, entryPath)) { - result.add(new UrlResource( - ResourceUtils.URL_PROTOCOL_JAR, - ResourceUtils.FILE_URL_PREFIX + jarFilePath + ResourceUtils.JAR_URL_SEPARATOR + entryPath)); + try { + for (Enumeration entries = jarFile.entries(); entries.hasMoreElements();) { + JarEntry entry = entries.nextElement(); + String entryPath = entry.getName(); + if (getPathMatcher().match(entryPattern, entryPath)) { + result.add(new UrlResource( + ResourceUtils.URL_PROTOCOL_JAR, + ResourceUtils.FILE_URL_PREFIX + jarFilePath + ResourceUtils.JAR_URL_SEPARATOR + entryPath)); + } } } + finally { + jarFile.close(); + } } catch (IOException ex) { if (logger.isWarnEnabled()) { diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java index 1adce271ba..3b34f3bc0a 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java @@ -172,7 +172,7 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod } else if (isPartCollection(parameter)) { assertIsMultipartRequest(servletRequest); - arg = new ArrayList(servletRequest.getParts()); + arg = new ArrayList(servletRequest.getParts()); } else { arg = null; @@ -243,7 +243,7 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod builder.queryParam(name); } else if (value instanceof Collection) { - for (Object v : (Collection) value) { + for (Object v : (Collection) value) { v = formatUriValue(conversionService, TypeDescriptor.nested(parameter, 1), v); builder.queryParam(name, v); } diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java index 977042863d..29b4408cf4 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java @@ -151,7 +151,6 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport * @return the parsing result * @throws MultipartException if multipart resolution failed. */ - @SuppressWarnings("unchecked") protected MultipartParsingResult parseRequest(HttpServletRequest request) throws MultipartException { String encoding = determineEncoding(request); FileUpload fileUpload = prepareFileUpload(encoding); diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java index 33c9925ea7..86a8f79c4a 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java @@ -76,9 +76,9 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer @Override public Enumeration getParameterNames() { Set paramNames = new HashSet(); - Enumeration paramEnum = super.getParameterNames(); + Enumeration paramEnum = super.getParameterNames(); while (paramEnum.hasMoreElements()) { - paramNames.add((String) paramEnum.nextElement()); + paramNames.add(paramEnum.nextElement()); } paramNames.addAll(getMultipartParameters().keySet()); return Collections.enumeration(paramNames); diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java index 0fc4ee78e8..b23903b15f 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java @@ -82,7 +82,7 @@ class HtmlCharacterEntityReferences { } // Parse reference definition properties - Enumeration keys = entityReferences.propertyNames(); + Enumeration keys = entityReferences.propertyNames(); while (keys.hasMoreElements()) { String key = (String) keys.nextElement(); int referredChar = Integer.parseInt(key); diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java index ee9daf8fea..59d2faacb6 100644 --- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java @@ -92,7 +92,7 @@ public abstract class TagUtils { * or if the supplied {@code ancestorTagClass} is not type-assignable to * the {@link Tag} class */ - public static boolean hasAncestorOfType(Tag tag, Class ancestorTagClass) { + public static boolean hasAncestorOfType(Tag tag, Class ancestorTagClass) { Assert.notNull(tag, "Tag cannot be null"); Assert.notNull(ancestorTagClass, "Ancestor tag class cannot be null"); if (!Tag.class.isAssignableFrom(ancestorTagClass)) { @@ -125,7 +125,7 @@ public abstract class TagUtils { * type-assignable to the {@link Tag} class * @see #hasAncestorOfType(javax.servlet.jsp.tagext.Tag, Class) */ - public static void assertHasAncestorOfType(Tag tag, Class ancestorTagClass, String tagName, String ancestorTagName) { + public static void assertHasAncestorOfType(Tag tag, Class ancestorTagClass, String tagName, String ancestorTagName) { Assert.hasText(tagName, "'tagName' must not be empty"); Assert.hasText(ancestorTagName, "'ancestorTagName' must not be empty"); if (!TagUtils.hasAncestorOfType(tag, ancestorTagClass)) { diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java index 58cf5a7601..f14d78f96d 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java @@ -39,6 +39,7 @@ import org.springframework.util.MultiValueMap; * @since 3.1 * @see UriComponentsBuilder */ +@SuppressWarnings("serial") public abstract class UriComponents implements Serializable { private static final String DEFAULT_ENCODING = "UTF-8"; diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java index 48149e439f..b4f9461991 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java @@ -17,9 +17,7 @@ package org.springframework.web.util; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URISyntaxException; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java index e0078a8a97..ae5dfeff33 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java @@ -317,7 +317,7 @@ public abstract class WebUtils { * @return the value of the session attribute, newly created if not found * @throws IllegalArgumentException if the session attribute could not be instantiated */ - public static Object getOrCreateSessionAttribute(HttpSession session, String name, Class clazz) + public static Object getOrCreateSessionAttribute(HttpSession session, String name, Class clazz) throws IllegalArgumentException { Assert.notNull(session, "Session must not be null"); @@ -620,13 +620,13 @@ public abstract class WebUtils { */ public static Map getParametersStartingWith(ServletRequest request, String prefix) { Assert.notNull(request, "Request must not be null"); - Enumeration paramNames = request.getParameterNames(); + Enumeration paramNames = request.getParameterNames(); Map params = new TreeMap(); if (prefix == null) { prefix = ""; } while (paramNames != null && paramNames.hasMoreElements()) { - String paramName = (String) paramNames.nextElement(); + String paramName = paramNames.nextElement(); if ("".equals(prefix) || paramName.startsWith(prefix)) { String unprefixed = paramName.substring(prefix.length()); String[] values = request.getParameterValues(paramName); @@ -654,9 +654,9 @@ public abstract class WebUtils { * @return the page specified in the request, or current page if not found */ public static int getTargetPage(ServletRequest request, String paramPrefix, int currentPage) { - Enumeration paramNames = request.getParameterNames(); + Enumeration paramNames = request.getParameterNames(); while (paramNames.hasMoreElements()) { - String paramName = (String) paramNames.nextElement(); + String paramName = paramNames.nextElement(); if (paramName.startsWith(paramPrefix)) { for (int i = 0; i < WebUtils.SUBMIT_IMAGE_SUFFIXES.length; i++) { String suffix = WebUtils.SUBMIT_IMAGE_SUFFIXES[i]; diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java index 0fb220f435..d695077f4c 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java @@ -577,7 +577,7 @@ public class DispatcherPortlet extends FrameworkPortlet { List strategies = new ArrayList(classNames.length); for (String className : classNames) { try { - Class clazz = ClassUtils.forName(className, DispatcherPortlet.class.getClassLoader()); + Class clazz = ClassUtils.forName(className, DispatcherPortlet.class.getClassLoader()); Object strategy = createDefaultStrategy(context, clazz); strategies.add((T) strategy); } @@ -1143,7 +1143,7 @@ public class DispatcherPortlet extends FrameworkPortlet { * (typically in case of problems creating an actual View object) * @see ViewResolver#resolveViewName */ - protected View resolveViewName(String viewName, Map model, PortletRequest request) throws Exception { + protected View resolveViewName(String viewName, Map model, PortletRequest request) throws Exception { for (ViewResolver viewResolver : this.viewResolvers) { View view = viewResolver.resolveViewName(viewName, request.getLocale()); if (view != null) { @@ -1163,7 +1163,7 @@ public class DispatcherPortlet extends FrameworkPortlet { * @param response current portlet render/resource response * @throws Exception if there's a problem rendering the view */ - protected void doRender(View view, Map model, PortletRequest request, MimeResponse response) throws Exception { + protected void doRender(View view, Map model, PortletRequest request, MimeResponse response) throws Exception { // Expose Portlet ApplicationContext to view objects. request.setAttribute(ViewRendererServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE, getPortletApplicationContext()); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java index d67899df6a..d2c028596b 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java @@ -107,7 +107,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean * Default context class for FrameworkPortlet. * @see org.springframework.web.portlet.context.XmlPortletApplicationContext */ - public static final Class DEFAULT_CONTEXT_CLASS = XmlPortletApplicationContext.class; + public static final Class DEFAULT_CONTEXT_CLASS = XmlPortletApplicationContext.class; /** * Suffix for Portlet ApplicationContext namespaces. If a portlet of this class is @@ -130,7 +130,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean /** Portlet ApplicationContext implementation class to use */ - private Class contextClass = DEFAULT_CONTEXT_CLASS; + private Class contextClass = DEFAULT_CONTEXT_CLASS; /** Namespace for this portlet */ private String namespace; @@ -163,14 +163,14 @@ public abstract class FrameworkPortlet extends GenericPortletBean * must also implement ConfigurablePortletApplicationContext. * @see #createPortletApplicationContext */ - public void setContextClass(Class contextClass) { + public void setContextClass(Class contextClass) { this.contextClass = contextClass; } /** * Return the custom context class. */ - public Class getContextClass() { + public Class getContextClass() { return this.contextClass; } @@ -612,7 +612,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean } // Try the Portlet USER_INFO map. - Map userInfo = (Map) request.getAttribute(PortletRequest.USER_INFO); + Map userInfo = (Map) request.getAttribute(PortletRequest.USER_INFO); if (userInfo != null) { for (int i = 0, n = this.userinfoUsernameAttributes.length; i < n; i++) { userName = (String) userInfo.get(this.userinfoUsernameAttributes[i]); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java index 4febdfc9e8..3fb7d7d29d 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java @@ -221,9 +221,9 @@ public abstract class GenericPortletBean extends GenericPortlet Set missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ? new HashSet(requiredProperties) : null; - Enumeration en = config.getInitParameterNames(); + Enumeration en = config.getInitParameterNames(); while (en.hasMoreElements()) { - String property = (String) en.nextElement(); + String property = en.nextElement(); Object value = config.getInitParameter(property); addPropertyValue(new PropertyValue(property, value)); if (missingProps != null) { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java index e218e2938e..bd3a9a0716 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java @@ -156,16 +156,16 @@ public abstract class PortletApplicationContextUtils { if (!bf.containsBean(WebApplicationContext.CONTEXT_PARAMETERS_BEAN_NAME)) { Map parameterMap = new HashMap(); if (pc != null) { - Enumeration paramNameEnum = pc.getInitParameterNames(); + Enumeration paramNameEnum = pc.getInitParameterNames(); while (paramNameEnum.hasMoreElements()) { - String paramName = (String) paramNameEnum.nextElement(); + String paramName = paramNameEnum.nextElement(); parameterMap.put(paramName, pc.getInitParameter(paramName)); } } if (config != null) { - Enumeration paramNameEnum = config.getInitParameterNames(); + Enumeration paramNameEnum = config.getInitParameterNames(); while (paramNameEnum.hasMoreElements()) { - String paramName = (String) paramNameEnum.nextElement(); + String paramName = paramNameEnum.nextElement(); parameterMap.put(paramName, config.getInitParameter(paramName)); } } @@ -176,9 +176,9 @@ public abstract class PortletApplicationContextUtils { if (!bf.containsBean(WebApplicationContext.CONTEXT_ATTRIBUTES_BEAN_NAME)) { Map attributeMap = new HashMap(); if (pc != null) { - Enumeration attrNameEnum = pc.getAttributeNames(); + Enumeration attrNameEnum = pc.getAttributeNames(); while (attrNameEnum.hasMoreElements()) { - String attrName = (String) attrNameEnum.nextElement(); + String attrName = attrNameEnum.nextElement(); attributeMap.put(attrName, pc.getAttribute(attrName)); } } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java index dd2bb54909..93f2b97f33 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java @@ -100,11 +100,11 @@ public class PortletContextResourcePatternResolver extends PathMatchingResourceP protected void doRetrieveMatchingPortletContextResources( PortletContext portletContext, String fullPattern, String dir, Set result) throws IOException { - Set candidates = portletContext.getResourcePaths(dir); + Set candidates = portletContext.getResourcePaths(dir); if (candidates != null) { boolean dirDepthNotFixed = fullPattern.contains("**"); - for (Iterator it = candidates.iterator(); it.hasNext();) { - String currPath = (String) it.next(); + for (Iterator it = candidates.iterator(); it.hasNext();) { + String currPath = it.next(); if (currPath.endsWith("/") && (dirDepthNotFixed || StringUtils.countOccurrencesOf(currPath, "/") <= StringUtils.countOccurrencesOf(fullPattern, "/"))) { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java index 76c41e96d1..90529bf79b 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java @@ -79,13 +79,11 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ } @Override - @SuppressWarnings("unchecked") public T getNativeRequest(Class requiredType) { return PortletUtils.getNativeRequest(getRequest(), requiredType); } @Override - @SuppressWarnings("unchecked") public T getNativeResponse(Class requiredType) { return PortletUtils.getNativeResponse(getResponse(), requiredType); } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java index f4e5b18ca5..2b7ac5ef96 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java @@ -50,7 +50,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti private Set mappedHandlers; - private Class[] mappedHandlerClasses; + private Class[] mappedHandlerClasses; private Log warnLogger; @@ -90,7 +90,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti * any further HandlerExceptionResolvers in the chain will be ignored in * this case. */ - public void setMappedHandlerClasses(Class[] mappedHandlerClasses) { + public void setMappedHandlerClasses(Class[] mappedHandlerClasses) { this.mappedHandlerClasses = mappedHandlerClasses; } @@ -169,7 +169,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti return true; } if (this.mappedHandlerClasses != null) { - for (Class mappedClass : this.mappedHandlerClasses) { + for (Class mappedClass : this.mappedHandlerClasses) { if (mappedClass.isInstance(handler)) { return true; } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java index c648433cc1..cf78271959 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java @@ -140,7 +140,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im * allowing to add further interceptors before as well as after the existing * interceptors */ - protected void extendInterceptors(List interceptors) { + protected void extendInterceptors(List interceptors) { } /** diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java index 56be35e506..29c3b8c3e9 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java @@ -185,7 +185,7 @@ public abstract class AbstractMapBasedHandlerMapping extends AbstractHandlerM /** * Predicate interface for determining a match with a given request. */ - protected interface PortletRequestMappingPredicate extends Comparable { + protected interface PortletRequestMappingPredicate extends Comparable { /** * Determine whether the given request matches this predicate. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java index 8065b75386..2338cacb57 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java @@ -156,7 +156,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso String viewName = null; String dominantMapping = null; int deepest = Integer.MAX_VALUE; - for (Enumeration names = exceptionMappings.propertyNames(); names.hasMoreElements();) { + for (Enumeration names = exceptionMappings.propertyNames(); names.hasMoreElements();) { String exceptionMapping = (String) names.nextElement(); int depth = getDepth(exceptionMapping, ex); if (depth >= 0 && (depth < deepest || (depth == deepest && @@ -184,7 +184,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso return getDepth(exceptionMapping, ex.getClass(), 0); } - private int getDepth(String exceptionMapping, Class exceptionClass, int depth) { + private int getDepth(String exceptionMapping, Class exceptionClass, int depth) { if (exceptionClass.getName().contains(exceptionMapping)) { // Found it! return depth; diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java index 8ee6e40785..5f13ba989e 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java @@ -109,9 +109,9 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen @Override public Enumeration getParameterNames() { Set paramNames = new HashSet(); - Enumeration paramEnum = super.getParameterNames(); + Enumeration paramEnum = super.getParameterNames(); while (paramEnum.hasMoreElements()) { - paramNames.add((String) paramEnum.nextElement()); + paramNames.add(paramEnum.nextElement()); } paramNames.addAll(getMultipartParameters().keySet()); return Collections.enumeration(paramNames); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java index 936a0b9fe4..57d1d1233c 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java @@ -89,7 +89,7 @@ public class PortletWrappingController extends AbstractController private PortletConfig portletConfig; - private Class portletClass; + private Class portletClass; private String portletName; @@ -127,7 +127,7 @@ public class PortletWrappingController extends AbstractController * Needs to implement {@code javax.portlet.Portlet}. * @see javax.portlet.Portlet */ - public void setPortletClass(Class portletClass) { + public void setPortletClass(Class portletClass) { this.portletClass = portletClass; } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index a10b4aa4dd..528f83328b 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -381,7 +381,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator if (response instanceof EventResponse) { // Update the existing model, if any, when responding to an event - // whereas we're replacing the model in case of an action response. - Map existingModel = (Map) request.getPortletSession().getAttribute(IMPLICIT_MODEL_SESSION_ATTRIBUTE); + Map existingModel = (Map) request.getPortletSession().getAttribute(IMPLICIT_MODEL_SESSION_ATTRIBUTE); if (existingModel != null) { existingModel.putAll(implicitModel); modelToStore = existingModel; @@ -401,7 +401,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator * Build a HandlerMethodResolver for the given handler type. */ private PortletHandlerMethodResolver getMethodResolver(Object handler) { - Class handlerClass = ClassUtils.getUserClass(handler); + Class handlerClass = ClassUtils.getUserClass(handler); PortletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass); if (resolver == null) { synchronized (this.methodResolverCache) { @@ -554,7 +554,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator } @Override - protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { + protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { throw new MissingPortletRequestParameterException(paramName, paramType.getSimpleName()); } @@ -591,7 +591,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator } @Override - protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) + protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) throws Exception { PortletRequest portletRequest = webRequest.getNativeRequest(PortletRequest.class); @@ -686,7 +686,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator } @SuppressWarnings("unchecked") - public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Object returnValue, ExtendedModelMap implicitModel, + public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Object returnValue, ExtendedModelMap implicitModel, PortletWebRequest webRequest) { // Invoke custom resolvers if present... if (customModelAndViewResolvers != null) { @@ -725,7 +725,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator return new ModelAndView().addAllObjects(implicitModel); } else if (returnValue instanceof Map) { - return new ModelAndView().addAllObjects(implicitModel).addAllObjects((Map) returnValue); + return new ModelAndView().addAllObjects(implicitModel).addAllObjects((Map) returnValue); } else if (returnValue instanceof String) { return new ModelAndView((String) returnValue).addAllObjects(implicitModel); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java index 579ef82388..6ec21b5d3d 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java @@ -386,7 +386,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc return new ModelAndView().addAllObjects(((Model) returnValue).asMap()); } else if (returnValue instanceof Map) { - return new ModelAndView().addAllObjects((Map) returnValue); + return new ModelAndView().addAllObjects((Map) returnValue); } else if (returnValue instanceof View) { return new ModelAndView(returnValue); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 9b77f6d0bf..410b708ba2 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; + import javax.portlet.ActionRequest; import javax.portlet.ClientDataRequest; import javax.portlet.Event; @@ -283,7 +284,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { return (other instanceof SpecialRequestTypePredicate ? -1 : compareParams(other)); } } @@ -300,7 +301,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { return (other instanceof SpecialRequestTypePredicate ? 1 : compareParams(other)); } } @@ -327,7 +328,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { if (other instanceof TypeLevelMappingPredicate) { return 1; } @@ -371,7 +372,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { if (other instanceof TypeLevelMappingPredicate) { return 1; } @@ -413,7 +414,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { if (other instanceof ResourceMappingPredicate) { boolean hasResourceId = !"".equals(this.resourceId); boolean otherHasResourceId = !"".equals(((ResourceMappingPredicate) other).resourceId); @@ -454,7 +455,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp } @Override - public int compareTo(Object other) { + public int compareTo(PortletRequestMappingPredicate other) { if (other instanceof EventMappingPredicate) { boolean hasEventName = !"".equals(this.eventName); boolean otherHasEventName = !"".equals(((EventMappingPredicate) other).eventName); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java index d9dae6dcdb..b453c5f24a 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java @@ -23,6 +23,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.PortletContext; @@ -203,7 +204,7 @@ public abstract class PortletUtils { * @return the value of the session attribute, newly created if not found * @throws IllegalArgumentException if the session attribute could not be instantiated */ - public static Object getOrCreateSessionAttribute(PortletSession session, String name, Class clazz) + public static Object getOrCreateSessionAttribute(PortletSession session, String name, Class clazz) throws IllegalArgumentException { return getOrCreateSessionAttribute(session, name, clazz, PortletSession.PORTLET_SCOPE); @@ -221,7 +222,7 @@ public abstract class PortletUtils { * @return the value of the session attribute, newly created if not found * @throws IllegalArgumentException if the session attribute could not be instantiated */ - public static Object getOrCreateSessionAttribute(PortletSession session, String name, Class clazz, int scope) + public static Object getOrCreateSessionAttribute(PortletSession session, String name, Class clazz, int scope) throws IllegalArgumentException { Assert.notNull(session, "Session must not be null"); @@ -411,13 +412,13 @@ public abstract class PortletUtils { */ public static Map getParametersStartingWith(PortletRequest request, String prefix) { Assert.notNull(request, "Request must not be null"); - Enumeration paramNames = request.getParameterNames(); + Enumeration paramNames = request.getParameterNames(); Map params = new TreeMap(); if (prefix == null) { prefix = ""; } while (paramNames != null && paramNames.hasMoreElements()) { - String paramName = (String) paramNames.nextElement(); + String paramName = paramNames.nextElement(); if ("".equals(prefix) || paramName.startsWith(prefix)) { String unprefixed = paramName.substring(prefix.length()); String[] values = request.getParameterValues(paramName); @@ -445,9 +446,9 @@ public abstract class PortletUtils { * @return the page specified in the request, or current page if not found */ public static int getTargetPage(PortletRequest request, String paramPrefix, int currentPage) { - Enumeration paramNames = request.getParameterNames(); + Enumeration paramNames = request.getParameterNames(); while (paramNames.hasMoreElements()) { - String paramName = (String) paramNames.nextElement(); + String paramName = paramNames.nextElement(); if (paramName.startsWith(paramPrefix)) { for (int i = 0; i < WebUtils.SUBMIT_IMAGE_SUFFIXES.length; i++) { String suffix = WebUtils.SUBMIT_IMAGE_SUFFIXES[i]; @@ -472,9 +473,9 @@ public abstract class PortletUtils { */ public static void passAllParametersToRenderPhase(ActionRequest request, ActionResponse response) { try { - Enumeration en = request.getParameterNames(); + Enumeration en = request.getParameterNames(); while (en.hasMoreElements()) { - String param = (String) en.nextElement(); + String param = en.nextElement(); String values[] = request.getParameterValues(param); response.setRenderParameter(param, values); } diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java index 0490e3193a..46563753a5 100644 --- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java +++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java @@ -32,8 +32,7 @@ public class TilesViewResolver extends UrlBasedViewResolver { @Override - @SuppressWarnings("rawtypes") - protected Class getViewClass() { + protected Class getViewClass() { return TilesView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index d08d94791d..b38e52a033 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.security.Principal; import java.util.ArrayList; import java.util.concurrent.Callable; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -354,6 +355,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext) * @see #applyInitializers(ConfigurableApplicationContext) */ + @SuppressWarnings("unchecked") public void setContextInitializers(ApplicationContextInitializer... contextInitializers) { for (ApplicationContextInitializer initializer : contextInitializers) { this.contextInitializers.add(initializer); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java index f9e7f9634d..cdc81cd7b3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java @@ -234,9 +234,9 @@ public abstract class HttpServletBean extends HttpServlet Set missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ? new HashSet(requiredProperties) : null; - Enumeration en = config.getInitParameterNames(); + Enumeration en = config.getInitParameterNames(); while (en.hasMoreElements()) { - String property = (String) en.nextElement(); + String property = en.nextElement(); Object value = config.getInitParameter(property); addPropertyValue(new PropertyValue(property, value)); if (missingProps != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java index b8c9cb8523..a686ac8bb6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java @@ -41,7 +41,6 @@ import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.feed.AtomFeedHttpMessageConverter; import org.springframework.http.converter.feed.RssChannelHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; @@ -67,11 +66,11 @@ import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; import org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter; import org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver; import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; +import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentResolverAdapter; import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver; -import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; import org.w3c.dom.Element; /** @@ -409,6 +408,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { return null; } + @SuppressWarnings("deprecation") private ManagedList getMessageConverters(Element element, Object source, ParserContext parserContext) { Element convertersElement = DomUtils.getChildElementByTagName(element, "message-converters"); ManagedList messageConverters = new ManagedList(); @@ -443,12 +443,13 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { messageConverters.add(createConverterBeanDefinition(MappingJackson2HttpMessageConverter.class, source)); } else if (jacksonPresent) { - messageConverters.add(createConverterBeanDefinition(MappingJacksonHttpMessageConverter.class, source)); + messageConverters.add(createConverterBeanDefinition(org.springframework.http.converter.json.MappingJacksonHttpMessageConverter.class, source)); } } return messageConverters; } + @SuppressWarnings("rawtypes") private RootBeanDefinition createConverterBeanDefinition( Class converterClass, Object source) { @@ -495,6 +496,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { * HandlerMethodArgumentResolver's configured in RequestMappingHandlerAdapter * after it is fully initialized. */ + @SuppressWarnings("unused") private static class CompositeUriComponentsContributorFactoryBean implements InitializingBean, FactoryBean { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java index 82e455c7a4..6ab039507c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java @@ -44,6 +44,7 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser { @Override + @SuppressWarnings("unchecked") public BeanDefinition parse(Element element, ParserContext parserContext) { Object source = parserContext.extractSource(element); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index 6dbfa527b1..7737ea2063 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -45,7 +45,6 @@ import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.feed.AtomFeedHttpMessageConverter; import org.springframework.http.converter.feed.RssChannelHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; @@ -527,6 +526,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv * Subclasses can call this method from {@link #configureMessageConverters(List)}. * @param messageConverters the list to add the default message converters to */ + @SuppressWarnings("deprecation") protected final void addDefaultHttpMessageConverters(List> messageConverters) { StringHttpMessageConverter stringConverter = new StringHttpMessageConverter(); stringConverter.setWriteAcceptCharset(false); @@ -547,7 +547,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv messageConverters.add(new MappingJackson2HttpMessageConverter()); } else if (jacksonPresent) { - messageConverters.add(new MappingJacksonHttpMessageConverter()); + messageConverters.add(new org.springframework.http.converter.json.MappingJacksonHttpMessageConverter()); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java index e432818d50..cf1388c7a3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java @@ -53,7 +53,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti private Set mappedHandlers; - private Class[] mappedHandlerClasses; + private Class[] mappedHandlerClasses; private Log warnLogger; @@ -90,7 +90,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti * as fallback for all exceptions; any further HandlerExceptionResolvers in the chain will be * ignored in this case. */ - public void setMappedHandlerClasses(Class[] mappedHandlerClasses) { + public void setMappedHandlerClasses(Class[] mappedHandlerClasses) { this.mappedHandlerClasses = mappedHandlerClasses; } @@ -160,7 +160,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti return true; } if (this.mappedHandlerClasses != null) { - for (Class handlerClass : this.mappedHandlerClasses) { + for (Class handlerClass : this.mappedHandlerClasses) { if (handlerClass.isInstance(handler)) { return true; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java index 7f241a92cb..9fde9f8faa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java @@ -87,7 +87,7 @@ import org.springframework.web.servlet.ModelAndView; public class ServletWrappingController extends AbstractController implements BeanNameAware, InitializingBean, DisposableBean { - private Class servletClass; + private Class servletClass; private String servletName; @@ -103,7 +103,7 @@ public class ServletWrappingController extends AbstractController * Needs to implement {@code javax.servlet.Servlet}. * @see javax.servlet.Servlet */ - public void setServletClass(Class servletClass) { + public void setServletClass(Class servletClass) { this.servletClass = servletClass; } @@ -196,8 +196,9 @@ public class ServletWrappingController extends AbstractController } @Override - public Enumeration getInitParameterNames() { - return initParameters.keys(); + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Enumeration getInitParameterNames() { + return (Enumeration) initParameters.keys(); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index 5eae702cd5..f9c23f84dc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -117,7 +117,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle */ public void setCacheMappings(Properties cacheMappings) { this.cacheMappings.clear(); - Enumeration propNames = cacheMappings.propertyNames(); + Enumeration propNames = cacheMappings.propertyNames(); while (propNames.hasMoreElements()) { String path = (String) propNames.nextElement(); this.cacheMappings.put(path, Integer.valueOf(cacheMappings.getProperty(path))); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index 62343d5683..361bbeb0de 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -35,6 +35,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -42,10 +43,10 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.xml.transform.Source; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -53,7 +54,6 @@ import org.springframework.beans.factory.config.BeanExpressionContext; import org.springframework.beans.factory.config.BeanExpressionResolver; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.DefaultParameterNameDiscoverer; -import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.Ordered; import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.annotation.AnnotationUtils; @@ -68,7 +68,6 @@ import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; @@ -201,8 +200,10 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator // See SPR-7316 StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter(); stringHttpMessageConverter.setWriteAcceptCharset(false); - this.messageConverters = new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), stringHttpMessageConverter, - new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()}; + this.messageConverters = new HttpMessageConverter[] { + new ByteArrayHttpMessageConverter(), stringHttpMessageConverter, + new SourceHttpMessageConverter(), + new org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter() }; } @@ -467,7 +468,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator * Build a HandlerMethodResolver for the given handler type. */ private ServletHandlerMethodResolver getMethodResolver(Object handler) { - Class handlerClass = ClassUtils.getUserClass(handler); + Class handlerClass = ClassUtils.getUserClass(handler); ServletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass); if (resolver == null) { synchronized (this.methodResolverCache) { @@ -781,7 +782,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator } @Override - protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { + protected void raiseMissingParameterException(String paramName, Class paramType) throws Exception { throw new MissingServletRequestParameterException(paramName, paramType.getSimpleName()); } @@ -830,7 +831,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator } @Override - protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) + protected Object resolveCookieValue(String cookieName, Class paramType, NativeWebRequest webRequest) throws Exception { HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class); @@ -848,7 +849,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator @Override @SuppressWarnings({"unchecked"}) - protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest) + protected String resolvePathVariable(String pathVarName, Class paramType, NativeWebRequest webRequest) throws Exception { HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class); @@ -911,7 +912,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator } @SuppressWarnings("unchecked") - public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Object returnValue, + public ModelAndView getModelAndView(Method handlerMethod, Class handlerType, Object returnValue, ExtendedModelMap implicitModel, ServletWebRequest webRequest) throws Exception { ResponseStatus responseStatusAnn = AnnotationUtils.findAnnotation(handlerMethod, ResponseStatus.class); @@ -966,7 +967,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator return new ModelAndView().addAllObjects(implicitModel); } else if (returnValue instanceof Map) { - return new ModelAndView().addAllObjects(implicitModel).addAllObjects((Map) returnValue); + return new ModelAndView().addAllObjects(implicitModel).addAllObjects((Map) returnValue); } else if (returnValue instanceof String) { return new ModelAndView((String) returnValue).addAllObjects(implicitModel); @@ -1009,7 +1010,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator HttpInputMessage inputMessage = createHttpInputMessage(webRequest); HttpOutputMessage outputMessage = createHttpOutputMessage(webRequest); if (responseEntity instanceof ResponseEntity && outputMessage instanceof ServerHttpResponse) { - ((ServerHttpResponse) outputMessage).setStatusCode(((ResponseEntity) responseEntity).getStatusCode()); + ((ServerHttpResponse) outputMessage).setStatusCode(((ResponseEntity) responseEntity).getStatusCode()); } HttpHeaders entityHeaders = responseEntity.getHeaders(); if (!entityHeaders.isEmpty()) { @@ -1025,7 +1026,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private void writeWithMessageConverters(Object returnValue, HttpInputMessage inputMessage, HttpOutputMessage outputMessage) throws IOException, HttpMediaTypeNotAcceptableException { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java index 65bba17c38..339b1f3bbe 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java @@ -32,12 +32,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.xml.transform.Source; import org.springframework.core.ExceptionDepthComparator; import org.springframework.core.GenericTypeResolver; @@ -51,7 +53,6 @@ import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.ui.Model; @@ -96,8 +97,9 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc private WebArgumentResolver[] customArgumentResolvers; private HttpMessageConverter[] messageConverters = - new HttpMessageConverter[] {new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(), - new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()}; + new HttpMessageConverter[] {new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(), + new SourceHttpMessageConverter(), + new org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter()}; /** @@ -415,7 +417,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes", "resource" }) private ModelAndView handleResponseBody(Object returnValue, ServletWebRequest webRequest) throws ServletException, IOException { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java index a6e25594b3..072a85de52 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java @@ -54,7 +54,7 @@ public interface ModelAndViewResolver { ModelAndView UNRESOLVED = new ModelAndView(); ModelAndView resolveModelAndView(Method handlerMethod, - Class handlerType, + Class handlerType, Object returnValue, ExtendedModelMap implicitModel, NativeWebRequest webRequest); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java index 36f76fd6ef..6578b8b24b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java @@ -256,7 +256,7 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe ParamsRequestCondition condition = partialMatch.getParamsCondition(); if (!CollectionUtils.isEmpty(condition.getExpressions()) && (condition.getMatchingCondition(request) == null)) { Set expressions = new HashSet(); - for (NameValueExpression expr : condition.getExpressions()) { + for (NameValueExpression expr : condition.getExpressions()) { expressions.add(expr.toString()); } return expressions; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index 2ce20ad0d9..784b006e0a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -132,7 +132,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements for (HttpMessageConverter converter : this.messageConverters) { if (converter instanceof GenericHttpMessageConverter) { - GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter; + GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter; if (genericConverter.canRead(targetType, contextClass, contentType)) { if (logger.isDebugEnabled()) { logger.debug("Reading [" + targetType + "] as \"" + diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java index 1126c44c9f..17d43bda52 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java @@ -79,7 +79,7 @@ public class MvcUriComponentsBuilder extends UriComponentsBuilder { static { defaultUriComponentsContributor = new CompositeUriComponentsContributor( - Arrays.asList( + Arrays. asList( new PathVariableMethodArgumentResolver(), new RequestParamMethodArgumentResolver(null, false))); } @@ -180,10 +180,10 @@ public class MvcUriComponentsBuilder extends UriComponentsBuilder { * class AddressController { * * @RequestMapping("/{country}") - * public HttpEntity getAddressesForCountry(@PathVariable String country) { … } + * public HttpEntity getAddressesForCountry(@PathVariable String country) { ... } * * @RequestMapping(value="/", method=RequestMethod.POST) - * public void addAddress(Address address) { … } + * public void addAddress(Address address) { ... } * } * * @@ -434,4 +434,4 @@ public class MvcUriComponentsBuilder extends UriComponentsBuilder { } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java index e14d8bae19..9416137710 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java @@ -137,7 +137,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM } else if (isPartCollection(parameter)) { assertIsMultipartRequest(servletRequest); - arg = new ArrayList(servletRequest.getParts()); + arg = new ArrayList(servletRequest.getParts()); } else { try { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java index 0c2eff8a4b..a47920ae4e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java @@ -168,7 +168,7 @@ public class MultiActionController extends AbstractController implements LastMod private final Map lastModifiedMethodMap = new HashMap(); /** Methods, keyed by exception class */ - private final Map exceptionHandlerMap = new HashMap(); + private final Map, Method> exceptionHandlerMap = new HashMap, Method>(); /** @@ -287,10 +287,10 @@ public class MultiActionController extends AbstractController implements LastMod * as handler method (to avoid potential stack overflow). */ private boolean isHandlerMethod(Method method) { - Class returnType = method.getReturnType(); + Class returnType = method.getReturnType(); if (ModelAndView.class.equals(returnType) || Map.class.equals(returnType) || String.class.equals(returnType) || void.class.equals(returnType)) { - Class[] parameterTypes = method.getParameterTypes(); + Class[] parameterTypes = method.getParameterTypes(); return (parameterTypes.length >= 2 && HttpServletRequest.class.equals(parameterTypes[0]) && HttpServletResponse.class.equals(parameterTypes[1]) && @@ -327,8 +327,8 @@ public class MultiActionController extends AbstractController implements LastMod try { Method lastModifiedMethod = delegate.getClass().getMethod( method.getName() + LAST_MODIFIED_METHOD_SUFFIX, - new Class[] {HttpServletRequest.class}); - Class returnType = lastModifiedMethod.getReturnType(); + new Class[] {HttpServletRequest.class}); + Class returnType = lastModifiedMethod.getReturnType(); if (!(long.class.equals(returnType) || Long.class.equals(returnType))) { throw new IllegalStateException("last-modified method [" + lastModifiedMethod + "] declares an invalid return type - needs to be 'long' or 'Long'"); @@ -447,7 +447,7 @@ public class MultiActionController extends AbstractController implements LastMod } try { - Class[] paramTypes = method.getParameterTypes(); + Class[] paramTypes = method.getParameterTypes(); List params = new ArrayList(4); params.add(request); params.add(response); @@ -493,7 +493,7 @@ public class MultiActionController extends AbstractController implements LastMod return (ModelAndView) returnValue; } else if (returnValue instanceof Map) { - return new ModelAndView().addAllObjects((Map) returnValue); + return new ModelAndView().addAllObjects((Map) returnValue); } else if (returnValue instanceof String) { return new ModelAndView((String) returnValue); @@ -603,7 +603,7 @@ public class MultiActionController extends AbstractController implements LastMod * @param exception the exception to handle */ protected Method getExceptionHandler(Throwable exception) { - Class exceptionClass = exception.getClass(); + Class exceptionClass = exception.getClass(); if (logger.isDebugEnabled()) { logger.debug("Trying to find handler for exception class [" + exceptionClass.getName() + "]"); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java index 00917177e8..a93452a5cf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java @@ -52,7 +52,7 @@ public class NoSuchRequestHandlingMethodException extends ServletException { * @param method the HTTP request method of the request * @param parameterMap the request's parameters as map */ - public NoSuchRequestHandlingMethodException(String urlPath, String method, Map parameterMap) { + public NoSuchRequestHandlingMethodException(String urlPath, String method, Map parameterMap) { super("No matching handler method found for servlet request: path '" + urlPath + "', method '" + method + "', parameters " + StylerUtils.style(parameterMap)); } @@ -62,7 +62,7 @@ public class NoSuchRequestHandlingMethodException extends ServletException { * @param methodName the name of the handler method that wasn't found * @param controllerClass the class the handler method was expected to be in */ - public NoSuchRequestHandlingMethodException(String methodName, Class controllerClass) { + public NoSuchRequestHandlingMethodException(String methodName, Class controllerClass) { super("No request handling method with name '" + methodName + "' in class [" + controllerClass.getName() + "]"); this.methodName = methodName; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java index 08026a8735..0f458a9e41 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java @@ -86,7 +86,7 @@ public class PropertiesMethodNameResolver extends AbstractUrlMethodNameResolver if (methodName != null) { return methodName; } - Enumeration propNames = this.mappings.propertyNames(); + Enumeration propNames = this.mappings.propertyNames(); while (propNames.hasMoreElements()) { String registeredPath = (String) propNames.nextElement(); if (this.pathMatcher.match(registeredPath, urlPath)) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java index 7c4f94535f..e6bbfd2ccf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java @@ -38,7 +38,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect private Set excludedPackages = Collections.singleton("org.springframework.web.servlet.mvc"); - private Set excludedClasses = Collections.emptySet(); + private Set> excludedClasses = Collections.emptySet(); /** @@ -69,9 +69,9 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * Specify controller classes that should be excluded from this mapping. * Any such classes will simply be ignored by this HandlerMapping. */ - public void setExcludedClasses(Class[] excludedClasses) { + public void setExcludedClasses(Class[] excludedClasses) { this.excludedClasses = (excludedClasses != null) ? - new HashSet(Arrays.asList(excludedClasses)) : new HashSet(); + new HashSet>(Arrays.asList(excludedClasses)) : new HashSet>(); } @@ -81,7 +81,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect */ @Override protected String[] determineUrlsForHandler(String beanName) { - Class beanClass = getApplicationContext().getType(beanName); + Class beanClass = getApplicationContext().getType(beanName); if (isEligibleForMapping(beanName, beanClass)) { return buildUrlsForHandler(beanName, beanClass); } @@ -98,7 +98,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * @see #setExcludedPackages * @see #setExcludedClasses */ - protected boolean isEligibleForMapping(String beanName, Class beanClass) { + protected boolean isEligibleForMapping(String beanName, Class beanClass) { if (beanClass == null) { if (logger.isDebugEnabled()) { logger.debug("Excluding controller bean '" + beanName + "' from class name mapping " + @@ -131,7 +131,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * that is supported by this mapping strategy. * @param beanClass the class to introspect */ - protected boolean isControllerType(Class beanClass) { + protected boolean isControllerType(Class beanClass) { return this.predicate.isControllerType(beanClass); } @@ -140,7 +140,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * that dispatches to multiple action methods. * @param beanClass the class to introspect */ - protected boolean isMultiActionControllerType(Class beanClass) { + protected boolean isMultiActionControllerType(Class beanClass) { return this.predicate.isMultiActionControllerType(beanClass); } @@ -151,6 +151,6 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect * @param beanClass the type of the bean * @return the URLs determined for the bean */ - protected abstract String[] buildUrlsForHandler(String beanName, Class beanClass); + protected abstract String[] buildUrlsForHandler(String beanName, Class beanClass); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java index dfa46ec0ec..ef0d574d86 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java @@ -29,13 +29,13 @@ import org.springframework.stereotype.Controller; class AnnotationControllerTypePredicate extends ControllerTypePredicate { @Override - public boolean isControllerType(Class beanClass) { + public boolean isControllerType(Class beanClass) { return (super.isControllerType(beanClass) || AnnotationUtils.findAnnotation(beanClass, Controller.class) != null); } @Override - public boolean isMultiActionControllerType(Class beanClass) { + public boolean isMultiActionControllerType(Class beanClass) { return (super.isMultiActionControllerType(beanClass) || AnnotationUtils.findAnnotation(beanClass, Controller.class) != null); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java index 168781491f..dc88ef3287 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java @@ -65,7 +65,7 @@ public class ControllerBeanNameHandlerMapping extends AbstractControllerUrlHandl @Override - protected String[] buildUrlsForHandler(String beanName, Class beanClass) { + protected String[] buildUrlsForHandler(String beanName, Class beanClass) { List urls = new ArrayList(); urls.add(generatePathMapping(beanName)); String[] aliases = getApplicationContext().getAliases(beanName); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java index 4b8f9b33c5..752554cc5c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java @@ -122,7 +122,7 @@ public class ControllerClassNameHandlerMapping extends AbstractControllerUrlHand @Override - protected String[] buildUrlsForHandler(String beanName, Class beanClass) { + protected String[] buildUrlsForHandler(String beanName, Class beanClass) { return generatePathMappings(beanClass); } @@ -133,7 +133,7 @@ public class ControllerClassNameHandlerMapping extends AbstractControllerUrlHand * @param beanClass the controller bean class to generate a mapping for * @return the URL path mappings for the given controller */ - protected String[] generatePathMappings(Class beanClass) { + protected String[] generatePathMappings(Class beanClass) { StringBuilder pathMapping = buildPathPrefix(beanClass); String className = ClassUtils.getShortName(beanClass); String path = (className.endsWith(CONTROLLER_SUFFIX) ? @@ -159,7 +159,7 @@ public class ControllerClassNameHandlerMapping extends AbstractControllerUrlHand * @param beanClass the controller bean class to generate a mapping for * @return the path prefix, potentially including subpackage names as path elements */ - private StringBuilder buildPathPrefix(Class beanClass) { + private StringBuilder buildPathPrefix(Class beanClass) { StringBuilder pathMapping = new StringBuilder(); if (this.pathPrefix != null) { pathMapping.append(this.pathPrefix); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java index fb0c149968..33571f467b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerTypePredicate.java @@ -27,11 +27,11 @@ import org.springframework.web.servlet.mvc.multiaction.MultiActionController; */ class ControllerTypePredicate { - public boolean isControllerType(Class beanClass) { + public boolean isControllerType(Class beanClass) { return Controller.class.isAssignableFrom(beanClass); } - public boolean isMultiActionControllerType(Class beanClass) { + public boolean isMultiActionControllerType(Class beanClass) { return MultiActionController.class.isAssignableFrom(beanClass); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java index c5f9e6a3e3..8d3f0ccb3a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java @@ -61,13 +61,13 @@ public class BindStatus { private Object value; - private Class valueType; + private Class valueType; private Object actualValue; private PropertyEditor editor; - private List objectErrors; + private List objectErrors; private String[] errorCodes; @@ -161,7 +161,7 @@ public class BindStatus { private void initErrorCodes() { this.errorCodes = new String[this.objectErrors.size()]; for (int i = 0; i < this.objectErrors.size(); i++) { - ObjectError error = (ObjectError) this.objectErrors.get(i); + ObjectError error = this.objectErrors.get(i); this.errorCodes[i] = error.getCode(); } } @@ -173,7 +173,7 @@ public class BindStatus { if (this.errorMessages == null) { this.errorMessages = new String[this.objectErrors.size()]; for (int i = 0; i < this.objectErrors.size(); i++) { - ObjectError error = (ObjectError) this.objectErrors.get(i); + ObjectError error = this.objectErrors.get(i); this.errorMessages[i] = this.requestContext.getMessage(error, this.htmlEscape); } } @@ -214,7 +214,7 @@ public class BindStatus { * '{@code getValue().getClass()}' since '{@code getValue()}' may * return '{@code null}'. */ - public Class getValueType() { + public Class getValueType() { return this.valueType; } @@ -318,7 +318,7 @@ public class BindStatus { * @param valueClass the value class that an editor is needed for * @return the associated PropertyEditor, or {@code null} if none */ - public PropertyEditor findEditor(Class valueClass) { + public PropertyEditor findEditor(Class valueClass) { return (this.bindingResult != null ? this.bindingResult.findEditor(this.expression, valueClass) : null); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index 10e0bbff3a..276907d8da 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -624,7 +624,7 @@ public class RequestContext { * @param defaultMessage String to return if the lookup fails * @return the message */ - public String getMessage(String code, List args, String defaultMessage) { + public String getMessage(String code, List args, String defaultMessage) { return getMessage(code, (args != null ? args.toArray() : null), defaultMessage, isDefaultHtmlEscape()); } @@ -669,7 +669,7 @@ public class RequestContext { * @return the message * @throws org.springframework.context.NoSuchMessageException if not found */ - public String getMessage(String code, List args) throws NoSuchMessageException { + public String getMessage(String code, List args) throws NoSuchMessageException { return getMessage(code, (args != null ? args.toArray() : null), isDefaultHtmlEscape()); } @@ -742,7 +742,7 @@ public class RequestContext { * @param defaultMessage String to return if the lookup fails * @return the message */ - public String getThemeMessage(String code, List args, String defaultMessage) { + public String getThemeMessage(String code, List args, String defaultMessage) { return getTheme().getMessageSource().getMessage(code, (args != null ? args.toArray() : null), defaultMessage, this.locale); } @@ -781,7 +781,7 @@ public class RequestContext { * @return the message * @throws org.springframework.context.NoSuchMessageException if not found */ - public String getThemeMessage(String code, List args) throws NoSuchMessageException { + public String getThemeMessage(String code, List args) throws NoSuchMessageException { return getTheme().getMessageSource().getMessage(code, (args != null ? args.toArray() : null), this.locale); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java index 0a5331e570..25e6019420 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java @@ -17,9 +17,9 @@ package org.springframework.web.servlet.tags; import java.io.IOException; + import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.VariableResolver; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.EnvironmentAccessor; @@ -151,11 +151,12 @@ public class EvalTag extends HtmlEscapingAwareTag { } + @SuppressWarnings("deprecation") private static class JspPropertyAccessor implements PropertyAccessor { private final PageContext pageContext; - private final VariableResolver variableResolver; + private final javax.servlet.jsp.el.VariableResolver variableResolver; public JspPropertyAccessor(PageContext pageContext) { this.pageContext = pageContext; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java index 3c123d716e..1ff54e05aa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java @@ -287,7 +287,7 @@ public class MessageTag extends HtmlEscapingAwareTag implements ArgumentAware { return (Object[]) arguments; } else if (arguments instanceof Collection) { - return ((Collection) arguments).toArray(); + return ((Collection) arguments).toArray(); } else if (arguments != null) { // Assume a single argument object. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java index 5c431cc735..25350df652 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java @@ -19,6 +19,7 @@ package org.springframework.web.servlet.tags.form; import java.util.Collection; import java.util.Iterator; import java.util.Map; + import javax.servlet.jsp.JspException; import org.springframework.beans.BeanWrapper; @@ -185,6 +186,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem * value matches the bound value. */ @Override + @SuppressWarnings("rawtypes") protected int writeTagContent(TagWriter tagWriter) throws JspException { Object items = getItems(); Object itemsObject = (items instanceof String ? evaluate("items", items) : items); @@ -213,15 +215,15 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem } } else if (itemsObject instanceof Collection) { - final Collection optionCollection = (Collection) itemsObject; + final Collection optionCollection = (Collection) itemsObject; int itemIndex = 0; - for (Iterator it = optionCollection.iterator(); it.hasNext(); itemIndex++) { + for (Iterator it = optionCollection.iterator(); it.hasNext(); itemIndex++) { Object item = it.next(); writeObjectEntry(tagWriter, valueProperty, labelProperty, item, itemIndex); } } else if (itemsObject instanceof Map) { - final Map optionMap = (Map) itemsObject; + final Map optionMap = (Map) itemsObject; int itemIndex = 0; for (Iterator it = optionMap.entrySet().iterator(); it.hasNext(); itemIndex++) { Map.Entry entry = (Map.Entry) it.next(); @@ -254,7 +256,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem } private void writeMapEntry(TagWriter tagWriter, String valueProperty, - String labelProperty, Map.Entry entry, int itemIndex) throws JspException { + String labelProperty, Map.Entry entry, int itemIndex) throws JspException { Object mapKey = entry.getKey(); Object mapValue = entry.getValue(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 6244a2d537..23cb3fa005 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -70,7 +70,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag { tagWriter.writeAttribute("type", getInputType()); Object boundValue = getBoundValue(); - Class valueType = getBindStatus().getValueType(); + Class valueType = getBindStatus().getValueType(); if (Boolean.class.equals(valueType) || boolean.class.equals(valueType)) { // the concrete type may not be a Boolean - can be String diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java index 062b4900d4..db968cdf2e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java @@ -135,7 +135,7 @@ class OptionWriter { else if (this.optionSource instanceof Map) { renderFromMap(tagWriter); } - else if (this.optionSource instanceof Class && ((Class) this.optionSource).isEnum()) { + else if (this.optionSource instanceof Class && ((Class) this.optionSource).isEnum()) { renderFromEnum(tagWriter); } else { @@ -158,8 +158,8 @@ class OptionWriter { * @see #renderOption(TagWriter, Object, Object, Object) */ private void renderFromMap(TagWriter tagWriter) throws JspException { - Map optionMap = (Map) this.optionSource; - for (Map.Entry entry : optionMap.entrySet()) { + Map optionMap = (Map) this.optionSource; + for (Map.Entry entry : optionMap.entrySet()) { Object mapKey = entry.getKey(); Object mapValue = entry.getValue(); Object renderValue = (this.valueProperty != null ? @@ -177,7 +177,7 @@ class OptionWriter { * @see #doRenderFromCollection(java.util.Collection, TagWriter) */ private void renderFromCollection(TagWriter tagWriter) throws JspException { - doRenderFromCollection((Collection) this.optionSource, tagWriter); + doRenderFromCollection((Collection) this.optionSource, tagWriter); } /** @@ -185,7 +185,7 @@ class OptionWriter { * @see #doRenderFromCollection(java.util.Collection, TagWriter) */ private void renderFromEnum(TagWriter tagWriter) throws JspException { - doRenderFromCollection(CollectionUtils.arrayToList(((Class) this.optionSource).getEnumConstants()), tagWriter); + doRenderFromCollection(CollectionUtils.arrayToList(((Class) this.optionSource).getEnumConstants()), tagWriter); } /** @@ -194,7 +194,7 @@ class OptionWriter { * when rendering the '{@code value}' of the '{@code option}' and the value of the * {@link #labelProperty} property is used when rendering the label. */ - private void doRenderFromCollection(Collection optionCollection, TagWriter tagWriter) throws JspException { + private void doRenderFromCollection(Collection optionCollection, TagWriter tagWriter) throws JspException { for (Object item : optionCollection) { BeanWrapper wrapper = PropertyAccessorFactory.forBeanPropertyAccess(item); Object value; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java index bc60a5c7e7..ea0758bf33 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java @@ -261,7 +261,7 @@ public class SelectTag extends AbstractHtmlInputElementTag { */ private boolean forceMultiple() throws JspException { BindStatus bindStatus = getBindStatus(); - Class valueType = bindStatus.getValueType(); + Class valueType = bindStatus.getValueType(); if (valueType != null && typeRequiresMultiple(valueType)) { return true; } @@ -278,7 +278,7 @@ public class SelectTag extends AbstractHtmlInputElementTag { * Returns '{@code true}' for arrays, {@link Collection Collections} * and {@link Map Maps}. */ - private static boolean typeRequiresMultiple(Class type) { + private static boolean typeRequiresMultiple(Class type) { return (type.isArray() || Collection.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type)); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java index c07c53e109..5942705f12 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java @@ -89,10 +89,10 @@ abstract class SelectedValueComparator { selected = collectionCompare(CollectionUtils.arrayToList(boundValue), candidateValue, bindStatus); } else if (boundValue instanceof Collection) { - selected = collectionCompare((Collection) boundValue, candidateValue, bindStatus); + selected = collectionCompare((Collection) boundValue, candidateValue, bindStatus); } else if (boundValue instanceof Map) { - selected = mapCompare((Map) boundValue, candidateValue, bindStatus); + selected = mapCompare((Map) boundValue, candidateValue, bindStatus); } if (!selected) { selected = exhaustiveCompare(boundValue, candidateValue, bindStatus.getEditor(), null); @@ -100,7 +100,7 @@ abstract class SelectedValueComparator { return selected; } - private static boolean collectionCompare(Collection boundCollection, Object candidateValue, BindStatus bindStatus) { + private static boolean collectionCompare(Collection boundCollection, Object candidateValue, BindStatus bindStatus) { try { if (boundCollection.contains(candidateValue)) { return true; @@ -112,7 +112,7 @@ abstract class SelectedValueComparator { return exhaustiveCollectionCompare(boundCollection, candidateValue, bindStatus); } - private static boolean mapCompare(Map boundMap, Object candidateValue, BindStatus bindStatus) { + private static boolean mapCompare(Map boundMap, Object candidateValue, BindStatus bindStatus) { try { if (boundMap.containsKey(candidateValue)) { return true; @@ -125,7 +125,7 @@ abstract class SelectedValueComparator { } private static boolean exhaustiveCollectionCompare( - Collection collection, Object candidateValue, BindStatus bindStatus) { + Collection collection, Object candidateValue, BindStatus bindStatus) { Map convertedValueCache = new HashMap(1); PropertyEditor editor = null; @@ -149,7 +149,7 @@ abstract class SelectedValueComparator { String candidateDisplayString = ValueFormatter.getDisplayString(candidate, editor, false); if (boundValue.getClass().isEnum()) { - Enum boundEnum = (Enum) boundValue; + Enum boundEnum = (Enum) boundValue; String enumCodeAsString = ObjectUtils.getDisplayString(boundEnum.name()); if (enumCodeAsString.equals(candidateDisplayString)) { return true; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java index b4d2d914f8..5c6d94f1a3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java @@ -45,7 +45,7 @@ public class TagWriter { /** * Stores {@link TagStateEntry tag state}. Stack model naturally supports tag nesting. */ - private final Stack tagState = new Stack(); + private final Stack tagState = new Stack(); /** @@ -194,7 +194,7 @@ public class TagWriter { } private TagStateEntry currentState() { - return (TagStateEntry) this.tagState.peek(); + return this.tagState.peek(); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java index c613e2124c..d8db4d4e3e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java @@ -117,8 +117,8 @@ public abstract class AbstractTemplateView extends AbstractUrlBasedView { Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { if (this.exposeRequestAttributes) { - for (Enumeration en = request.getAttributeNames(); en.hasMoreElements();) { - String attribute = (String) en.nextElement(); + for (Enumeration en = request.getAttributeNames(); en.hasMoreElements();) { + String attribute = en.nextElement(); if (model.containsKey(attribute) && !this.allowRequestOverride) { throw new ServletException("Cannot expose request attribute '" + attribute + "' because of an existing model object of the same name"); @@ -135,8 +135,8 @@ public abstract class AbstractTemplateView extends AbstractUrlBasedView { if (this.exposeSessionAttributes) { HttpSession session = request.getSession(false); if (session != null) { - for (Enumeration en = session.getAttributeNames(); en.hasMoreElements();) { - String attribute = (String) en.nextElement(); + for (Enumeration en = session.getAttributeNames(); en.hasMoreElements();) { + String attribute = en.nextElement(); if (model.containsKey(attribute) && !this.allowSessionOverride) { throw new ServletException("Cannot expose session attribute '" + attribute + "' because of an existing model object of the same name"); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java index 7a13309b67..3250cf35ea 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java @@ -44,7 +44,7 @@ public class AbstractTemplateViewResolver extends UrlBasedViewResolver { @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return AbstractTemplateView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java index cd55f05377..b25ba680a5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java @@ -63,7 +63,7 @@ public class InternalResourceViewResolver extends UrlBasedViewResolver { * is present. */ public InternalResourceViewResolver() { - Class viewClass = requiredViewClass(); + Class viewClass = requiredViewClass(); if (viewClass.equals(InternalResourceView.class) && jstlPresent) { viewClass = JstlView.class; } @@ -74,7 +74,7 @@ public class InternalResourceViewResolver extends UrlBasedViewResolver { * This resolver requires {@link InternalResourceView}. */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return InternalResourceView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java index 26b7992997..1db7aafb83 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java @@ -28,6 +28,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -381,7 +382,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { valueIter = Arrays.asList(ObjectUtils.toObjectArray(rawValue)).iterator(); } else if (rawValue instanceof Collection) { - valueIter = ((Collection) rawValue).iterator(); + valueIter = ((Collection) rawValue).iterator(); } else { valueIter = Collections.singleton(rawValue).iterator(); @@ -458,7 +459,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { return true; } if (value instanceof Collection) { - Collection coll = (Collection) value; + Collection coll = (Collection) value; if (coll.isEmpty()) { return false; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java index 086d6e204e..edb4a02be8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java @@ -100,7 +100,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements public static final String FORWARD_URL_PREFIX = "forward:"; - private Class viewClass; + private Class viewClass; private String prefix = ""; @@ -129,7 +129,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements * (by default, AbstractUrlBasedView) * @see AbstractUrlBasedView */ - public void setViewClass(Class viewClass) { + public void setViewClass(Class viewClass) { if (viewClass == null || !requiredViewClass().isAssignableFrom(viewClass)) { throw new IllegalArgumentException( "Given view class [" + (viewClass != null ? viewClass.getName() : null) + @@ -141,7 +141,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements /** * Return the view class to be used to create views. */ - protected Class getViewClass() { + protected Class getViewClass() { return this.viewClass; } @@ -150,7 +150,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements * This implementation returns AbstractUrlBasedView. * @see AbstractUrlBasedView */ - protected Class requiredViewClass() { + protected Class requiredViewClass() { return AbstractUrlBasedView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java index a6129a5ded..c774ccf086 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java @@ -48,7 +48,7 @@ public class FreeMarkerViewResolver extends AbstractTemplateViewResolver { * Requires {@link FreeMarkerView}. */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return FreeMarkerView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java index 28b4c4348f..bc736fafd3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java @@ -314,7 +314,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { "'reportDataKey' for main report is required when specifying a value for 'subReportDataKeys'"); } this.subReports = new HashMap(this.subReportUrls.size()); - for (Enumeration urls = this.subReportUrls.propertyNames(); urls.hasMoreElements();) { + for (Enumeration urls = this.subReportUrls.propertyNames(); urls.hasMoreElements();) { String key = (String) urls.nextElement(); String path = this.subReportUrls.getProperty(key); Resource resource = getApplicationContext().getResource(path); @@ -434,7 +434,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { String fieldName = fqFieldName.substring(index + 1); try { - Class cls = ClassUtils.forName(className, getApplicationContext().getClassLoader()); + Class cls = ClassUtils.forName(className, getApplicationContext().getClassLoader()); Field field = cls.getField(fieldName); if (JRExporterParameter.class.isAssignableFrom(field.getType())) { @@ -644,7 +644,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { } } else { - Collection values = model.values(); + Collection values = model.values(); jrDataSource = CollectionUtils.findValueOfType(values, JRDataSource.class); if (jrDataSource == null) { JRDataSourceProvider provider = CollectionUtils.findValueOfType(values, JRDataSourceProvider.class); @@ -712,7 +712,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { */ private void populateHeaders(HttpServletResponse response) { // Apply the headers to the response. - for (Enumeration en = this.headers.propertyNames(); en.hasMoreElements();) { + for (Enumeration en = this.headers.propertyNames(); en.hasMoreElements();) { String key = (String) en.nextElement(); response.addHeader(key, this.headers.getProperty(key)); } @@ -802,8 +802,8 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView { *

    Default value types are: {@code java.util.Collection} and {@code Object} array. * @return the value types in prioritized order */ - protected Class[] getReportDataTypes() { - return new Class[] {Collection.class, Object[].class}; + protected Class[] getReportDataTypes() { + return new Class[] {Collection.class, Object[].class}; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java index f646898b93..9a7aab3a08 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java @@ -51,7 +51,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver { * Requires the view class to be a subclass of {@link AbstractJasperReportsView}. */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return AbstractJasperReportsView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java index 3b399b1932..25809bdd10 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java @@ -71,9 +71,9 @@ public class SpringTilesApplicationContextFactory extends AbstractTilesApplicati public SpringWildcardServletTilesApplicationContext(ServletContext servletContext, Map params) { super(servletContext); this.mergedInitParams = new LinkedHashMap(); - Enumeration initParamNames = servletContext.getInitParameterNames(); + Enumeration initParamNames = servletContext.getInitParameterNames(); while (initParamNames.hasMoreElements()) { - String initParamName = (String) initParamNames.nextElement(); + String initParamName = initParamNames.nextElement(); this.mergedInitParams.put(initParamName, servletContext.getInitParameter(initParamName)); } if (params != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java index 75a30e6f54..7d64ecee9c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java @@ -196,7 +196,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D public void setCompleteAutoload(boolean completeAutoload) { if (completeAutoload) { try { - Class clazz = getClass().getClassLoader().loadClass( + Class clazz = getClass().getClassLoader().loadClass( "org.apache.tiles.extras.complete.CompleteAutoloadTilesInitializer"); this.tilesInitializer = (TilesInitializer) clazz.newInstance(); } @@ -529,9 +529,9 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D logger.debug("Registering Tiles 2.2 AttributeEvaluatorFactory for JSP 2.1"); try { ClassLoader cl = TilesElActivator.class.getClassLoader(); - Class aef = cl.loadClass("org.apache.tiles.evaluator.AttributeEvaluatorFactory"); - Class baef = cl.loadClass("org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory"); - Constructor baefCtor = baef.getConstructor(AttributeEvaluator.class); + Class aef = cl.loadClass("org.apache.tiles.evaluator.AttributeEvaluatorFactory"); + Class baef = cl.loadClass("org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory"); + Constructor baefCtor = baef.getConstructor(AttributeEvaluator.class); ELAttributeEvaluator evaluator = new ELAttributeEvaluator(); evaluator.setApplicationContext(container.getApplicationContext()); evaluator.init(new HashMap()); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java index 70fba26b1d..bfe4f2f7da 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java @@ -18,6 +18,7 @@ package org.springframework.web.servlet.view.tiles2; import java.util.Locale; import java.util.Map; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -30,11 +31,9 @@ import org.apache.tiles.impl.BasicTilesContainer; import org.apache.tiles.servlet.context.ServletTilesApplicationContext; import org.apache.tiles.servlet.context.ServletTilesRequestContext; import org.apache.tiles.servlet.context.ServletUtil; - import org.springframework.web.servlet.support.JstlUtils; import org.springframework.web.servlet.support.RequestContext; import org.springframework.web.servlet.view.AbstractUrlBasedView; -import org.springframework.web.util.WebUtils; /** * {@link org.springframework.web.servlet.View} implementation that retrieves a diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java index 593776d68a..f559d4de95 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java @@ -47,7 +47,7 @@ public class TilesViewResolver extends UrlBasedViewResolver { * Requires {@link TilesView}. */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return TilesView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java index 873421473e..02124e0da1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java @@ -46,7 +46,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver { * @see VelocityLayoutView */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return VelocityLayoutView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java index 2cc58f360b..e0725f62aa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java @@ -108,7 +108,7 @@ public class VelocityToolboxView extends VelocityView { if (getToolboxConfigLocation() != null) { ToolboxManager toolboxManager = ServletToolboxManager.getInstance( getServletContext(), getToolboxConfigLocation()); - Map toolboxContext = toolboxManager.getToolbox(velocityContext); + Map toolboxContext = toolboxManager.getToolbox(velocityContext); velocityContext.setToolbox(toolboxContext); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java index 69e074eb2f..23751a5d24 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java @@ -86,7 +86,7 @@ import org.springframework.web.util.NestedServletException; */ public class VelocityView extends AbstractTemplateView { - private Map toolAttributes; + private Map> toolAttributes; private String dateToolAttribute; @@ -128,7 +128,7 @@ public class VelocityView extends AbstractTemplateView { * @see #setDateToolAttribute * @see #setNumberToolAttribute */ - public void setToolAttributes(Map toolAttributes) { + public void setToolAttributes(Map> toolAttributes) { this.toolAttributes = toolAttributes; } @@ -393,9 +393,9 @@ public class VelocityView extends AbstractTemplateView { protected void exposeToolAttributes(Context velocityContext, HttpServletRequest request) throws Exception { // Expose generic attributes. if (this.toolAttributes != null) { - for (Map.Entry entry : this.toolAttributes.entrySet()) { + for (Map.Entry> entry : this.toolAttributes.entrySet()) { String attributeName = entry.getKey(); - Class toolClass = entry.getValue(); + Class toolClass = entry.getValue(); try { Object tool = toolClass.newInstance(); initTool(tool, velocityContext); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java index 11ce8c62d8..ab765f31fa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java @@ -58,7 +58,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver { * Requires {@link VelocityView}. */ @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return VelocityView.class; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java index 9753b9b576..c44e72e74d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java @@ -73,7 +73,7 @@ import org.springframework.web.util.WebUtils; */ public class XsltView extends AbstractUrlBasedView { - private Class transformerFactoryClass; + private Class transformerFactoryClass; private String sourceKey; @@ -97,7 +97,7 @@ public class XsltView extends AbstractUrlBasedView { *

    The default constructor of the specified class will be called * to build the TransformerFactory for this view. */ - public void setTransformerFactoryClass(Class transformerFactoryClass) { + public void setTransformerFactoryClass(Class transformerFactoryClass) { Assert.isAssignable(TransformerFactory.class, transformerFactoryClass); this.transformerFactoryClass = transformerFactoryClass; } @@ -195,7 +195,7 @@ public class XsltView extends AbstractUrlBasedView { * @see #setTransformerFactoryClass * @see #getTransformerFactory() */ - protected TransformerFactory newTransformerFactory(Class transformerFactoryClass) { + protected TransformerFactory newTransformerFactory(Class transformerFactoryClass) { if (transformerFactoryClass != null) { try { return (TransformerFactory) transformerFactoryClass.newInstance(); @@ -283,8 +283,8 @@ public class XsltView extends AbstractUrlBasedView { * {@link Reader}, {@link InputStream} and {@link Resource}. * @return the supported source types */ - protected Class[] getSourceTypes() { - return new Class[] {Source.class, Document.class, Node.class, Reader.class, InputStream.class, Resource.class}; + protected Class[] getSourceTypes() { + return new Class[] {Source.class, Document.class, Node.class, Reader.class, InputStream.class, Resource.class}; } /** @@ -362,7 +362,7 @@ public class XsltView extends AbstractUrlBasedView { */ protected final void copyOutputProperties(Transformer transformer) { if (this.outputProperties != null) { - Enumeration en = this.outputProperties.propertyNames(); + Enumeration en = this.outputProperties.propertyNames(); while (en.hasMoreElements()) { String name = (String) en.nextElement(); transformer.setOutputProperty(name, this.outputProperties.getProperty(name)); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java index 8ba15e391c..4413945af8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java @@ -118,7 +118,7 @@ public class XsltViewResolver extends UrlBasedViewResolver { @Override - protected Class requiredViewClass() { + protected Class requiredViewClass() { return XsltView.class; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java index 4cdf72c4b3..18c4fa8513 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java @@ -73,8 +73,7 @@ public class VelocityToolboxViewTests { vv.setUrl(templateName); vv.setApplicationContext(wac); - @SuppressWarnings("unchecked") - Map toolAttributes = new HashMap(); + Map> toolAttributes = new HashMap>(); toolAttributes.put("math", MathTool.class); toolAttributes.put("link2", LinkTool.class); vv.setToolAttributes(toolAttributes); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java index dd0f8749d1..95f2aef1ff 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java @@ -265,7 +265,7 @@ public class VelocityViewTests { vv.setUrl(templateName); vv.setApplicationContext(wac); - Map toolAttributes = new HashMap(); + Map> toolAttributes = new HashMap>(); toolAttributes.put("math", MathTool.class); vv.setToolAttributes(toolAttributes); vv.setDateToolAttribute("dateTool"); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java index 12a9f7752e..ded34be25a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java @@ -84,7 +84,7 @@ public abstract class AbstractWebSocketMessage implements WebSocketMessage if (!(other instanceof AbstractWebSocketMessage)) { return false; } - AbstractWebSocketMessage otherMessage = (AbstractWebSocketMessage) other; + AbstractWebSocketMessage otherMessage = (AbstractWebSocketMessage) other; return ObjectUtils.nullSafeEquals(this.payload, otherMessage.payload); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssion.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssion.java index eb0dfc4c56..99128a65f3 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssion.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssion.java @@ -86,7 +86,7 @@ public abstract class AbstractWebSocketSesssion implements WebSocketSession, } @Override - public final void sendMessage(WebSocketMessage message) throws IOException { + public final void sendMessage(WebSocketMessage message) throws IOException { checkNativeSessionInitialized(); Assert.isTrue(isOpen(), "Cannot send message after connection closed."); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java index b6df3649ac..0d95d8561e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java @@ -88,8 +88,8 @@ public class StompSubProtocolHandler implements SubProtocolHandler { /** * Handle incoming WebSocket messages from clients. */ - public void handleMessageFromClient(WebSocketSession session, WebSocketMessage webSocketMessage, - MessageChannel outputChannel) { + public void handleMessageFromClient(WebSocketSession session, + WebSocketMessage webSocketMessage, MessageChannel outputChannel) { Message message; try { @@ -247,4 +247,4 @@ public class StompSubProtocolHandler implements SubProtocolHandler { outputChannel.send(message); } -} \ No newline at end of file +} diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolHandler.java index 8781dc86b4..d8eb8f30ae 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolHandler.java @@ -54,7 +54,7 @@ public interface SubProtocolHandler { * @param message the client message * @param outputChannel an output channel to send messages to */ - void handleMessageFromClient(WebSocketSession session, WebSocketMessage message, + void handleMessageFromClient(WebSocketSession session, WebSocketMessage message, MessageChannel outputChannel) throws Exception; /** diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java index 4adce95741..101b2cd773 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java @@ -53,8 +53,6 @@ import org.springframework.web.socket.sockjs.SockJsService; */ public abstract class AbstractSockJsService implements SockJsService { - private static final int MAX_KNOWN_SOCKJS_PREFIX_COUNT = 100; - protected final Log logger = LogFactory.getLog(getClass()); private static final long ONE_YEAR = TimeUnit.DAYS.toSeconds(365); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java index 9752031f36..c026df03bd 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java @@ -82,7 +82,7 @@ public class DefaultSockJsService extends AbstractSockJsService { private final Map sessions = new ConcurrentHashMap(); - private ScheduledFuture sessionCleanupTask; + private ScheduledFuture sessionCleanupTask; /** diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java index 51164ad1de..29f98c3a22 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java @@ -188,7 +188,7 @@ public abstract class AbstractSockJsSession implements WebSocketSession { this.handler.handleTransportError(this, ex); } - public final synchronized void sendMessage(WebSocketMessage message) throws IOException { + public final synchronized void sendMessage(WebSocketMessage message) throws IOException { Assert.isTrue(!isClosed(), "Cannot send a message when session is closed"); Assert.isInstanceOf(TextMessage.class, message, "Expected text message: " + message); sendMessageInternal(((TextMessage) message).getPayload()); diff --git a/src/eclipse/org.eclipse.jdt.core.prefs b/src/eclipse/org.eclipse.jdt.core.prefs index 80a095b1a1..59228c9dce 100644 --- a/src/eclipse/org.eclipse.jdt.core.prefs +++ b/src/eclipse/org.eclipse.jdt.core.prefs @@ -11,6 +11,7 @@ org.eclipse.jdt.core.codeComplete.localPrefixes= org.eclipse.jdt.core.codeComplete.localSuffixes= org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault @@ -30,7 +31,7 @@ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -59,6 +60,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=ignore org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error @@ -68,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore @@ -79,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -102,6 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7