Skip to content

Commit c0b929c

Browse files
jxblumjxblum
committed
Optimize imports.
1 parent 08c7290 commit c0b929c

File tree

102 files changed

+329
-323
lines changed

Some content is hidden

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

102 files changed

+329
-323
lines changed

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import javax.annotation.PostConstruct;
2828
import javax.annotation.Resource;
2929

30-
import org.apache.geode.cache.Region;
31-
3230
import org.junit.Test;
3331
import org.junit.runner.RunWith;
3432

33+
import org.apache.geode.cache.Region;
34+
3535
import org.springframework.beans.factory.annotation.Autowired;
3636
import org.springframework.cache.annotation.Cacheable;
3737
import org.springframework.test.context.ActiveProfiles;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
import static org.mockito.Mockito.verify;
3131
import static org.mockito.Mockito.when;
3232

33-
import org.apache.geode.cache.CacheLoader;
34-
import org.apache.geode.cache.LoaderHelper;
35-
import org.apache.geode.cache.Region;
36-
3733
import org.junit.Rule;
3834
import org.junit.Test;
3935
import org.junit.rules.ExpectedException;
@@ -43,6 +39,10 @@
4339
import org.mockito.junit.MockitoJUnitRunner;
4440
import org.mockito.stubbing.Answer;
4541

42+
import org.apache.geode.cache.CacheLoader;
43+
import org.apache.geode.cache.LoaderHelper;
44+
import org.apache.geode.cache.Region;
45+
4646
/**
4747
* Unit tests to test the adaption of the {@link java.util.concurrent.Callable}
4848
* into GemFire's {@link org.apache.geode.cache.CacheLoader} interface.

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,12 @@
2626

2727
import javax.annotation.Resource;
2828

29-
import lombok.Data;
30-
import lombok.NonNull;
31-
import lombok.RequiredArgsConstructor;
32-
33-
import org.apache.geode.cache.GemFireCache;
34-
3529
import org.junit.Before;
3630
import org.junit.Test;
3731
import org.junit.runner.RunWith;
3832

33+
import org.apache.geode.cache.GemFireCache;
34+
3935
import org.springframework.beans.factory.annotation.Autowired;
4036
import org.springframework.cache.annotation.CacheEvict;
4137
import org.springframework.cache.annotation.CachePut;
@@ -57,6 +53,10 @@
5753
import org.springframework.test.context.ContextConfiguration;
5854
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
5955

56+
import lombok.Data;
57+
import lombok.NonNull;
58+
import lombok.RequiredArgsConstructor;
59+
6060
/**
6161
* Integration tests testing the contractual behavior and combination of using Spring'a {@link CachePut} annotation
6262
* followed by a {@link CacheEvict} annotation on an application {@link @Service} component.

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import edu.umd.cs.mtc.MultithreadedTestCase;
2828
import edu.umd.cs.mtc.TestFramework;
2929

30-
import org.apache.geode.cache.CacheFactory;
31-
import org.apache.geode.cache.Region;
32-
3330
import org.junit.Rule;
3431
import org.junit.Test;
3532
import org.junit.rules.ExpectedException;
3633

34+
import org.apache.geode.cache.CacheFactory;
35+
import org.apache.geode.cache.Region;
36+
3737
import org.springframework.cache.Cache;
3838
import org.springframework.data.gemfire.GemfireUtils;
3939
import org.springframework.data.gemfire.test.support.AbstractNativeCacheTests;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
import java.util.HashSet;
3535
import java.util.Set;
3636

37-
import org.apache.geode.cache.GemFireCache;
38-
import org.apache.geode.cache.Region;
39-
4037
import org.junit.Before;
4138
import org.junit.Rule;
4239
import org.junit.Test;
@@ -45,6 +42,9 @@
4542
import org.mockito.Mock;
4643
import org.mockito.junit.MockitoJUnitRunner;
4744

45+
import org.apache.geode.cache.GemFireCache;
46+
import org.apache.geode.cache.Region;
47+
4848
import org.springframework.cache.Cache;
4949

5050
/**

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333

3434
import java.util.concurrent.Callable;
3535

36-
import org.apache.geode.cache.Region;
37-
3836
import org.junit.Rule;
3937
import org.junit.Test;
4038
import org.junit.rules.ExpectedException;
4139
import org.junit.runner.RunWith;
4240
import org.mockito.Mock;
4341
import org.mockito.junit.MockitoJUnitRunner;
4442

43+
import org.apache.geode.cache.Region;
44+
4545
import org.springframework.cache.Cache;
4646

4747
/**

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import javax.annotation.Resource;
2121

22-
import org.apache.geode.cache.GemFireCache;
23-
import org.apache.geode.cache.Region;
24-
2522
import org.junit.Test;
2623
import org.junit.runner.RunWith;
2724

25+
import org.apache.geode.cache.GemFireCache;
26+
import org.apache.geode.cache.Region;
27+
2828
import org.springframework.beans.factory.annotation.Autowired;
2929
import org.springframework.cache.annotation.Cacheable;
3030
import org.springframework.context.annotation.Bean;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
import java.util.List;
2727
import java.util.concurrent.TimeUnit;
2828

29+
import org.junit.AfterClass;
30+
import org.junit.BeforeClass;
31+
import org.junit.Test;
32+
import org.junit.runner.RunWith;
33+
2934
import org.apache.geode.cache.GemFireCache;
3035
import org.apache.geode.cache.client.ClientCache;
3136
import org.apache.geode.cache.query.Index;
3237
import org.apache.geode.cache.query.IndexType;
3338
import org.apache.geode.cache.query.QueryService;
3439

35-
import org.junit.AfterClass;
36-
import org.junit.BeforeClass;
37-
import org.junit.Test;
38-
import org.junit.runner.RunWith;
39-
4040
import org.springframework.beans.factory.annotation.Autowired;
4141
import org.springframework.data.gemfire.fork.ServerProcess;
4242
import org.springframework.data.gemfire.process.ProcessExecutor;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20+
import org.junit.Test;
21+
2022
import org.apache.geode.cache.GemFireCache;
2123
import org.apache.geode.cache.Region;
2224
import org.apache.geode.cache.client.ClientCache;
2325
import org.apache.geode.cache.client.ClientRegionShortcut;
2426

25-
import org.junit.Test;
26-
2727
import org.springframework.context.ConfigurableApplicationContext;
2828
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2929
import org.springframework.context.annotation.Bean;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323

2424
import javax.annotation.Resource;
2525

26-
import org.apache.geode.cache.CacheLoader;
27-
import org.apache.geode.cache.CacheLoaderException;
28-
import org.apache.geode.cache.LoaderHelper;
29-
import org.apache.geode.cache.Region;
30-
3126
import org.junit.AfterClass;
3227
import org.junit.BeforeClass;
3328
import org.junit.Test;
3429
import org.junit.runner.RunWith;
3530

31+
import org.apache.geode.cache.CacheLoader;
32+
import org.apache.geode.cache.CacheLoaderException;
33+
import org.apache.geode.cache.LoaderHelper;
34+
import org.apache.geode.cache.Region;
35+
3636
import org.springframework.data.gemfire.process.ProcessWrapper;
3737
import org.springframework.data.gemfire.test.support.AbstractGemFireClientServerIntegrationTest;
3838
import org.springframework.test.context.ContextConfiguration;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929

3030
import javax.annotation.Resource;
3131

32-
import org.apache.geode.cache.CacheLoader;
33-
import org.apache.geode.cache.CacheLoaderException;
34-
import org.apache.geode.cache.LoaderHelper;
35-
import org.apache.geode.cache.Region;
36-
3732
import org.junit.AfterClass;
3833
import org.junit.BeforeClass;
3934
import org.junit.Test;
4035
import org.junit.runner.RunWith;
4136

37+
import org.apache.geode.cache.CacheLoader;
38+
import org.apache.geode.cache.CacheLoaderException;
39+
import org.apache.geode.cache.LoaderHelper;
40+
import org.apache.geode.cache.Region;
41+
4242
import org.springframework.data.gemfire.fork.ServerProcess;
4343
import org.springframework.data.gemfire.process.ProcessExecutor;
4444
import org.springframework.data.gemfire.process.ProcessWrapper;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929

3030
import javax.annotation.Resource;
3131

32-
import org.apache.geode.cache.CacheLoader;
33-
import org.apache.geode.cache.CacheLoaderException;
34-
import org.apache.geode.cache.LoaderHelper;
35-
import org.apache.geode.cache.Region;
36-
3732
import org.junit.AfterClass;
3833
import org.junit.BeforeClass;
3934
import org.junit.Test;
4035
import org.junit.runner.RunWith;
4136

37+
import org.apache.geode.cache.CacheLoader;
38+
import org.apache.geode.cache.CacheLoaderException;
39+
import org.apache.geode.cache.LoaderHelper;
40+
import org.apache.geode.cache.Region;
41+
4242
import org.springframework.data.gemfire.fork.ServerProcess;
4343
import org.springframework.data.gemfire.process.ProcessExecutor;
4444
import org.springframework.data.gemfire.process.ProcessWrapper;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636

3737
import java.io.InputStream;
3838

39+
import org.junit.After;
40+
import org.junit.Before;
41+
import org.junit.Test;
42+
3943
import org.apache.geode.cache.DataPolicy;
4044
import org.apache.geode.cache.EvictionAttributes;
4145
import org.apache.geode.cache.ExpirationAttributes;
@@ -48,10 +52,6 @@
4852
import org.apache.geode.cache.client.Pool;
4953
import org.apache.geode.compression.Compressor;
5054

51-
import org.junit.After;
52-
import org.junit.Before;
53-
import org.junit.Test;
54-
5555
import org.springframework.beans.factory.BeanCreationException;
5656
import org.springframework.beans.factory.BeanFactory;
5757
import org.springframework.data.gemfire.TestUtils;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
import javax.annotation.Resource;
2222

23+
import org.junit.Test;
24+
import org.junit.runner.RunWith;
25+
2326
import org.apache.geode.cache.GemFireCache;
2427
import org.apache.geode.cache.Region;
2528
import org.apache.geode.cache.client.ClientRegionShortcut;
2629

27-
import org.junit.Test;
28-
import org.junit.runner.RunWith;
29-
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
3232
import org.springframework.data.gemfire.test.mock.annotation.EnableGemFireMockObjects;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import static org.junit.Assert.assertEquals;
2121

22-
import org.apache.geode.cache.client.ClientRegionShortcut;
23-
2422
import org.junit.Test;
2523

24+
import org.apache.geode.cache.client.ClientRegionShortcut;
25+
2626
/**
2727
* The ClientRegionShortcutConverterTest class is a test suite of test cases testing the contract and functionality
2828
* of the ClientRegionShortcutConverter class

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020

21+
import org.junit.Test;
22+
2123
import org.apache.geode.cache.DataPolicy;
2224
import org.apache.geode.cache.client.ClientRegionShortcut;
2325

24-
import org.junit.Test;
25-
2626
/**
2727
* Unit tests for {@link ClientRegionShortcutToDataPolicyConverter}.
2828
*

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import static org.junit.Assert.assertNotNull;
2323
import static org.junit.Assert.assertTrue;
2424

25-
import org.apache.geode.cache.client.ClientRegionShortcut;
26-
2725
import org.junit.Test;
2826

27+
import org.apache.geode.cache.client.ClientRegionShortcut;
28+
2929
/**
3030
* The ClientRegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the
3131
* ClientRegionShortcutWrapper enum class type.

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525

2626
import javax.annotation.Resource;
2727

28+
import org.junit.Test;
29+
import org.junit.runner.RunWith;
30+
2831
import org.apache.geode.cache.CacheLoader;
2932
import org.apache.geode.cache.CacheLoaderException;
3033
import org.apache.geode.cache.CacheWriterException;
@@ -33,9 +36,6 @@
3336
import org.apache.geode.cache.Region;
3437
import org.apache.geode.cache.util.CacheWriterAdapter;
3538

36-
import org.junit.Test;
37-
import org.junit.runner.RunWith;
38-
3939
import org.springframework.beans.factory.annotation.Autowired;
4040
import org.springframework.context.ApplicationContext;
4141
import org.springframework.test.context.ContextConfiguration;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
import javax.annotation.Resource;
2222

23-
import org.apache.geode.cache.Region;
24-
import org.apache.geode.cache.client.ClientCache;
25-
2623
import org.junit.AfterClass;
2724
import org.junit.BeforeClass;
2825
import org.junit.Test;
2926
import org.junit.runner.RunWith;
3027

28+
import org.apache.geode.cache.Region;
29+
import org.apache.geode.cache.client.ClientCache;
30+
3131
import org.springframework.beans.factory.annotation.Autowired;
3232
import org.springframework.data.gemfire.GemfireTemplate;
3333
import org.springframework.data.gemfire.fork.ServerProcess;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030

3131
import javax.annotation.Resource;
3232

33+
import org.junit.After;
34+
import org.junit.AfterClass;
35+
import org.junit.Before;
36+
import org.junit.BeforeClass;
37+
import org.junit.FixMethodOrder;
38+
import org.junit.Test;
39+
import org.junit.runner.RunWith;
40+
import org.junit.runners.MethodSorters;
41+
3342
import org.apache.geode.cache.CacheClosedException;
3443
import org.apache.geode.cache.DataPolicy;
3544
import org.apache.geode.cache.EntryEvent;
@@ -40,15 +49,6 @@
4049
import org.apache.geode.cache.client.Pool;
4150
import org.apache.geode.cache.util.CacheListenerAdapter;
4251

43-
import org.junit.After;
44-
import org.junit.AfterClass;
45-
import org.junit.Before;
46-
import org.junit.BeforeClass;
47-
import org.junit.FixMethodOrder;
48-
import org.junit.Test;
49-
import org.junit.runner.RunWith;
50-
import org.junit.runners.MethodSorters;
51-
5252
import org.springframework.beans.BeansException;
5353
import org.springframework.beans.factory.annotation.Autowired;
5454
import org.springframework.beans.factory.config.BeanPostProcessor;

0 commit comments

Comments
 (0)