diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java index 3c822cf2da..232e2ebc39 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,13 +52,13 @@ public interface Advised extends TargetClassAware { * Return the interfaces proxied by the AOP proxy. Will not * include the target class, which may also be proxied. */ - Class[] getProxiedInterfaces(); + Class[] getProxiedInterfaces(); /** * Determine whether the given interface is proxied. * @param intf the interface to check */ - boolean isInterfaceProxied(Class intf); + boolean isInterfaceProxied(Class intf); /** 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 da1d2c1690..37efc36e85 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 @@ -160,7 +160,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * @see #setTargetSource * @see #setTarget */ - public void setTargetClass(Class targetClass) { + public void setTargetClass(Class targetClass) { this.targetSource = EmptyTargetSource.forClass(targetClass); } @@ -199,7 +199,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { /** * Set the interfaces to be proxied. */ - public void setInterfaces(Class[] interfaces) { + public void setInterfaces(Class... interfaces) { Assert.notNull(interfaces, "Interfaces must not be null"); this.interfaces.clear(); for (Class ifc : interfaces) { @@ -211,7 +211,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * Add a new proxied interface. * @param intf the additional interface to proxy */ - public void addInterface(Class intf) { + public void addInterface(Class intf) { Assert.notNull(intf, "Interface must not be null"); if (!intf.isInterface()) { throw new IllegalArgumentException("[" + intf.getName() + "] is not an interface"); @@ -229,17 +229,17 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * @return {@code true} if the interface was removed; {@code false} * if the interface was not found and hence could not be removed */ - public boolean removeInterface(Class intf) { + public boolean removeInterface(Class intf) { return this.interfaces.remove(intf); } @Override - public Class[] getProxiedInterfaces() { + public Class[] getProxiedInterfaces() { return this.interfaces.toArray(new Class[this.interfaces.size()]); } @Override - public boolean isInterfaceProxied(Class intf) { + public boolean isInterfaceProxied(Class intf) { for (Class proxyIntf : this.interfaces) { if (intf.isAssignableFrom(proxyIntf)) { return true; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java index 67e89eeefd..51f8d01f53 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class ProxyFactory extends ProxyCreatorSupport { *

No target, only interfaces. Must add interceptors. * @param proxyInterfaces the interfaces that the proxy should implement */ - public ProxyFactory(Class[] proxyInterfaces) { + public ProxyFactory(Class... proxyInterfaces) { setInterfaces(proxyInterfaces); } @@ -69,7 +69,7 @@ public class ProxyFactory extends ProxyCreatorSupport { * @param proxyInterface the interface that the proxy should implement * @param interceptor the interceptor that the proxy should invoke */ - public ProxyFactory(Class proxyInterface, Interceptor interceptor) { + public ProxyFactory(Class proxyInterface, Interceptor interceptor) { addInterface(proxyInterface); addAdvice(interceptor); } @@ -80,7 +80,7 @@ public class ProxyFactory extends ProxyCreatorSupport { * @param proxyInterface the interface that the proxy should implement * @param targetSource the TargetSource that the proxy should invoke */ - public ProxyFactory(Class proxyInterface, TargetSource targetSource) { + public ProxyFactory(Class proxyInterface, TargetSource targetSource) { addInterface(proxyInterface); setTargetSource(targetSource); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java index fe3e3b15ef..26a0d0b7f7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,14 +48,14 @@ public class InjectionMetadata { private final Log logger = LogFactory.getLog(InjectionMetadata.class); - private final Class targetClass; + private final Class targetClass; private final Collection injectedElements; private volatile Set checkedElements; - public InjectionMetadata(Class targetClass, Collection elements) { + public InjectionMetadata(Class targetClass, Collection elements) { this.targetClass = targetClass; this.injectedElements = elements; } @@ -110,7 +110,7 @@ public class InjectionMetadata { return this.member; } - protected final Class getResourceType() { + protected final Class getResourceType() { if (this.isField) { return ((Field) this.member).getType(); } @@ -122,16 +122,16 @@ public class InjectionMetadata { } } - protected final void checkResourceType(Class resourceType) { + protected final void checkResourceType(Class resourceType) { if (this.isField) { - Class fieldType = ((Field) this.member).getType(); + Class fieldType = ((Field) this.member).getType(); if (!(resourceType.isAssignableFrom(fieldType) || fieldType.isAssignableFrom(resourceType))) { throw new IllegalStateException("Specified field type [" + fieldType + "] is incompatible with resource type [" + resourceType.getName() + "]"); } } else { - Class paramType = + Class paramType = (this.pd != null ? this.pd.getPropertyType() : ((Method) this.member).getParameterTypes()[0]); if (!(resourceType.isAssignableFrom(paramType) || paramType.isAssignableFrom(resourceType))) { throw new IllegalStateException("Specified parameter type [" + paramType + 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 2693f8246c..35bdfd904b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class DependencyDescriptor implements Serializable { private transient Field field; - private Class declaringClass; + private Class declaringClass; private String methodName;