DATAGEODE-136 - Adding AsCacheWriter Tests

Author: Udo Kohlmeyer

spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AsCacheWriter.java

@@ -23,6 +23,7 @@
 import java.lang.annotation.Target;
 
 import org.springframework.data.gemfire.eventing.config.CacheWriterEventType;
+import org.springframework.data.gemfire.eventing.config.RegionCacheWriterEventType;
 
 /**
  * Used to declare a concrete method as a CacheWriter event handler

spring-data-geode/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/AsRegionEventHandler.java

@@ -23,20 +23,20 @@
 import java.lang.annotation.Target;
 
 import org.springframework.data.gemfire.eventing.config.CacheListenerEventType;
-import org.springframework.data.gemfire.eventing.config.RegionCacheListenerEventType;
 import org.springframework.data.gemfire.eventing.config.CacheWriterEventType;
+import org.springframework.data.gemfire.eventing.config.RegionCacheListenerEventType;
 import org.springframework.data.gemfire.eventing.config.RegionCacheWriterEventType;
 
 /**
- * Used to declare a concrete method as a RegionEventListener event handler,
+ * Used to declare a concrete method as a {@link AsRegionEventHandler} event handler,
  * which handles {@link org.apache.geode.cache.Region}
  *
  * @author Udo Kohlmeyer
  * @since 2.3.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD })
-public @interface AsRegionEventListener {
+public @interface AsRegionEventHandler {
 
 	/**
 	 * An array of {@link RegionCacheListenerEventType} that control what region events need to be observed

spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEventProcessing.java

@@ -27,8 +27,8 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.data.gemfire.eventing.config.AsCacheListenerBeanPostProcessorRegistrar;
 import org.springframework.data.gemfire.eventing.config.AsCacheWriterBeanPostProcessorRegistrar;
+import org.springframework.data.gemfire.eventing.config.ComposableCacheWriterWrapper;
 import org.springframework.data.gemfire.eventing.config.PojoCacheListenerWrapper;
-import org.springframework.data.gemfire.eventing.config.PojoCacheWriterWrapper;
 
 /**
  * Enables GemFire annotated EventHandler implementations. These implementation will include {@link org.apache.geode.cache.CacheListener},
@@ -37,9 +37,10 @@
  * This annotation results in the container discovering any beans that are annotated with:
  * <ul><
  * <li>	{code}@AsCacheListener{code},wraps them in a {@link PojoCacheListenerWrapper}</li>
- * <li>	{code}@AsCacheWriter{code},wraps them in a {@link PojoCacheWriterWrapper}</li>
+ * <li>	{code}@AsCacheWriter{code},wraps them in a {@link ComposableCacheWriterWrapper}</li>
  * <li></li>and register them with the corresponding {@link org.apache.geode.cache.Region}.
- *</ul>
+ * </ul>
+ *
  * @author Udo Kohlmeyer
  * @since 2.3.0
  */

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

@@ -17,65 +17,50 @@
 
 package org.springframework.data.gemfire.config.support;
 
-import static java.util.Arrays.*;
-import static org.springframework.data.gemfire.util.ArrayUtils.*;
-import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.*;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.apache.geode.cache.CacheEvent;
 import org.apache.geode.cache.CacheListener;
 import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionEvent;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.data.gemfire.config.annotation.AsCacheListener;
-import org.springframework.data.gemfire.config.annotation.AsRegionEventListener;
+import org.springframework.data.gemfire.config.annotation.AsRegionEventHandler;
 import org.springframework.data.gemfire.eventing.EventProcessorUtils;
 import org.springframework.data.gemfire.eventing.config.CacheListenerEventType;
 import org.springframework.data.gemfire.eventing.config.PojoCacheListenerWrapper;
 import org.springframework.data.gemfire.eventing.config.PojoRegionEventCacheListenerWrapper;
 import org.springframework.data.gemfire.eventing.config.RegionCacheListenerEventType;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 
 /**
  * A {@link BeanPostProcessor} to create and register {@link CacheListener}, annotated with {@link AsCacheListener}
- * and {@link AsRegionEventListener} onto the configured {@link Region}s
+ * and {@link AsRegionEventHandler} onto the configured {@link Region}s
  */
 @Configuration
-public class CacheListenerPostProcessor extends CallbackPostProcessor
-	implements BeanPostProcessor, BeanFactoryAware {
-
-	private ConfigurableListableBeanFactory beanFactory;
+public class CacheListenerPostProcessor extends CallbackPostProcessor {
 
 	@Override
-	protected Class getRegionCallbackClass() {
-		return AsRegionEventListener.class;
+	protected Class getRegionEventHandlerClass() {
+		return AsRegionEventHandler.class;
 	}
 
 	@Override
-	protected Class getCallbackClass() {
+	protected Class getEventHandlerClass() {
 		return AsCacheListener.class;
 	}
 
 	@Override
 	protected <T extends Annotation> void registerEventHandlers(Object bean, Class<T> listenerAnnotationClazz,
 		Method method, AnnotationAttributes cacheListenerAttributes) {
-		if (listenerAnnotationClazz.isAssignableFrom(getCallbackClass())) {
+		if (listenerAnnotationClazz.isAssignableFrom(getEventHandlerClass())) {
 			registerCacheListenerEventHandler(bean, method, cacheListenerAttributes);
 		}
-		else if (listenerAnnotationClazz.isAssignableFrom(getRegionCallbackClass())) {
+		else if (listenerAnnotationClazz.isAssignableFrom(getRegionEventHandlerClass())) {
 			registerRegionEventHandler(bean, method, cacheListenerAttributes);
 		}
 	}
@@ -93,7 +78,7 @@ private void registerCacheListenerEventHandler(Object bean, Method method,
 	}
 
 	/**
-	 * Lookup {@link RegionCacheListenerEventType} from the {@link AsRegionEventListener} annotation and
+	 * Lookup {@link RegionCacheListenerEventType} from the {@link AsRegionEventHandler} annotation and
 	 * create a {@link PojoRegionEventCacheListenerWrapper}
 	 * of type {@link CacheListener} that would register itself onto a {@link Region} for the configured
 	 * {@link Region} specific events
@@ -118,70 +103,11 @@ private void registerRegionEventHandler(Object bean, Method method,
 	 */
 	private <T extends CacheEvent> void registerEventHandlerToRegion(Method method,
 		AnnotationAttributes cacheListenerAttributes, CacheListener cacheListener, Class<T> eventClass) {
-		String[] regions = getRegionsForEventRegistration(cacheListenerAttributes.getStringArray("regions"),
+		List<String> regions = getRegionsForEventRegistration(cacheListenerAttributes.getStringArray("regions"),
 			getBeanFactory());
 
 		EventProcessorUtils.validateEventHandlerMethodParameters(method, eventClass);
 		EventProcessorUtils.registerCacheListenerToRegions(regions, beanFactory, cacheListener);
 	}
 
-	/**
-	 * Takes an array of Region names. If empty, returns all configured {@link Region} names, otherwise returns the input
-	 * region name array
-	 *
-	 * @param regions - An Array of {@link Region} names. This can be empty and thus defaults to all configured {@link Region}
-	 * @param beanFactory - A {@link org.springframework.data.gemfire.ConfigurableRegionFactoryBean}
-	 * @return An array of {@link Region} names. If the input regions array is empty, the result will be an array with all
-	 * configured {@link Region} names
-	 */
-	private String[] getRegionsForEventRegistration(String[] regions, ConfigurableListableBeanFactory beanFactory) {
-		if (isEmpty(regions)) {
-			List<String> regionNames = new ArrayList<>();
-			stream(beanFactory.getBeanDefinitionNames()).forEach(beanName -> {
-				Object bean = beanFactory.getBean(beanName);
-				if (bean instanceof Region) {
-					Region region = (Region) bean;
-					regionNames.add(region.getName());
-				}
-			});
-			String[] tempRegions = new String[regionNames.size()];
-			regionNames.toArray(tempRegions);
-			return tempRegions;
-		}
-		else {
-			return regions;
-		}
-	}
-
-	/**
-	 * Returns a reference to the containing Spring {@link BeanFactory}.
-	 *
-	 * @return a reference to the containing Spring {@link BeanFactory}.
-	 * @throws IllegalStateException if the {@link BeanFactory} was not configured.
-	 * @see org.springframework.beans.factory.BeanFactory
-	 */
-	protected ConfigurableListableBeanFactory getBeanFactory() {
-		return Optional.ofNullable(this.beanFactory)
-			.orElseThrow(() -> newIllegalStateException("BeanFactory was not properly configured"));
-	}
-
-	/**
-	 * Sets a reference to the configured Spring {@link BeanFactory}.
-	 *
-	 * @param beanFactory configured Spring {@link BeanFactory}.
-	 * @throws IllegalArgumentException if the given {@link BeanFactory} is not an instance of
-	 * {@link ConfigurableListableBeanFactory}.
-	 * @see org.springframework.beans.factory.BeanFactoryAware
-	 * @see org.springframework.beans.factory.BeanFactory
-	 */
-	@Override
-	@SuppressWarnings("all")
-	public final void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-
-		Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory, String
-			.format("BeanFactory [%1$s] must be an instance of %2$s", ObjectUtils.nullSafeClassName(beanFactory),
-				ConfigurableListableBeanFactory.class.getSimpleName()));
-
-		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
-	}
 }