Consistent formatting of license headers, package javadocs, and import declarations

This commit is contained in:
Juergen Hoeller 2014-10-21 00:30:42 +02:00
parent b6fdcffc94
commit 8325b10080
2059 changed files with 3944 additions and 5473 deletions

View File

@ -28,6 +28,7 @@ import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.weaver.tools.PointcutParser; import org.aspectj.weaver.tools.PointcutParser;
import org.aspectj.weaver.tools.PointcutPrimitive; import org.aspectj.weaver.tools.PointcutPrimitive;
import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ParameterNameDiscoverer;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

View File

@ -37,6 +37,7 @@ import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.AjType; import org.aspectj.lang.reflect.AjType;
import org.aspectj.lang.reflect.AjTypeSystem; import org.aspectj.lang.reflect.AjTypeSystem;
import org.aspectj.lang.reflect.PerClauseKind; import org.aspectj.lang.reflect.PerClauseKind;
import org.springframework.aop.aspectj.AspectJExpressionPointcut; import org.springframework.aop.aspectj.AspectJExpressionPointcut;
import org.springframework.aop.framework.AopConfigException; import org.springframework.aop.framework.AopConfigException;
import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ParameterNameDiscoverer;

View File

@ -1,10 +1,6 @@
/** /**
*
* Classes enabling AspectJ 5 @Annotated classes to be used in Spring AOP. * Classes enabling AspectJ 5 @Annotated classes to be used in Spring AOP.
* *
* <p>Normally to be used through an AspectJAutoProxyCreator rather than directly. * <p>Normally to be used through an AspectJAutoProxyCreator rather than directly.
*
*/ */
package org.springframework.aop.aspectj.annotation; package org.springframework.aop.aspectj.annotation;

View File

@ -1,9 +1,5 @@
/** /**
*
* Base classes enabling auto-proxying based on AspectJ. * Base classes enabling auto-proxying based on AspectJ.
* Support for AspectJ annotation aspects resides in the "aspectj.annotation" package. * Support for AspectJ annotation aspects resides in the "aspectj.annotation" package.
*
*/ */
package org.springframework.aop.aspectj.autoproxy; package org.springframework.aop.aspectj.autoproxy;

View File

@ -1,5 +1,4 @@
/** /**
*
* AspectJ integration package. Includes Spring AOP advice implementations for AspectJ 5 * AspectJ integration package. Includes Spring AOP advice implementations for AspectJ 5
* annotation-style methods, and an AspectJExpressionPointcut: a Spring AOP Pointcut * annotation-style methods, and an AspectJExpressionPointcut: a Spring AOP Pointcut
* implementation that allows use of the AspectJ pointcut expression language with the Spring AOP * implementation that allows use of the AspectJ pointcut expression language with the Spring AOP
@ -8,7 +7,5 @@
* <p>Note that use of this package does <i>not</i> require the use of the {@code ajc} compiler * <p>Note that use of this package does <i>not</i> require the use of the {@code ajc} compiler
* or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ * or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ
* functionality, with consistent semantics, with the proxy-based Spring AOP framework. * functionality, with consistent semantics, with the proxy-based Spring AOP framework.
*
*/ */
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;

View File

@ -1,9 +1,5 @@
/** /**
*
* Support package for declarative AOP configuration, * Support package for declarative AOP configuration,
* with XML schema being the primary configuration format. * with XML schema being the primary configuration format.
*
*/ */
package org.springframework.aop.config; package org.springframework.aop.config;

View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -1,18 +1,12 @@
/** /**
*
* SPI package allowing Spring AOP framework to handle arbitrary advice types. * SPI package allowing Spring AOP framework to handle arbitrary advice types.
* <br>
* Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
* its capabilities, don't need to concern themselves with this package.
* <br>
* You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
* in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
* </br>
* <br>
* These adapters do not depend on any other Spring framework classes to allow such usage.
* </br>
* *
* <p>Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
* its capabilities, don't need to concern themselves with this package.
*
* <p>You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
* in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
*
* <p>These adapters do not depend on any other Spring framework classes to allow such usage.
*/ */
package org.springframework.aop.framework.adapter; package org.springframework.aop.framework.adapter;

View File

@ -1,6 +1,4 @@
/** /**
*
* Bean post-processors for use in ApplicationContexts to simplify AOP usage * Bean post-processors for use in ApplicationContexts to simplify AOP usage
* by automatically creating AOP proxies without the need to use a ProxyFactoryBean. * by automatically creating AOP proxies without the need to use a ProxyFactoryBean.
* *
@ -10,7 +8,5 @@
* <p><b>NB</b>: Automatic auto-proxying is not supported for BeanFactory implementations, * <p><b>NB</b>: Automatic auto-proxying is not supported for BeanFactory implementations,
* as post-processors beans are only automatically detected in application contexts. * as post-processors beans are only automatically detected in application contexts.
* Post-processors can be explicitly registered on a ConfigurableBeanFactory instead. * Post-processors can be explicitly registered on a ConfigurableBeanFactory instead.
*
*/ */
package org.springframework.aop.framework.autoproxy; package org.springframework.aop.framework.autoproxy;

View File

@ -1,6 +1,4 @@
/** /**
*
* Package containing Spring's basic AOP infrastructure, compliant with the * Package containing Spring's basic AOP infrastructure, compliant with the
* <a href="http://aopalliance.sourceforge.net">AOP Alliance</a> interfaces. * <a href="http://aopalliance.sourceforge.net">AOP Alliance</a> interfaces.
* *
@ -13,7 +11,5 @@
* <p>The ProxyFactoryBean is a convenient way to create AOP proxies in a BeanFactory * <p>The ProxyFactoryBean is a convenient way to create AOP proxies in a BeanFactory
* or ApplicationContext. However, proxies can be created programmatically using the * or ApplicationContext. However, proxies can be created programmatically using the
* ProxyFactory class. * ProxyFactory class.
*
*/ */
package org.springframework.aop.framework; package org.springframework.aop.framework;

View File

@ -1,10 +1,6 @@
/** /**
*
* Provides miscellaneous interceptor implementations. * Provides miscellaneous interceptor implementations.
* More specific interceptors can be found in corresponding * More specific interceptors can be found in corresponding
* functionality packages, like "transaction" and "orm". * functionality packages, like "transaction" and "orm".
*
*/ */
package org.springframework.aop.interceptor; package org.springframework.aop.interceptor;

View File

@ -1,25 +1,20 @@
/** /**
*
* Core Spring AOP interfaces, built on AOP Alliance AOP interoperability interfaces. * Core Spring AOP interfaces, built on AOP Alliance AOP interoperability interfaces.
* *
* <br>Any AOP Alliance MethodInterceptor is usable in Spring. * <p>Any AOP Alliance MethodInterceptor is usable in Spring.
* *
* <br>Spring AOP also offers: * <br>Spring AOP also offers:
* <ul> * <ul>
* <li>Introduction support * <li>Introduction support
* <li>A Pointcut abstraction, supporting "static" pointcuts * <li>A Pointcut abstraction, supporting "static" pointcuts
* (class and method-based) and "dynamic" pointcuts (also considering method arguments). * (class and method-based) and "dynamic" pointcuts (also considering method arguments).
* There are currently no AOP Alliance interfaces for pointcuts. * There are currently no AOP Alliance interfaces for pointcuts.
* <li>A full range of advice types, including around, before, after returning and throws advice. * <li>A full range of advice types, including around, before, after returning and throws advice.
* <li>Extensibility allowing arbitrary custom advice types to * <li>Extensibility allowing arbitrary custom advice types to
* be plugged in without modifying the core framework. * be plugged in without modifying the core framework.
* </ul> * </ul>
* *
* <br> * <p>Spring AOP can be used programmatically or (preferably)
* Spring AOP can be used programmatically or (preferably)
* integrated with the Spring IoC container. * integrated with the Spring IoC container.
*
*/ */
package org.springframework.aop; package org.springframework.aop;

View File

@ -1,8 +1,4 @@
/** /**
*
* Support for AOP-based scoping of target objects, with configurable backend. * Support for AOP-based scoping of target objects, with configurable backend.
*
*/ */
package org.springframework.aop.scope; package org.springframework.aop.scope;

View File

@ -18,9 +18,9 @@ package org.springframework.aop.support;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Arrays;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.PatternMatchUtils; import org.springframework.util.PatternMatchUtils;

View File

@ -1,8 +1,4 @@
/** /**
*
* Annotation support for AOP pointcuts. * Annotation support for AOP pointcuts.
*
*/ */
package org.springframework.aop.support.annotation; package org.springframework.aop.support.annotation;

View File

@ -1,8 +1,4 @@
/** /**
*
* Convenience classes for using Spring's AOP API. * Convenience classes for using Spring's AOP API.
*
*/ */
package org.springframework.aop.support; package org.springframework.aop.support;

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd"/>

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema xmlns="http://www.springframework.org/schema/aop" <xsd:schema xmlns="http://www.springframework.org/schema/aop"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/aop"
targetNamespace="http://www.springframework.org/schema/aop" elementFormDefault="qualified"
elementFormDefault="qualified" attributeFormDefault="unqualified">
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd"/>

View File

@ -15,13 +15,14 @@
*/ */
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.*; import java.lang.reflect.Method;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException; import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
import java.lang.reflect.Method; import static org.junit.Assert.*;
/** /**
* Unit tests for the {@link AspectJAdviceParameterNameDiscoverer} class. * Unit tests for the {@link AspectJAdviceParameterNameDiscoverer} class.

View File

@ -16,8 +16,6 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
@ -27,17 +25,19 @@ import org.aspectj.weaver.tools.PointcutPrimitive;
import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException; import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ClassFilter; import org.springframework.aop.ClassFilter;
import org.springframework.aop.MethodMatcher; import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.tests.sample.beans.IOther; import org.springframework.tests.sample.beans.IOther;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.subpkg.DeepBean; import org.springframework.tests.sample.beans.subpkg.DeepBean;
import static org.junit.Assert.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Rod Johnson * @author Rod Johnson

View File

@ -16,12 +16,12 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* Tests for matching of bean() pointcut designator. * Tests for matching of bean() pointcut designator.
* *

View File

@ -26,16 +26,17 @@ import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.aspectj.lang.reflect.SourceLocation; import org.aspectj.lang.reflect.SourceLocation;
import org.aspectj.runtime.reflect.Factory; import org.aspectj.runtime.reflect.Factory;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.aop.MethodBeforeAdvice; import org.springframework.aop.MethodBeforeAdvice;
import org.springframework.aop.framework.AopContext; import org.springframework.aop.framework.AopContext;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor; import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.AopUtils;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson

View File

@ -17,6 +17,7 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException; import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
/** /**

View File

@ -16,9 +16,6 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -26,11 +23,13 @@ import java.util.Map;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import test.annotation.EmptySpringAnnotation; import test.annotation.EmptySpringAnnotation;
import test.annotation.transaction.Tx; import test.annotation.transaction.Tx;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* Java5-specific {@link AspectJExpressionPointcutTests}. * Java5-specific {@link AspectJExpressionPointcutTests}.
* *

View File

@ -1,8 +1,5 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited; import java.lang.annotation.Inherited;
@ -12,6 +9,7 @@ import java.lang.annotation.Target;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.Advisor; import org.springframework.aop.Advisor;
import org.springframework.aop.MethodBeforeAdvice; import org.springframework.aop.MethodBeforeAdvice;
import org.springframework.aop.ThrowsAdvice; import org.springframework.aop.ThrowsAdvice;
@ -19,6 +17,8 @@ import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.core.OverridingClassLoader; import org.springframework.core.OverridingClassLoader;
import static org.junit.Assert.*;
/** /**
* @author Dave Syer * @author Dave Syer
*/ */

View File

@ -16,18 +16,18 @@
package org.springframework.aop.aspectj; package org.springframework.aop.aspectj;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.tests.sample.beans.CountingTestBean; import org.springframework.tests.sample.beans.CountingTestBean;
import org.springframework.tests.sample.beans.IOther; import org.springframework.tests.sample.beans.IOther;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.subpkg.DeepBean; import org.springframework.tests.sample.beans.subpkg.DeepBean;
import static org.junit.Assert.*;
/** /**
* Unit tests for the {@link TypePatternClassFilter} class. * Unit tests for the {@link TypePatternClassFilter} class.
* *

View File

@ -37,9 +37,12 @@ import org.aspectj.lang.annotation.DeclareParents;
import org.aspectj.lang.annotation.DeclarePrecedence; import org.aspectj.lang.annotation.DeclarePrecedence;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import test.aop.DefaultLockable;
import test.aop.Lockable;
import test.aop.PerTargetAspect;
import test.aop.TwoAdviceAspect;
import org.springframework.aop.Advisor; import org.springframework.aop.Advisor;
import org.springframework.aop.aspectj.annotation.ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor; import org.springframework.aop.aspectj.annotation.ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor;
@ -55,11 +58,6 @@ import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import test.aop.DefaultLockable;
import test.aop.Lockable;
import test.aop.PerTargetAspect;
import test.aop.TwoAdviceAspect;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;

View File

@ -16,8 +16,6 @@
package org.springframework.aop.aspectj.annotation; package org.springframework.aop.aspectj.annotation;
import static org.junit.Assert.*;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -27,11 +25,13 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Adrian Colyer * @author Adrian Colyer
* @author Juergen Hoeller * @author Juergen Hoeller

View File

@ -16,17 +16,17 @@
package org.springframework.aop.aspectj.annotation; package org.springframework.aop.aspectj.annotation;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import test.aop.PerTargetAspect;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.aop.aspectj.AspectJExpressionPointcut; import org.springframework.aop.aspectj.AspectJExpressionPointcut;
import org.springframework.aop.aspectj.AspectJExpressionPointcutTests; import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
import org.springframework.aop.framework.AopConfigException; import org.springframework.aop.framework.AopConfigException;
import test.aop.PerTargetAspect;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,14 +16,14 @@
package org.springframework.aop.aspectj.annotation; package org.springframework.aop.aspectj.annotation;
import static org.junit.Assert.*;
import org.aspectj.lang.reflect.PerClauseKind; import org.aspectj.lang.reflect.PerClauseKind;
import org.junit.Test; import org.junit.Test;
import test.aop.PerTargetAspect;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect; import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect;
import test.aop.PerTargetAspect; import static org.junit.Assert.*;
/** /**
* @since 2.0 * @since 2.0

View File

@ -16,16 +16,16 @@
package org.springframework.aop.aspectj.annotation; package org.springframework.aop.aspectj.annotation;
import static org.junit.Assert.assertEquals;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import test.aop.PerThisAspect;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import test.aop.PerThisAspect; import static org.junit.Assert.*;
/** /**
* @author Rob Harrop * @author Rob Harrop

View File

@ -16,10 +16,9 @@
package org.springframework.aop.aspectj.autoproxy; package org.springframework.aop.aspectj.autoproxy;
import static org.junit.Assert.assertEquals;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.config.AopConfigUtils; import org.springframework.aop.config.AopConfigUtils;
import org.springframework.aop.config.AopNamespaceUtils; import org.springframework.aop.config.AopNamespaceUtils;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
@ -32,6 +31,8 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.beans.factory.xml.XmlReaderContext; import org.springframework.beans.factory.xml.XmlReaderContext;
import org.springframework.tests.beans.CollectingReaderEventListener; import org.springframework.tests.beans.CollectingReaderEventListener;
import static org.junit.Assert.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Chris Beams * @author Chris Beams

View File

@ -16,16 +16,12 @@
package org.springframework.aop.config; package org.springframework.aop.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanReference; import org.springframework.beans.factory.config.BeanReference;
import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@ -36,6 +32,9 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.beans.CollectingReaderEventListener; import org.springframework.tests.beans.CollectingReaderEventListener;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller

View File

@ -16,16 +16,16 @@
package org.springframework.aop.config; package org.springframework.aop.config;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Mark Fisher * @author Mark Fisher
* @author Chris Beams * @author Chris Beams

View File

@ -16,14 +16,15 @@
package org.springframework.aop.config; package org.springframework.aop.config;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* Tests that the &lt;aop:config/&gt; element can be used as a top level element. * Tests that the &lt;aop:config/&gt; element can be used as a top level element.
* *

View File

@ -16,8 +16,6 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import static org.junit.Assert.*;
import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
@ -25,11 +23,13 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.SpringProxy;
import org.springframework.aop.SpringProxy;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -17,11 +17,11 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
import org.springframework.util.StopWatch;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.StopWatch;
/** /**
* Benchmarks for introductions. * Benchmarks for introductions.

View File

@ -16,8 +16,6 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -28,6 +26,8 @@ import org.junit.Test;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,15 +16,16 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import static org.junit.Assert.assertEquals;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.springframework.aop.AopInvocationException; import org.springframework.aop.AopInvocationException;
import static org.junit.Assert.*;
/** /**
* Test for SPR-4675. A null value returned from around advice is very hard to debug if * Test for SPR-4675. A null value returned from around advice is very hard to debug if
* the caller expects a primitive. * the caller expects a primitive.

View File

@ -16,16 +16,17 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import static org.junit.Assert.assertEquals;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams

View File

@ -16,13 +16,6 @@
package org.springframework.aop.framework; package org.springframework.aop.framework;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import javax.accessibility.Accessible; import javax.accessibility.Accessible;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.RootPaneContainer; import javax.swing.RootPaneContainer;
@ -31,6 +24,7 @@ import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.Advisor; import org.springframework.aop.Advisor;
import org.springframework.aop.interceptor.DebugInterceptor; import org.springframework.aop.interceptor.DebugInterceptor;
import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.AopUtils;
@ -44,6 +38,9 @@ import org.springframework.tests.sample.beans.IOther;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/** /**
* Also tests AdvisedSupport and ProxyCreatorSupport superclasses. * Also tests AdvisedSupport and ProxyCreatorSupport superclasses.
* *

View File

@ -20,11 +20,11 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import javax.transaction.TransactionRolledbackException; import javax.transaction.TransactionRolledbackException;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ThrowsAdvice; import org.springframework.aop.ThrowsAdvice;
import org.springframework.tests.aop.advice.MethodCounter; import org.springframework.tests.aop.advice.MethodCounter;

View File

@ -16,11 +16,10 @@
package org.springframework.aop.interceptor; package org.springframework.aop.interceptor;
import static org.junit.Assert.assertEquals;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.tests.sample.beans.DerivedTestBean; import org.springframework.tests.sample.beans.DerivedTestBean;
@ -28,6 +27,8 @@ import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
/** /**
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams

View File

@ -16,15 +16,15 @@
package org.springframework.aop.interceptor; package org.springframework.aop.interceptor;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.NamedBean; import org.springframework.beans.factory.NamedBean;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,18 +16,18 @@
package org.springframework.aop.interceptor; package org.springframework.aop.interceptor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* Non-XML tests are in AbstractAopProxyTests * Non-XML tests are in AbstractAopProxyTests
* *

View File

@ -17,6 +17,7 @@
package org.springframework.aop.scope; package org.springframework.aop.scope;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.*;

View File

@ -16,14 +16,15 @@
package org.springframework.aop.scope; package org.springframework.aop.scope;
import static org.junit.Assert.assertSame;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Mark Fisher * @author Mark Fisher
* @author Chris Beams * @author Chris Beams

View File

@ -20,6 +20,7 @@ import java.io.IOException;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;

View File

@ -16,13 +16,10 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ClassFilter; import org.springframework.aop.ClassFilter;
import org.springframework.aop.MethodMatcher; import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
@ -32,6 +29,8 @@ import org.springframework.tests.aop.interceptor.NopInterceptor;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,15 +16,15 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ClassFilter; import org.springframework.aop.ClassFilter;
import org.springframework.core.NestedRuntimeException; import org.springframework.core.NestedRuntimeException;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,18 +16,18 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ClassFilter; import org.springframework.aop.ClassFilter;
import org.springframework.aop.MethodMatcher; import org.springframework.aop.MethodMatcher;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.core.NestedRuntimeException; import org.springframework.core.NestedRuntimeException;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,16 +16,16 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.tests.aop.interceptor.NopInterceptor; import org.springframework.tests.aop.interceptor.NopInterceptor;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -20,6 +20,7 @@ import java.io.Serializable;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.IntroductionAdvisor; import org.springframework.aop.IntroductionAdvisor;
import org.springframework.aop.IntroductionInterceptor; import org.springframework.aop.IntroductionInterceptor;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;

View File

@ -16,19 +16,18 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.MethodMatcher; import org.springframework.aop.MethodMatcher;
import org.springframework.tests.sample.beans.IOther; import org.springframework.tests.sample.beans.IOther;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
/** /**
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams

View File

@ -16,12 +16,9 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.tests.aop.interceptor.NopInterceptor; import org.springframework.tests.aop.interceptor.NopInterceptor;
@ -30,6 +27,8 @@ import org.springframework.tests.sample.beans.Person;
import org.springframework.tests.sample.beans.SerializablePerson; import org.springframework.tests.sample.beans.SerializablePerson;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,16 +16,16 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.ClassFilter; import org.springframework.aop.ClassFilter;
import org.springframework.aop.Pointcut; import org.springframework.aop.Pointcut;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,10 +16,8 @@
package org.springframework.aop.support; package org.springframework.aop.support;
import static org.junit.Assert.assertEquals;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.Advised;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@ -31,6 +29,9 @@ import org.springframework.tests.sample.beans.Person;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,16 +16,17 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Chris Beams * @author Chris Beams

View File

@ -16,14 +16,10 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor;
@ -36,6 +32,9 @@ import org.springframework.tests.sample.beans.SerializablePerson;
import org.springframework.tests.sample.beans.SideEffectBean; import org.springframework.tests.sample.beans.SideEffectBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,12 +16,13 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.TargetSource; import org.springframework.aop.TargetSource;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import static org.junit.Assert.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller

View File

@ -16,19 +16,18 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import java.util.Set; import java.util.Set;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rob Harrop * @author Rob Harrop

View File

@ -16,10 +16,8 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.TargetSource; import org.springframework.aop.TargetSource;
import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@ -28,6 +26,8 @@ import org.springframework.tests.sample.beans.SerializablePerson;
import org.springframework.tests.sample.beans.TestBean; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils; import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
/** /**
* Unit tests relating to the abstract {@link AbstractPrototypeBasedTargetSource} * Unit tests relating to the abstract {@link AbstractPrototypeBasedTargetSource}
* and not subclasses. * and not subclasses.

View File

@ -16,11 +16,9 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertEquals;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@ -28,6 +26,9 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.SideEffectBean; import org.springframework.tests.sample.beans.SideEffectBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,19 +16,18 @@
package org.springframework.aop.target; package org.springframework.aop.target;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean; import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.SideEffectBean; import org.springframework.tests.sample.beans.SideEffectBean;
import static org.junit.Assert.*;
import static org.springframework.tests.TestResourceUtils.*;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Chris Beams * @author Chris Beams

View File

@ -16,12 +16,13 @@
package org.springframework.aop.target.dynamic; package org.springframework.aop.target.dynamic;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.tests.Assume; import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup; import org.springframework.tests.TestGroup;
import static org.junit.Assert.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Chris Beams * @author Chris Beams

View File

@ -16,8 +16,8 @@
package org.springframework.tests.aop.advice; package org.springframework.tests.aop.advice;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
import org.springframework.aop.support.DefaultIntroductionAdvisor; import org.springframework.aop.support.DefaultIntroductionAdvisor;
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor; import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
/** /**

View File

@ -1,11 +1,25 @@
/** /*
* Copyright 2002-2014 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 test.aop; package test.aop;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@Aspect("pertarget(execution(* *.getSpouse()))") @Aspect("pertarget(execution(* *.getSpouse()))")
@ -33,4 +47,5 @@ public class PerTargetAspect implements Ordered {
public void setOrder(int order) { public void setOrder(int order) {
this.order = order; this.order = order;
} }
} }

View File

@ -29,12 +29,12 @@ import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.wiring.BeanConfigurerSupport; import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
/** /**
* Concrete aspect that uses the {@link Configurable} * Concrete aspect that uses the {@link Configurable} annotation to identify
* annotation to identify which classes need autowiring. * which classes need autowiring.
* *
* <p>The bean name to look up will be taken from the * <p>The bean name to look up will be taken from the {@code &#64;Configurable}
* {@code &#64;Configurable} annotation if specified, otherwise the * annotation if specified, otherwise the default bean name to look up will be
* default bean name to look up will be the FQN of the class being configured. * the fully qualified name of the class being configured.
* *
* @author Rod Johnson * @author Rod Johnson
* @author Ramnivas Laddad * @author Ramnivas Laddad

View File

@ -20,6 +20,7 @@ import java.lang.reflect.Method;
import org.aspectj.lang.annotation.SuppressAjWarnings; import org.aspectj.lang.annotation.SuppressAjWarnings;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.DisposableBean;
import org.springframework.cache.interceptor.CacheAspectSupport; import org.springframework.cache.interceptor.CacheAspectSupport;
import org.springframework.cache.interceptor.CacheOperationInvoker; import org.springframework.cache.interceptor.CacheOperationInvoker;

View File

@ -17,7 +17,6 @@
package org.springframework.cache.aspectj; package org.springframework.cache.aspectj;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import javax.cache.annotation.CachePut; import javax.cache.annotation.CachePut;
import javax.cache.annotation.CacheRemove; import javax.cache.annotation.CacheRemove;
import javax.cache.annotation.CacheRemoveAll; import javax.cache.annotation.CacheRemoveAll;

View File

@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessException;
import org.springframework.orm.jpa.EntityManagerFactoryUtils; import org.springframework.orm.jpa.EntityManagerFactoryUtils;
public aspect JpaExceptionTranslatorAspect { public aspect JpaExceptionTranslatorAspect {
pointcut entityManagerCall(): pointcut entityManagerCall():
call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) ||
call(* EntityTransaction.*(..)) || call(* Query.*(..)); call(* EntityTransaction.*(..)) || call(* Query.*(..));
@ -41,4 +42,5 @@ public aspect JpaExceptionTranslatorAspect {
throw re; throw re;
} }
} }
}
}

View File

@ -17,7 +17,6 @@
package org.springframework.scheduling.aspectj; package org.springframework.scheduling.aspectj;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;

View File

@ -18,6 +18,7 @@ package org.springframework.transaction.aspectj;
import org.aspectj.lang.annotation.SuppressAjWarnings; import org.aspectj.lang.annotation.SuppressAjWarnings;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.transaction.interceptor.TransactionAttributeSource; import org.springframework.transaction.interceptor.TransactionAttributeSource;

View File

@ -32,9 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
* *
* <p>An @Transactional annotation on a method within the class overrides the * <p>An @Transactional annotation on a method within the class overrides the
* default transaction semantics given by the class annotation (if present). * default transaction semantics given by the class annotation (if present).
* Any method may be annotated (regardless of visibility). * Any method may be annotated (regardless of visibility). Annotating
* Annotating non-public methods directly is the only way * non-public methods directly is the only way to get transaction demarcation
* to get transaction demarcation for the execution of such operations. * for the execution of such operations.
* *
* @author Rod Johnson * @author Rod Johnson
* @author Ramnivas Laddad * @author Ramnivas Laddad

View File

@ -16,10 +16,10 @@
package org.springframework.aop.aspectj.autoproxy; package org.springframework.aop.aspectj.autoproxy;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/** /**
* @author Adrian Colyer * @author Adrian Colyer
*/ */

View File

@ -16,10 +16,10 @@
package org.springframework.beans.factory.aspectj; package org.springframework.beans.factory.aspectj;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringConfiguredWithAutoProxyingTests extends TestCase { public class SpringConfiguredWithAutoProxyingTests extends TestCase {
@Override @Override

View File

@ -16,18 +16,17 @@
package org.springframework.cache.aspectj; package org.springframework.cache.aspectj;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import org.springframework.cache.config.AbstractAnnotationTests; import org.springframework.cache.config.AbstractAnnotationTests;
import org.springframework.cache.config.CacheableService; import org.springframework.cache.config.CacheableService;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext;
import static org.junit.Assert.*;
/** /**
* @author Costin Leau * @author Costin Leau
*/ */

View File

@ -19,7 +19,6 @@ package org.springframework.cache.config;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import javax.cache.annotation.CacheDefaults; import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKey; import javax.cache.annotation.CacheKey;
import javax.cache.annotation.CachePut; import javax.cache.annotation.CachePut;

View File

@ -16,10 +16,10 @@
package org.springframework.cache.config; package org.springframework.cache.config;
import org.springframework.cache.interceptor.KeyGenerator;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.springframework.cache.interceptor.KeyGenerator;
/** /**
* A custom {@link KeyGenerator} that exposes the algorithm used to compute the key * A custom {@link KeyGenerator} that exposes the algorithm used to compute the key
* for convenience in tests scenario. * for convenience in tests scenario.

View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -36,7 +36,7 @@ import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup; import org.springframework.tests.TestGroup;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.junit.Assert.*; import static org.junit.Assert.*;

View File

@ -16,14 +16,14 @@
package org.springframework.transaction.aspectj; package org.springframework.transaction.aspectj;
import java.lang.reflect.Method;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests; import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
import org.springframework.tests.transaction.CallCountingTransactionManager; import org.springframework.tests.transaction.CallCountingTransactionManager;
import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource; import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.transaction.interceptor.TransactionAttribute; import org.springframework.transaction.interceptor.TransactionAttribute;
import java.lang.reflect.Method;
/** /**
* @author Rod Johnson * @author Rod Johnson
* @author Ramnivas Laddad * @author Ramnivas Laddad

View File

@ -1,8 +1,4 @@
/** /**
*
* Support package for Groovy-based bean definitions. * Support package for Groovy-based bean definitions.
*
*/ */
package org.springframework.beans.factory.groovy; package org.springframework.beans.factory.groovy;

View File

@ -1,8 +1,4 @@
/** /**
*
* Support package for beans-style handling of Java 5 annotations. * Support package for beans-style handling of Java 5 annotations.
*
*/ */
package org.springframework.beans.annotation; package org.springframework.beans.annotation;

View File

@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException; import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanDefinitionStoreException;

View File

@ -1,8 +1,4 @@
/** /**
*
* Support classes for accessing a Spring BeanFactory from Unified EL. * Support classes for accessing a Spring BeanFactory from Unified EL.
*
*/ */
package org.springframework.beans.factory.access.el; package org.springframework.beans.factory.access.el;

View File

@ -1,12 +1,8 @@
/** /**
*
* Helper infrastructure to locate and access bean factories. * Helper infrastructure to locate and access bean factories.
* *
* <p><b>Note: This package is only relevant for special sharing of bean * <p><b>Note: This package is only relevant for special sharing of bean
* factories, for example behind EJB facades. It is <i>not</i> used in a * factories, for example behind EJB facades. It is <i>not</i> used in a
* typical web application or standalone application.</b> * typical web application or standalone application.</b>
*
*/ */
package org.springframework.beans.factory.access; package org.springframework.beans.factory.access;

View File

@ -1,8 +1,4 @@
/** /**
*
* Support package for annotation-driven bean configuration. * Support package for annotation-driven bean configuration.
*
*/ */
package org.springframework.beans.factory.annotation; package org.springframework.beans.factory.annotation;

View File

@ -1,8 +1,4 @@
/** /**
*
* SPI interfaces and configuration-related convenience classes for bean factories. * SPI interfaces and configuration-related convenience classes for bean factories.
*
*/ */
package org.springframework.beans.factory.config; package org.springframework.beans.factory.config;

View File

@ -1,16 +1,12 @@
/** /**
*
* The core package implementing Spring's lightweight Inversion of Control (IoC) container. * The core package implementing Spring's lightweight Inversion of Control (IoC) container.
* <p> *
* Provides an alternative to the Singleton and Prototype design * <p>Provides an alternative to the Singleton and Prototype design
* patterns, including a consistent approach to configuration management. * patterns, including a consistent approach to configuration management.
* Builds on the org.springframework.beans package. * Builds on the org.springframework.beans package.
* *
* <p>This package and related packages are discussed in Chapter 11 of * <p>This package and related packages are discussed in Chapter 11 of
* <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a> * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
* by Rod Johnson (Wrox, 2002). * by Rod Johnson (Wrox, 2002).
*
*/ */
package org.springframework.beans.factory; package org.springframework.beans.factory;

View File

@ -1,8 +1,4 @@
/** /**
*
* Support infrastructure for bean definition parsing. * Support infrastructure for bean definition parsing.
*
*/ */
package org.springframework.beans.factory.parsing; package org.springframework.beans.factory.parsing;

View File

@ -1,8 +1,4 @@
/** /**
* * Support package for the Java 6 ServiceLoader facility.
* Support package for the JDK 1.6 ServiceLoader facility.
*
*/ */
package org.springframework.beans.factory.serviceloader; package org.springframework.beans.factory.serviceloader;

View File

@ -21,10 +21,11 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.core.env.EnvironmentCapable; import org.springframework.core.env.EnvironmentCapable;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

View File

@ -1,9 +1,5 @@
/** /**
*
* Classes supporting the {@code org.springframework.beans.factory} package. * Classes supporting the {@code org.springframework.beans.factory} package.
* Contains abstract base classes for {@code BeanFactory} implementations. * Contains abstract base classes for {@code BeanFactory} implementations.
*
*
*/ */
package org.springframework.beans.factory.support; package org.springframework.beans.factory.support;

Some files were not shown because too many files have changed in this diff Show More