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

@@ -2,7 +2,8 @@
* Support package for declarative JSR-107 caching configuration. Used
* by the regular Spring's caching configuration when it detects the
* JSR-107 API and Spring's JCache implementation.
*
* <p>Provide an extension of the {@code CachingConfigurer} that exposes
* the exception cache resolver to use, see {@code JCacheConfigurer}.
*/
package org.springframework.cache.jcache.config;
package org.springframework.cache.jcache.config;

View File

@@ -19,7 +19,6 @@ package org.springframework.cache.jcache.interceptor;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;

View File

@@ -17,7 +17,6 @@
package org.springframework.cache.jcache.interceptor;
import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheKeyInvocationContext;
import org.springframework.cache.interceptor.CacheErrorHandler;

View File

@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKeyGenerator;
import javax.cache.annotation.CacheMethodDetails;

View File

@@ -18,7 +18,6 @@ package org.springframework.cache.jcache.interceptor;
import java.lang.reflect.Method;
import java.util.List;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CachePut;

View File

@@ -3,7 +3,6 @@ package org.springframework.cache.jcache.interceptor;
import java.util.Collection;
import java.util.Collections;
import javax.cache.annotation.CacheInvocationContext;
import org.springframework.cache.Cache;

View File

@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Set;
import javax.cache.annotation.CacheInvocationContext;
import javax.cache.annotation.CacheInvocationParameter;

View File

@@ -17,7 +17,6 @@
package org.springframework.cache.jcache.interceptor;
import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheKeyInvocationContext;

View File

@@ -16,16 +16,15 @@
package org.springframework.cache.jcache.interceptor;
import static java.util.Arrays.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.cache.annotation.CacheMethodDetails;
import static java.util.Arrays.*;
/**
* The default {@link CacheMethodDetails} implementation.
*

View File

@@ -17,7 +17,6 @@
package org.springframework.cache.jcache.interceptor;
import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;

View File

@@ -4,7 +4,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheKeyGenerator;
import javax.cache.annotation.CacheKeyInvocationContext;

View File

@@ -1,8 +1,10 @@
/**
* AOP-based solution for declarative caching demarcation using JSR-107 annotations.
*
* <p>Strongly based on the infrastructure in org.springframework.cache.interceptor
* that deals with Spring's caching annotations.
*
* <p>Builds on the AOP infrastructure in org.springframework.aop.framework.
* Any POJO can be cache-advised with Spring.
*/
package org.springframework.cache.jcache.interceptor;
package org.springframework.cache.jcache.interceptor;

View File

@@ -19,9 +19,9 @@ package org.springframework.mail;
import java.io.Serializable;
import java.util.Date;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.util.Assert;
/**
* Models a simple mail message, including data such as the from, to, cc, subject, and text fields.

View File

@@ -1,10 +1,6 @@
/**
*
* JavaMail support for Spring's mail infrastructure.
* Provides an extended JavaMailSender interface and a MimeMessageHelper
* class for convenient population of a JavaMail MimeMessage.
*
*/
package org.springframework.mail.javamail;

View File

@@ -1,9 +1,5 @@
/**
*
* Spring's generic mail infrastructure.
* Concrete implementations are provided in the subpackages.
*
*/
package org.springframework.mail;

View File

@@ -1,9 +1,5 @@
/**
*
* Convenience classes for scheduling based on the CommonJ WorkManager/TimerManager
* facility, as supported by IBM WebSphere 6.0+ and BEA WebLogic 9.0+.
*
*/
package org.springframework.scheduling.commonj;

View File

@@ -24,6 +24,7 @@ import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.quartz.spi.ClassLoadHelper;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;

View File

@@ -17,6 +17,7 @@
package org.springframework.scheduling.quartz;
import org.quartz.SchedulerContext;
import org.springframework.beans.factory.Aware;
/**

View File

@@ -1,12 +1,8 @@
/**
*
* Support classes for the open source scheduler
* <a href="http://quartz-scheduler.org">Quartz</a>,
* allowing to set up Quartz Schedulers, JobDetails and
* Triggers as beans in a Spring context. Also provides
* convenience classes for implementing Quartz Jobs.
*
*/
package org.springframework.scheduling.quartz;

View File

@@ -1,10 +1,6 @@
/**
*
* Support classes for setting up
* <a href="http://www.freemarker.org">FreeMarker</a>
* within a Spring application context.
*
*/
package org.springframework.ui.freemarker;

View File

@@ -1,9 +1,5 @@
/**
*
* Support classes for
* <a href="http://jasperreports.sourceforge.net">JasperReports</a>.
*
*/
package org.springframework.ui.jasperreports;

View File

@@ -1,10 +1,6 @@
/**
*
* Support classes for setting up
* <a href="http://velocity.apache.org">Velocity</a>
* within a Spring application context.
*
*/
package org.springframework.ui.velocity;

View File

@@ -16,10 +16,10 @@
package org.springframework.cache;
import static org.junit.Assert.*;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -21,6 +21,7 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import org.junit.After;
import org.junit.Before;
import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManagerTests;
/**

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.ehcache;
import static org.junit.Assert.*;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
@@ -26,10 +24,13 @@ import net.sf.ehcache.config.Configuration;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.cache.AbstractCacheTests;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.*;
/**
* @author Costin Leau
* @author Stephane Nicoll

View File

@@ -24,7 +24,7 @@ import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.*;
/**
* @author Juergen Hoeller

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.guava;
import static org.junit.Assert.*;
import com.google.common.cache.CacheBuilder;
import org.junit.Before;
import org.junit.Test;
@@ -25,6 +23,8 @@ import org.junit.Test;
import org.springframework.cache.AbstractCacheTests;
import org.springframework.cache.Cache;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,16 +16,17 @@
package org.springframework.cache.jcache;
import static org.mockito.BDDMockito.*;
import javax.cache.Cache;
import javax.cache.CacheManager;
import java.util.ArrayList;
import java.util.List;
import javax.cache.Cache;
import javax.cache.CacheManager;
import org.junit.Before;
import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManagerTests;
import static org.mockito.BDDMockito.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.jcache.config;
import static org.junit.Assert.*;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,6 +29,8 @@ import org.springframework.cache.CacheManager;
import org.springframework.cache.interceptor.SimpleKeyGenerator;
import org.springframework.context.ApplicationContext;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.jcache.config;
import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
@@ -40,6 +38,8 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.junit.Assert.*;
/**
*
* @author Stephane Nicoll

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.jcache.config;
import static org.junit.Assert.*;
import java.util.Arrays;
import org.junit.Test;
@@ -46,6 +44,8 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.jcache.config;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.cache.interceptor.CacheErrorHandler;
@@ -27,6 +25,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,11 +16,8 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;
@@ -31,6 +28,8 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

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

View File

@@ -16,12 +16,8 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import java.lang.reflect.Method;
import java.util.Comparator;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKeyGenerator;
import javax.cache.annotation.CacheRemove;
@@ -41,6 +37,9 @@ import org.springframework.context.support.StaticApplicationContext;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,16 +16,15 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import java.io.IOException;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CachePut;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,14 +16,14 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CacheRemoveAll;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,14 +16,14 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CacheRemove;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,13 +16,9 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collection;
import javax.cache.annotation.CacheInvocationContext;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CacheResolver;
@@ -37,6 +33,9 @@ import org.springframework.cache.jcache.AbstractJCacheTests;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,12 +16,9 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.Set;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheKey;
import javax.cache.annotation.CacheMethodDetails;
@@ -31,6 +28,8 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Value;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -18,7 +18,6 @@ package org.springframework.cache.jcache.interceptor;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CachePut;
import javax.cache.annotation.CacheRemove;
@@ -30,6 +29,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;

View File

@@ -16,8 +16,6 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import java.lang.reflect.Method;
import org.junit.Test;
@@ -31,6 +29,8 @@ import org.springframework.cache.jcache.AbstractJCacheTests;
import org.springframework.context.support.StaticApplicationContext;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,12 +16,9 @@
package org.springframework.cache.jcache.interceptor;
import static org.junit.Assert.*;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKey;
import javax.cache.annotation.CacheResult;
@@ -41,6 +38,8 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static org.junit.Assert.*;
/**
*
* @author Stephane Nicoll

View File

@@ -1,7 +1,6 @@
package org.springframework.cache.jcache.support;
import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheKeyGenerator;
import javax.cache.annotation.CacheKeyInvocationContext;
import javax.cache.annotation.GeneratedCacheKey;

View File

@@ -16,14 +16,13 @@
package org.springframework.cache.jcache.support;
import static org.mockito.BDDMockito.*;
import java.lang.annotation.Annotation;
import javax.cache.Cache;
import javax.cache.annotation.CacheInvocationContext;
import javax.cache.annotation.CacheResolver;
import static org.mockito.BDDMockito.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -17,7 +17,6 @@
package org.springframework.cache.jcache.support;
import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheMethodDetails;
import javax.cache.annotation.CacheResolver;
import javax.cache.annotation.CacheResolverFactory;

View File

@@ -16,15 +16,16 @@
package org.springframework.cache.transaction;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* Shared tests for {@link CacheManager} that inherit from
* {@link AbstractTransactionSupportingCacheManager}.

View File

@@ -16,11 +16,10 @@
package org.springframework.cache.transaction;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.cache.Cache;
import org.springframework.cache.concurrent.ConcurrentMapCache;
import org.springframework.tests.transaction.CallCountingTransactionManager;
@@ -29,6 +28,8 @@ import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
import static org.junit.Assert.*;
/**
* @author Stephane Nicoll
*/

View File

@@ -16,14 +16,14 @@
package org.springframework.mail;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* @author Dmitriy Kopylenko
* @author Juergen Hoeller

View File

@@ -16,15 +16,14 @@
package org.springframework.scheduling.quartz;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.util.StopWatch;
import static org.junit.Assert.*;
/**
* @author Mark Fisher
* @since 3.0

View File

@@ -18,11 +18,9 @@ package org.springframework.scheduling.quartz;
import java.util.HashMap;
import java.util.Map;
import javax.sql.DataSource;
import org.junit.Test;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;