From c26b9cbb75404ead0f9aab1ec837c9a50a2e7e8c Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 23 Oct 2008 09:22:13 +0000 Subject: [PATCH] Removed deprecated classes --- .../aop/config/AopNamespaceUtils.java | 2 + .../aop/framework/AopProxyUtils.java | 1 + .../autoproxy/AbstractAutoProxyCreator.java | 1 + .../ClassLoaderAnalyzerInterceptor.java | 53 ------------------- 4 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ClassLoaderAnalyzerInterceptor.java diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java b/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java index 2b3cc33a46..da69bed31f 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java @@ -79,6 +79,7 @@ public abstract class AopNamespaceUtils { * {@link #registerAutoProxyCreatorIfNecessary(ParserContext, Element)} and * {@link AopConfigUtils#registerAutoProxyCreatorIfNecessary(BeanDefinitionRegistry, Object)} */ + @Deprecated public static void registerAutoProxyCreatorIfNecessary(ParserContext parserContext, Object source) { BeanDefinition beanDefinition = AopConfigUtils.registerAutoProxyCreatorIfNecessary( parserContext.getRegistry(), source); @@ -89,6 +90,7 @@ public abstract class AopNamespaceUtils { * @deprecated since Spring 2.5, in favor of * {@link AopConfigUtils#forceAutoProxyCreatorToUseClassProxying(BeanDefinitionRegistry)} */ + @Deprecated public static void forceAutoProxyCreatorToUseClassProxying(BeanDefinitionRegistry registry) { AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry); } diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java index c3b59c511c..0d78453adf 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java @@ -44,6 +44,7 @@ public abstract class AopProxyUtils { * @deprecated as of Spring 2.0.3, in favor of AopUtils.getTargetClass * @see org.springframework.aop.support.AopUtils#getTargetClass(Object) */ + @Deprecated public static Class getTargetClass(Object candidate) { Assert.notNull(candidate, "Candidate object must not be null"); if (AopUtils.isCglibProxy(candidate)) { diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java index 49dd1f80e6..f6ce2dd7d6 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java @@ -377,6 +377,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig * @deprecated in favor of isInfrastructureClass(beanClass) * @see #isInfrastructureClass(Class) */ + @Deprecated protected boolean isInfrastructureClass(Class beanClass, String beanName) { return isInfrastructureClass(beanClass); } diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ClassLoaderAnalyzerInterceptor.java b/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ClassLoaderAnalyzerInterceptor.java deleted file mode 100644 index 2391634ea7..0000000000 --- a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ClassLoaderAnalyzerInterceptor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2008 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.interceptor; - -import java.io.Serializable; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.util.ClassLoaderUtils; - -/** - * Trivial classloader analyzer interceptor. - * - * @author Rod Johnson - * @author Dmitriy Kopylenko - * @deprecated as of Spring 2.5, to be removed in Spring 3.0 - * @see org.springframework.util.ClassLoaderUtils - */ -public class ClassLoaderAnalyzerInterceptor implements MethodInterceptor, Serializable { - - /** Static to avoid serializing the logger */ - protected static final Log logger = LogFactory.getLog(ClassLoaderAnalyzerInterceptor.class); - - public Object invoke(MethodInvocation invocation) throws Throwable { - if (logger.isInfoEnabled()) { - logger.info( - ClassLoaderUtils.showClassLoaderHierarchy( - invocation.getThis(), - invocation.getThis().getClass().getName(), - "\n", - "-")); - } - return invocation.proceed(); - } - -}