From 52cc90c698191a6394e69eb666d13fe40cb44c12 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 29 Mar 2021 11:25:51 -0700 Subject: [PATCH] Refactor use of Spring's @NonNull & @Nullable annotations in the API. --- .../GemFireMockObjectsConfiguration.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java index 74a13c4..d389b3c 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java @@ -91,6 +91,9 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup }); } + /** + * @inheritDoc + */ protected @NonNull Class getAnnotationType() { return EnableGemFireMockObjects.class; } @@ -104,21 +107,21 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup } @Bean - public ApplicationListener destroyGemFireMockObjectsApplicationListener() { + public @NonNull ApplicationListener destroyGemFireMockObjectsApplicationListener() { return DestroyGemFireMockObjectsApplicationListener.newInstance(getConfiguredDestroyEventTypes()); } @Bean - public BeanPostProcessor gemfireMockObjectsBeanPostProcessor() { + public @NonNull BeanPostProcessor gemfireMockObjectsBeanPostProcessor() { return GemFireMockObjectsBeanPostProcessor.newInstance(isUseSingletonCacheConfigured()); } @Bean - public BeanPostProcessor gemfireRepositoryBeanPostProcessor() { + public @NonNull BeanPostProcessor gemfireRepositoryBeanPostProcessor() { return new BeanPostProcessor() { - public Object postProcessAfterInitialization(@NonNull Object bean, @NonNull String beanName) + public @Nullable Object postProcessAfterInitialization(@Nullable Object bean, @NonNull String beanName) throws BeansException { if (bean instanceof GemfireRepository) { @@ -168,14 +171,14 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup } @Override - public Object invoke(MethodInvocation invocation) throws Throwable { + public @Nullable Object invoke(@NonNull MethodInvocation invocation) throws Throwable { Method method = invocation.getMethod(); return isCountMethod(method) ? Long.valueOf(getRegion().size()) : invocation.proceed(); } - private boolean isCountMethod(Method method) { + private boolean isCountMethod(@NonNull Method method) { return method != null && COUNT_METHOD_NAME.equals(method.getName()); } }