Skip to content

Commit dc34bca

Browse files
author
Udo Kohlmeyer
committed
DATAGEODE-236: moved classes around as they were located in incorrect locations
1 parent 3b00f58 commit dc34bca

16 files changed

+194
-128
lines changed

‎src/main/java/org/springframework/data/gemfire/config/annotation/AsCacheListener.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AsCacheListener.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/config/annotation/AsRegionEventListener.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AsRegionEventListener.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/config/support/CacheListenerPostProcessor.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/config/support/CacheListenerPostProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private <T extends CacheEvent> void registerEventHandlerToRegion(Method method,
156156
* configured {@link Region} names
157157
*/
158158
private String[] getRegionsForEventRegistration(String[] regions, ConfigurableListableBeanFactory beanFactory) {
159-
if (ArrayUtils.isEmpty(regions)) {
159+
if (isEmpty(regions)) {
160160
List<String> regionNames = new ArrayList<>();
161161
stream(beanFactory.getBeanDefinitionNames()).forEach(beanName -> {
162162
Object bean = beanFactory.getBean(beanName);

‎src/main/java/org/springframework/data/gemfire/eventing/EventProcessorUtils.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/EventProcessorUtils.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/AsCacheListenerBeanPostProcessorRegistrar.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/AsCacheListenerBeanPostProcessorRegistrar.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/CacheListenerEventType.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/CacheListenerEventType.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/EnableEventProcessing.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/EnableEventProcessing.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/PojoCacheListenerWrapper.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/PojoCacheListenerWrapper.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/PojoRegionEventCacheListenerWrapper.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/PojoRegionEventCacheListenerWrapper.java

File renamed without changes.

‎src/main/java/org/springframework/data/gemfire/eventing/config/RegionCacheListenerEventType.java renamed to ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/eventing/config/RegionCacheListenerEventType.java

File renamed without changes.

‎src/test/java/org/springframework/data/gemfire/config/annotation/AsCacheListenerCacheServerConfigurationTests.java renamed to ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AsCacheListenerCacheServerConfigurationTests.java

+60-33
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
2626
import org.springframework.data.gemfire.eventing.config.CacheListenerEventType;
2727
import org.springframework.data.gemfire.eventing.config.EnableEventProcessing;
28-
import org.springframework.data.gemfire.eventing.config.RegionCacheListenerEventType;
2928

3029
/**
3130
* Tests for {@link org.springframework.data.gemfire.config.annotation.AsCacheListener} configured for a
@@ -42,135 +41,163 @@
4241
*/
4342
public class AsCacheListenerCacheServerConfigurationTests extends AsCacheListenerConfigurationTests {
4443

45-
protected static ReplicatedRegionFactoryBean<String, String> createRegionFactoryBean(GemFireCache cache, String regionName) {
44+
protected static ReplicatedRegionFactoryBean<String, String> createRegionFactoryBean(GemFireCache cache,
45+
String regionName) {
4646
ReplicatedRegionFactoryBean<String, String> replicateRegion = new ReplicatedRegionFactoryBean<>();
4747
replicateRegion.setName(regionName);
4848
replicateRegion.setCache(cache);
4949
return replicateRegion;
5050
}
5151

52-
@Override protected Class<?> getCacheListenerWithIncorrectRegionEventParameterConfiguration() {
52+
@Override
53+
protected Class<?> getCacheListenerWithIncorrectRegionEventParameterConfiguration() {
5354
return TestConfigurationWithIncorrectRegionEventParameter.class;
5455
}
5556

56-
@Override protected Class<TestConfigurationWithSimpleCacheListener> getCacheListenerAnnotationSingleDefaultRegionsConfiguration() {
57+
@Override
58+
protected Class<?> getCacheListenerAnnotationSingleDefaultRegionsConfiguration() {
5759
return TestConfigurationWithSimpleCacheListener.class;
5860
}
5961

60-
@Override protected Class<TestConfigurationWithInvalidRegion> getCacheListenerAnnotationWithInvalidRegion() {
62+
@Override
63+
protected Class<TestConfigurationWithInvalidRegion> getCacheListenerAnnotationWithInvalidRegion() {
6164
return TestConfigurationWithInvalidRegion.class;
6265
}
6366

64-
@Override protected Class<TestConfigurationWith2RegionsAnd2CacheListenersDefaulted> getCacheListenerAnnotationMultipleRegionsDefault() {
67+
@Override
68+
protected Class<TestConfigurationWith2RegionsAnd2CacheListenersDefaulted> getCacheListenerAnnotationMultipleRegionsDefault() {
6569
return TestConfigurationWith2RegionsAnd2CacheListenersDefaulted.class;
6670
}
6771

68-
@Override protected Class<TestConfigurationWithSimpleCacheListenerAllEvents> getCacheListenerAnnotationSingleRegionAllEvents() {
72+
@Override
73+
protected Class<?> getCacheListenerAnnotationSingleRegionAllEvents() {
6974
return TestConfigurationWithSimpleCacheListenerAllEvents.class;
7075
}
7176

72-
@Override protected Class<TestConfigurationWithSimpleCacheListenerWith2Regions> getCacheListenerAnnotationAgainst2NamedRegions() {
77+
@Override
78+
protected Class<?> getCacheListenerAnnotationAgainst2NamedRegions() {
7379
return TestConfigurationWithSimpleCacheListenerWith2Regions.class;
7480
}
7581

76-
@Configuration @CacheServerApplication @EnableEventProcessing
82+
@Configuration
83+
@CacheServerApplication
84+
@EnableEventProcessing
7785
public static class TestConfigurationWithIncorrectRegionEventParameter {
7886

79-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion(GemFireCache cache) {
87+
@Bean("TestRegion1")
88+
ReplicatedRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
8089
return createRegionFactoryBean(cache, "TestRegion1");
8190
}
8291

8392
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE)
84-
public void afterCreateListener(RegionEvent event) {
93+
public void afterCreateListener(RegionEvent<String,String> event) {
8594
}
8695
}
8796

88-
@Configuration @CacheServerApplication @EnableEventProcessing
97+
@Configuration
98+
@CacheServerApplication
99+
@EnableEventProcessing
89100
public static class TestConfigurationWithSimpleCacheListener {
90101

91-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion(GemFireCache cache) {
102+
@Bean("TestRegion1")
103+
ReplicatedRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
92104
return createRegionFactoryBean(cache, "TestRegion1");
93105
}
94106

95107
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE)
96-
public void afterCreateListener(EntryEvent event) {
108+
public void afterCreateListener(EntryEvent<String,String> event) {
97109
recordEvent(event);
98110
}
99111

100112
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_UPDATE)
101-
public void afterUpdateListener(EntryEvent event) {
113+
public void afterUpdateListener(EntryEvent<String,String> event) {
102114
recordEvent(event);
103115

104116
}
105117
}
106118

107-
@Configuration @CacheServerApplication @EnableEventProcessing
119+
@Configuration
120+
@CacheServerApplication
121+
@EnableEventProcessing
108122
public static class TestConfigurationWithInvalidRegion {
109123

110-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion(GemFireCache cache) {
124+
@Bean("TestRegion1")
125+
ReplicatedRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
111126
return createRegionFactoryBean(cache, "TestRegion1");
112127
}
113128

114129
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion2")
115-
public void afterCreateListener(EntryEvent event) {
130+
public void afterCreateListener(EntryEvent<String,String> event) {
116131
recordEvent(event);
117132
}
118133

119134
}
120135

121-
@Configuration @CacheServerApplication @EnableEventProcessing
136+
@Configuration
137+
@CacheServerApplication
138+
@EnableEventProcessing
122139
public static class TestConfigurationWithSimpleCacheListenerAllEvents {
123140

124-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion(GemFireCache cache) {
141+
@Bean("TestRegion1")
142+
ReplicatedRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
125143
return createRegionFactoryBean(cache, "TestRegion1");
126144
}
127145

128-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener(EntryEvent event) {
146+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
147+
public void afterCreateListener(EntryEvent<String,String> event) {
129148
recordEvent(event);
130149
}
131150
}
132151

133-
@Configuration @CacheServerApplication @EnableEventProcessing
152+
@Configuration
153+
@CacheServerApplication
154+
@EnableEventProcessing
134155
public static class TestConfigurationWithSimpleCacheListenerWith2Regions {
135156

136-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion1(GemFireCache cache) {
157+
@Bean("TestRegion1")
158+
ReplicatedRegionFactoryBean<String,String> getTestRegion1(GemFireCache cache) {
137159
return createRegionFactoryBean(cache, "TestRegion1");
138160
}
139161

140-
@Bean("TestRegion2") ReplicatedRegionFactoryBean getTestRegion2(GemFireCache cache) {
162+
@Bean("TestRegion2")
163+
ReplicatedRegionFactoryBean<String,String> getTestRegion2(GemFireCache cache) {
141164
return createRegionFactoryBean(cache, "TestRegion2");
142165
}
143166

144167
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion1")
145-
public void afterCreateListener(EntryEvent event) {
168+
public void afterCreateListener(EntryEvent<String,String> event) {
146169
recordEvent(event);
147170
}
148171

149172
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion2")
150-
public void afterUpdateListener(EntryEvent event) {
173+
public void afterUpdateListener(EntryEvent<String,String> event) {
151174
recordEvent(event);
152-
153175
}
154176
}
155177

156-
@Configuration @CacheServerApplication @EnableEventProcessing
178+
@Configuration
179+
@CacheServerApplication
180+
@EnableEventProcessing
157181
public static class TestConfigurationWith2RegionsAnd2CacheListenersDefaulted {
158182

159-
@Bean("TestRegion1") ReplicatedRegionFactoryBean getTestRegion1(GemFireCache cache) {
183+
@Bean("TestRegion1")
184+
ReplicatedRegionFactoryBean<String,String> getTestRegion1(GemFireCache cache) {
160185
return createRegionFactoryBean(cache, "TestRegion1");
161186
}
162187

163-
@Bean("TestRegion2") ReplicatedRegionFactoryBean getTestRegion2(GemFireCache cache) {
188+
@Bean("TestRegion2")
189+
ReplicatedRegionFactoryBean<String,String> getTestRegion2(GemFireCache cache) {
164190
return createRegionFactoryBean(cache, "TestRegion2");
165191
}
166192

167-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener1(EntryEvent event) {
193+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
194+
public void afterCreateListener1(EntryEvent<String,String> event) {
168195
recordEvent(event);
169196
}
170197

171-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener2(EntryEvent event) {
198+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
199+
public void afterCreateListener2(EntryEvent<String,String> event) {
172200
recordEvent(event);
173-
174201
}
175202
}
176203
}

‎src/test/java/org/springframework/data/gemfire/config/annotation/AsCacheListenerClientCacheConfigurationTests.java renamed to ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AsCacheListenerClientCacheConfigurationTests.java

+23-26
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
import org.junit.Test;
2424
import org.springframework.context.annotation.Bean;
2525
import org.springframework.context.annotation.Configuration;
26-
import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
2726
import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
2827
import org.springframework.data.gemfire.eventing.config.CacheListenerEventType;
2928
import org.springframework.data.gemfire.eventing.config.EnableEventProcessing;
30-
import org.springframework.data.gemfire.eventing.config.RegionCacheListenerEventType;
3129

3230
/**
3331
* Tests for {@link AsCacheListener} configured for a {@link org.apache.geode.cache.client.ClientCache}
@@ -56,7 +54,7 @@ protected static ClientRegionFactoryBean<String, String> createRegionFactoryBean
5654
return TestConfigurationWithIncorrectEventParamter.class;
5755
}
5856

59-
protected Class<AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListener> getCacheListenerAnnotationSingleDefaultRegionsConfiguration() {
57+
protected Class<?> getCacheListenerAnnotationSingleDefaultRegionsConfiguration() {
6058
return AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListener.class;
6159
}
6260

@@ -68,112 +66,111 @@ protected Class<AsCacheListenerCacheServerConfigurationTests.TestConfigurationWi
6866
return AsCacheListenerCacheServerConfigurationTests.TestConfigurationWith2RegionsAnd2CacheListenersDefaulted.class;
6967
}
7068

71-
protected Class<AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListenerAllEvents> getCacheListenerAnnotationSingleRegionAllEvents() {
69+
protected Class<?> getCacheListenerAnnotationSingleRegionAllEvents() {
7270
return AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListenerAllEvents.class;
7371
}
7472

75-
protected Class<AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListenerWith2Regions> getCacheListenerAnnotationAgainst2NamedRegions() {
73+
protected Class<?> getCacheListenerAnnotationAgainst2NamedRegions() {
7674
return AsCacheListenerCacheServerConfigurationTests.TestConfigurationWithSimpleCacheListenerWith2Regions.class;
7775
}
7876

7977
@Configuration @ClientCacheApplication @EnableEventProcessing
8078
static class TestConfigurationWithIncorrectEventParamter {
8179

82-
@Bean("TestRegion") ClientRegionFactoryBean getTestRegion(GemFireCache cache) {
80+
@Bean("TestRegion") ClientRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
8381
return createRegionFactoryBean(cache, "TestRegion");
8482
}
8583

8684
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE)
87-
public void afterCreateListener(RegionEvent event) {
85+
public void afterCreateListener(RegionEvent<String,String> event) {
8886
}
8987
}
9088

9189
@Configuration @ClientCacheApplication @EnableEventProcessing
9290
static class TestConfigurationWithSimpleCacheListener {
9391

94-
@Bean("TestRegion") ClientRegionFactoryBean getTestRegion(GemFireCache cache) {
92+
@Bean("TestRegion") ClientRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
9593
return createRegionFactoryBean(cache, "TestRegion");
9694
}
9795

9896
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE)
99-
public void afterCreateListener(EntryEvent event) {
97+
public void afterCreateListener(EntryEvent<String,String> event) {
10098
recordEvent(event);
10199
}
102100

103101
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_UPDATE)
104-
public void afterUpdateListener(EntryEvent event) {
102+
public void afterUpdateListener(EntryEvent<String,String> event) {
105103
recordEvent(event);
106-
107104
}
108105
}
109106

110107
@Configuration @ClientCacheApplication @EnableEventProcessing
111108
static class TestConfigurationWithInvalidRegion {
112109

113-
@Bean("TestRegion") ClientRegionFactoryBean getTestRegion(GemFireCache cache) {
110+
@Bean("TestRegion") ClientRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
114111
return createRegionFactoryBean(cache, "TestRegion");
115112
}
116113

117114
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion2")
118-
public void afterCreateListener(EntryEvent event) {
115+
public void afterCreateListener(EntryEvent<String,String> event) {
119116
recordEvent(event);
120117
}
121-
122118
}
123119

124120
@Configuration @ClientCacheApplication @EnableEventProcessing
125121
static class TestConfigurationWithSimpleCacheListenerAllEvents {
126122

127-
@Bean("TestRegion") ClientRegionFactoryBean getTestRegion(GemFireCache cache) {
123+
@Bean("TestRegion") ClientRegionFactoryBean<String,String> getTestRegion(GemFireCache cache) {
128124
return createRegionFactoryBean(cache, "TestRegion");
129125
}
130126

131-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener(EntryEvent event) {
127+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
128+
public void afterCreateListener(EntryEvent<String,String> event) {
132129
recordEvent(event);
133130
}
134131
}
135132

136133
@Configuration @ClientCacheApplication @EnableEventProcessing
137134
static class TestConfigurationWithSimpleCacheListenerWith2Regions {
138135

139-
@Bean("TestRegion1") ClientRegionFactoryBean getTestRegion1(GemFireCache cache) {
136+
@Bean("TestRegion1") ClientRegionFactoryBean<String,String> getTestRegion1(GemFireCache cache) {
140137
return createRegionFactoryBean(cache, "TestRegion1");
141138
}
142139

143-
@Bean("TestRegion2") ClientRegionFactoryBean getTestRegion2(GemFireCache cache) {
140+
@Bean("TestRegion2") ClientRegionFactoryBean<String,String> getTestRegion2(GemFireCache cache) {
144141
return createRegionFactoryBean(cache, "TestRegion2");
145142
}
146143

147144
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion1")
148-
public void afterCreateListener(EntryEvent event) {
145+
public void afterCreateListener(EntryEvent<String,String> event) {
149146
recordEvent(event);
150147
}
151148

152149
@AsCacheListener(eventTypes = CacheListenerEventType.AFTER_CREATE, regions = "TestRegion2")
153-
public void afterUpdateListener(EntryEvent event) {
150+
public void afterUpdateListener(EntryEvent<String,String> event) {
154151
recordEvent(event);
155-
156152
}
157153
}
158154

159155
@Configuration @ClientCacheApplication @EnableEventProcessing
160156
static class TestConfigurationWith2RegionsAnd2CacheListenersDefaulted {
161157

162-
@Bean("TestRegion1") ClientRegionFactoryBean getTestRegion1(GemFireCache cache) {
158+
@Bean("TestRegion1") ClientRegionFactoryBean<String,String> getTestRegion1(GemFireCache cache) {
163159
return createRegionFactoryBean(cache, "TestRegion1");
164160
}
165161

166-
@Bean("TestRegion2") ClientRegionFactoryBean getTestRegion2(GemFireCache cache) {
162+
@Bean("TestRegion2") ClientRegionFactoryBean<String,String> getTestRegion2(GemFireCache cache) {
167163
return createRegionFactoryBean(cache, "TestRegion2");
168164
}
169165

170-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener1(EntryEvent event) {
166+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
167+
public void afterCreateListener1(EntryEvent<String,String> event) {
171168
recordEvent(event);
172169
}
173170

174-
@AsCacheListener(eventTypes = CacheListenerEventType.ALL) public void afterCreateListener2(EntryEvent event) {
171+
@AsCacheListener(eventTypes = CacheListenerEventType.ALL)
172+
public void afterCreateListener2(EntryEvent<String,String> event) {
175173
recordEvent(event);
176-
177174
}
178175
}
179176
}

0 commit comments

Comments
 (0)