Skip to content

Commit deba2ed

Browse files
committed
Add blank line between java and javax imports
See gh-23539
1 parent 2f106fb commit deba2ed

File tree

903 files changed

+904
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

903 files changed

+904
-1
lines changed

integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.lang.reflect.Method;
2121
import java.util.List;
22+
2223
import javax.servlet.ServletException;
2324

2425
import org.junit.jupiter.api.Test;

integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.RetentionPolicy;
2222
import java.lang.annotation.Target;
23+
2324
import javax.inject.Named;
2425
import javax.inject.Singleton;
2526

integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Arrays;
2121
import java.util.Collections;
2222
import java.util.List;
23+
2324
import javax.sql.DataSource;
2425

2526
import org.junit.jupiter.api.Test;

spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
21+
2122
import javax.accessibility.Accessible;
2223
import javax.swing.JFrame;
2324
import javax.swing.RootPaneContainer;

spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedJCacheableService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.util.concurrent.ConcurrentHashMap;
2121
import java.util.concurrent.atomic.AtomicLong;
22+
2223
import javax.cache.annotation.CacheDefaults;
2324
import javax.cache.annotation.CacheKey;
2425
import javax.cache.annotation.CachePut;

spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.transaction.aspectj;
1818

1919
import java.io.IOException;
20+
2021
import javax.transaction.Transactional;
2122

2223
import org.junit.jupiter.api.BeforeEach;

spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.beans.factory.config;
1818

1919
import java.io.Serializable;
20+
2021
import javax.inject.Provider;
2122

2223
import org.springframework.beans.BeansException;

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.util.function.Consumer;
4444
import java.util.function.Predicate;
4545
import java.util.stream.Stream;
46+
4647
import javax.inject.Provider;
4748

4849
import org.springframework.beans.BeanUtils;

spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.InputStream;
2121
import java.util.HashSet;
2222
import java.util.Set;
23+
2324
import javax.xml.parsers.ParserConfigurationException;
2425

2526
import org.w3c.dom.Document;

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.Set;
3939
import java.util.concurrent.Callable;
4040
import java.util.stream.Collectors;
41+
4142
import javax.annotation.Priority;
4243
import javax.security.auth.Subject;
4344

spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323
import java.util.Map;
2424
import java.util.Optional;
25+
2526
import javax.inject.Inject;
2627
import javax.inject.Named;
2728
import javax.inject.Provider;

spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.beans.factory.config;
1818

1919
import java.util.Date;
20+
2021
import javax.inject.Provider;
2122

2223
import org.junit.jupiter.api.AfterEach;

spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.List;
2020
import java.util.ServiceLoader;
21+
2122
import javax.xml.parsers.DocumentBuilderFactory;
2223

2324
import org.junit.jupiter.api.Test;

spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.PropertyPermission;
3030
import java.util.Set;
3131
import java.util.function.Consumer;
32+
3233
import javax.security.auth.AuthPermission;
3334
import javax.security.auth.Subject;
3435

spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.LinkedHashSet;
2424
import java.util.List;
2525
import java.util.Set;
26+
2627
import javax.annotation.processing.Completion;
2728
import javax.annotation.processing.ProcessingEnvironment;
2829
import javax.annotation.processing.Processor;

spring-context-indexer/src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.HashSet;
2020
import java.util.LinkedHashSet;
2121
import java.util.Set;
22+
2223
import javax.lang.model.element.AnnotationMirror;
2324
import javax.lang.model.element.Element;
2425
import javax.lang.model.element.ElementKind;

spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.HashSet;
2121
import java.util.List;
2222
import java.util.Set;
23+
2324
import javax.annotation.processing.ProcessingEnvironment;
2425
import javax.annotation.processing.RoundEnvironment;
2526
import javax.lang.model.element.Element;

spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.io.InputStream;
2121
import java.io.OutputStream;
22+
2223
import javax.annotation.processing.ProcessingEnvironment;
2324
import javax.tools.FileObject;
2425
import javax.tools.StandardLocation;

spring-context-indexer/src/main/java/org/springframework/context/index/processor/PackageInfoStereotypesProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.HashSet;
2020
import java.util.Set;
21+
2122
import javax.lang.model.element.Element;
2223
import javax.lang.model.element.ElementKind;
2324

spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.LinkedHashSet;
2020
import java.util.Set;
21+
2122
import javax.lang.model.element.AnnotationMirror;
2223
import javax.lang.model.element.Element;
2324
import javax.lang.model.element.ElementKind;

spring-context-indexer/src/main/java/org/springframework/context/index/processor/StereotypesProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.context.index.processor;
1818

1919
import java.util.Set;
20+
2021
import javax.lang.model.element.Element;
2122

2223
/**

spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.Collections;
2121
import java.util.List;
22+
2223
import javax.annotation.processing.ProcessingEnvironment;
2324
import javax.lang.model.element.AnnotationMirror;
2425
import javax.lang.model.element.Element;

spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.FileInputStream;
2121
import java.io.IOException;
2222
import java.nio.file.Path;
23+
2324
import javax.annotation.ManagedBean;
2425
import javax.inject.Named;
2526
import javax.persistence.Converter;

spring-context-indexer/src/test/java/org/springframework/context/index/test/TestCompiler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collections;
2424
import java.util.List;
2525
import java.util.stream.Collectors;
26+
2627
import javax.annotation.processing.Processor;
2728
import javax.tools.JavaCompiler;
2829
import javax.tools.JavaFileObject;

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cache.jcache;
1818

1919
import java.util.concurrent.Callable;
20+
2021
import javax.cache.Cache;
2122
import javax.cache.processor.EntryProcessor;
2223
import javax.cache.processor.EntryProcessorException;

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Collection;
2020
import java.util.LinkedHashSet;
21+
2122
import javax.cache.CacheManager;
2223
import javax.cache.Caching;
2324

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.net.URI;
2020
import java.util.Properties;
21+
2122
import javax.cache.CacheManager;
2223
import javax.cache.Caching;
2324

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheKeyOperation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.lang.annotation.Annotation;
2020
import java.util.ArrayList;
2121
import java.util.List;
22+
2223
import javax.cache.annotation.CacheInvocationParameter;
2324
import javax.cache.annotation.CacheMethodDetails;
2425

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.LinkedHashSet;
2525
import java.util.List;
2626
import java.util.Set;
27+
2728
import javax.cache.annotation.CacheInvocationParameter;
2829
import javax.cache.annotation.CacheKey;
2930
import javax.cache.annotation.CacheMethodDetails;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractKeyCacheInterceptor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cache.jcache.interceptor;
1818

1919
import java.lang.annotation.Annotation;
20+
2021
import javax.cache.annotation.CacheKeyInvocationContext;
2122

2223
import org.springframework.cache.interceptor.CacheErrorHandler;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AnnotationJCacheOperationSource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.lang.reflect.Method;
2121
import java.util.ArrayList;
2222
import java.util.List;
23+
2324
import javax.cache.annotation.CacheDefaults;
2425
import javax.cache.annotation.CacheKeyGenerator;
2526
import javax.cache.annotation.CacheMethodDetails;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CachePutOperation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.lang.reflect.Method;
2020
import java.util.List;
21+
2122
import javax.cache.annotation.CacheInvocationParameter;
2223
import javax.cache.annotation.CacheMethodDetails;
2324
import javax.cache.annotation.CachePut;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Collection;
2020
import java.util.Collections;
21+
2122
import javax.cache.annotation.CacheInvocationContext;
2223

2324
import org.springframework.cache.Cache;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheInvocationContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.lang.reflect.Method;
2121
import java.util.Arrays;
2222
import java.util.Set;
23+
2324
import javax.cache.annotation.CacheInvocationContext;
2425
import javax.cache.annotation.CacheInvocationParameter;
2526

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cache.jcache.interceptor;
1818

1919
import java.lang.annotation.Annotation;
20+
2021
import javax.cache.annotation.CacheInvocationParameter;
2122
import javax.cache.annotation.CacheKeyInvocationContext;
2223

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheMethodDetails.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Collections;
2323
import java.util.LinkedHashSet;
2424
import java.util.Set;
25+
2526
import javax.cache.annotation.CacheMethodDetails;
2627

2728
/**

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cache.jcache.interceptor;
1818

1919
import java.lang.annotation.Annotation;
20+
2021
import javax.cache.annotation.CacheInvocationParameter;
2122
import javax.cache.annotation.CacheMethodDetails;
2223

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.lang.reflect.Method;
2121
import java.util.ArrayList;
2222
import java.util.List;
23+
2324
import javax.cache.annotation.CacheInvocationParameter;
2425
import javax.cache.annotation.CacheKeyGenerator;
2526
import javax.cache.annotation.CacheKeyInvocationContext;

spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121
import java.io.InputStream;
22+
2223
import javax.activation.FileTypeMap;
2324
import javax.activation.MimetypesFileTypeMap;
2425

spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.mail.javamail;
1818

1919
import java.beans.PropertyEditorSupport;
20+
2021
import javax.mail.internet.AddressException;
2122
import javax.mail.internet.InternetAddress;
2223

spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.mail.javamail;
1818

1919
import java.io.InputStream;
20+
2021
import javax.mail.internet.MimeMessage;
2122

2223
import org.springframework.mail.MailException;

spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.List;
2424
import java.util.Map;
2525
import java.util.Properties;
26+
2627
import javax.activation.FileTypeMap;
2728
import javax.mail.Address;
2829
import javax.mail.AuthenticationFailedException;

spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.mail.javamail;
1818

1919
import java.util.Date;
20+
2021
import javax.mail.MessagingException;
2122
import javax.mail.internet.MimeMessage;
2223

spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.OutputStream;
2323
import java.io.UnsupportedEncodingException;
2424
import java.util.Date;
25+
2526
import javax.activation.DataHandler;
2627
import javax.activation.DataSource;
2728
import javax.activation.FileDataSource;

spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.LinkedList;
2020
import java.util.List;
21+
2122
import javax.naming.NamingException;
2223

2324
import commonj.timers.Timer;

spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.concurrent.Callable;
2121
import java.util.concurrent.Future;
2222
import java.util.concurrent.FutureTask;
23+
2324
import javax.naming.NamingException;
2425

2526
import commonj.work.Work;

spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.sql.Connection;
2020
import java.sql.SQLException;
21+
2122
import javax.sql.DataSource;
2223

2324
import org.quartz.SchedulerConfigException;

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Properties;
2222
import java.util.concurrent.Executor;
2323
import java.util.concurrent.TimeUnit;
24+
2425
import javax.sql.DataSource;
2526

2627
import org.quartz.Scheduler;

spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
21+
2122
import javax.cache.Cache;
2223
import javax.cache.CacheManager;
2324

spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AbstractCacheOperationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.lang.annotation.Annotation;
2020
import java.lang.reflect.Method;
21+
2122
import javax.cache.annotation.CacheInvocationParameter;
2223
import javax.cache.annotation.CacheMethodDetails;
2324

0 commit comments

Comments
 (0)