refs #90: Added more mutation coverage for wrappers

jashmoreAtlassian · jashmoreAtlassian · commit 68712d4429e8 · 2019-05-24T23:19:15.000-05:00
diff --git a/java-dynamic-sqs-listener-core/src/main/java/com/jashmore/sqs/retriever/batching/StaticBatchingMessageRetrieverProperties.java b/java-dynamic-sqs-listener-core/src/main/java/com/jashmore/sqs/retriever/batching/StaticBatchingMessageRetrieverProperties.java
@@ -1,6 +1,7 @@
 package com.jashmore.sqs.retriever.batching;
 
 import lombok.Builder;
+import lombok.Value;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.Positive;
@@ -9,6 +10,7 @@
 /**
  * Static implementation of the properties that will never change during the processing of the messages.
  */
+@Value
 @Builder(toBuilder = true)
 public class StaticBatchingMessageRetrieverProperties implements BatchingMessageRetrieverProperties {
     private final int numberOfThreadsWaitingTrigger;
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/basic/QueueListenerWrapper.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/basic/QueueListenerWrapper.java
@@ -1,5 +1,7 @@
 package com.jashmore.sqs.spring.container.basic;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import com.jashmore.sqs.QueueProperties;
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.broker.concurrent.ConcurrentMessageBroker;
@@ -83,14 +85,17 @@ protected IdentifiableMessageListenerContainer wrapMethodContainingAnnotation(fi
     }
 
     private MessageRetriever buildMessageRetriever(final QueueListener annotation, final QueueProperties queueProperties, final int concurrencyLevel) {
-        final BatchingMessageRetrieverProperties batchingMessageRetrieverProperties = StaticBatchingMessageRetrieverProperties
-                .builder()
+        return new BatchingMessageRetriever(
+                queueProperties, sqsAsyncClient, batchingMessageRetrieverProperties(annotation, concurrencyLevel));
+    }
+
+    @VisibleForTesting
+    BatchingMessageRetrieverProperties batchingMessageRetrieverProperties(final QueueListener annotation, final int concurrencyLevel) {
+        return StaticBatchingMessageRetrieverProperties.builder()
                 .visibilityTimeoutInSeconds(getMessageVisibilityTimeoutInSeconds(annotation))
                 .messageRetrievalPollingPeriodInMs(getMaxPeriodBetweenBatchesInMs(annotation))
                 .numberOfThreadsWaitingTrigger(concurrencyLevel)
                 .build();
-        return new BatchingMessageRetriever(
-                queueProperties, sqsAsyncClient, batchingMessageRetrieverProperties);
     }
 
     private int getConcurrencyLevel(final QueueListener annotation) {
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/batching/BatchingQueueListenerWrapper.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/batching/BatchingQueueListenerWrapper.java
@@ -1,5 +1,7 @@
 package com.jashmore.sqs.spring.container.batching;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import com.jashmore.sqs.QueueProperties;
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.broker.concurrent.ConcurrentMessageBroker;
@@ -28,6 +30,7 @@
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 
 import java.lang.reflect.Method;
+import javax.annotation.Nonnull;
 
 /**
  * {@link QueueWrapper} that will wrap methods annotated with {@link QueueListener @QueueListener} with some predefined
@@ -88,14 +91,17 @@ protected IdentifiableMessageListenerContainer wrapMethodContainingAnnotation(fi
     }
 
     private MessageRetriever buildMessageRetriever(final BatchingQueueListener annotation, final QueueProperties queueProperties, final int concurrencyLevel) {
-        final BatchingMessageRetrieverProperties batchingMessageRetrieverProperties = StaticBatchingMessageRetrieverProperties
+        return new BatchingMessageRetriever(queueProperties, sqsAsyncClient, batchingMessageRetrieverProperties(annotation, concurrencyLevel));
+    }
+
+    @VisibleForTesting
+    BatchingMessageRetrieverProperties batchingMessageRetrieverProperties(final BatchingQueueListener annotation, final int concurrencyLevel) {
+        return StaticBatchingMessageRetrieverProperties
                 .builder()
                 .visibilityTimeoutInSeconds(getMessageVisibilityTimeoutInSeconds(annotation))
                 .messageRetrievalPollingPeriodInMs(getMaxPeriodBetweenBatchesInMs(annotation))
                 .numberOfThreadsWaitingTrigger(concurrencyLevel)
                 .build();
-        return new BatchingMessageRetriever(
-                queueProperties, sqsAsyncClient, batchingMessageRetrieverProperties);
     }
 
     private MessageResolver buildMessageResolver(final QueueProperties queueProperties,
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/prefetch/PrefetchingQueueListenerWrapper.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/main/java/com/jashmore/sqs/spring/container/prefetch/PrefetchingQueueListenerWrapper.java
@@ -2,6 +2,8 @@
 
 import static com.jashmore.sqs.aws.AwsConstants.MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import com.jashmore.sqs.QueueProperties;
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.broker.concurrent.ConcurrentMessageBroker;
@@ -112,15 +114,17 @@ private int getDesiredMinPrefetchedMessages(final PrefetchingQueueListener annot
         return Integer.parseInt(environment.resolvePlaceholders(annotation.desiredMinPrefetchedMessagesString()));
     }
 
-    private MessageRetriever buildMessageRetriever(final PrefetchingQueueListener annotation,
-                                                   final QueueProperties queueProperties) {
-        final PrefetchingMessageRetrieverProperties prefetchingProperties = StaticPrefetchingMessageRetrieverProperties
-                .builder()
+    @VisibleForTesting
+    PrefetchingMessageRetrieverProperties buildMessageRetrieverProperties(final PrefetchingQueueListener annotation) {
+        return StaticPrefetchingMessageRetrieverProperties.builder()
                 .desiredMinPrefetchedMessages(getDesiredMinPrefetchedMessages(annotation))
                 .maxPrefetchedMessages(getMaxPrefetchedMessages(annotation))
                 .visibilityTimeoutForMessagesInSeconds(getMessageVisibilityTimeoutInSeconds(annotation))
                 .maxWaitTimeInSecondsToObtainMessagesFromServer(MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS)
                 .build();
-        return new PrefetchingMessageRetriever(sqsAsyncClient, queueProperties, prefetchingProperties);
+    }
+
+    private MessageRetriever buildMessageRetriever(final PrefetchingQueueListener annotation, final QueueProperties queueProperties) {
+        return new PrefetchingMessageRetriever(sqsAsyncClient, queueProperties, buildMessageRetrieverProperties(annotation));
     }
 }
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/basic/QueueListenerWrapperTest.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/basic/QueueListenerWrapperTest.java
@@ -7,6 +7,8 @@
 
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.container.SimpleMessageListenerContainer;
+import com.jashmore.sqs.retriever.batching.BatchingMessageRetrieverProperties;
+import com.jashmore.sqs.retriever.batching.StaticBatchingMessageRetrieverProperties;
 import com.jashmore.sqs.spring.IdentifiableMessageListenerContainer;
 import com.jashmore.sqs.spring.queue.QueueResolverService;
 import org.junit.Before;
@@ -160,6 +162,46 @@ public void validStringFieldsWillCorrectlyBuildMessageListener() throws Exceptio
         assertThat(messageListenerContainer).isNotNull();
     }
 
+    @Test
+    public void batchingMessageRetrieverPropertiesBuiltFromAnnotationValues() throws Exception {
+        // arrange
+        final Method method = QueueListenerWrapperTest.class.getMethod("myMethodWithParameters");
+        final QueueListener annotation = method.getAnnotation(QueueListener.class);
+
+        // act
+        final BatchingMessageRetrieverProperties properties
+                = queueListenerWrapper.batchingMessageRetrieverProperties(annotation, 2);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticBatchingMessageRetrieverProperties.builder()
+                .visibilityTimeoutInSeconds(300)
+                .messageRetrievalPollingPeriodInMs(60L)
+                .numberOfThreadsWaitingTrigger(2)
+                .build()
+        );
+    }
+
+    @Test
+    public void batchingMessageRetrieverPropertiesBuiltFromSpringValues() throws Exception {
+        // arrange
+        final Method method = QueueListenerWrapperTest.class.getMethod("methodWithFieldsUsingEnvironmentProperties");
+        final QueueListener annotation = method.getAnnotation(QueueListener.class);
+        when(environment.resolvePlaceholders("${prop.period}")).thenReturn("30");
+        when(environment.resolvePlaceholders("${prop.visibility}")).thenReturn("40");
+
+        // act
+        final BatchingMessageRetrieverProperties properties
+                = queueListenerWrapper.batchingMessageRetrieverProperties(annotation, 2);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticBatchingMessageRetrieverProperties.builder()
+                .visibilityTimeoutInSeconds(40)
+                .messageRetrievalPollingPeriodInMs(30L)
+                .numberOfThreadsWaitingTrigger(2)
+                .build()
+        );
+    }
+
     @QueueListener("test")
     public void myMethod() {
 
@@ -175,4 +217,9 @@ public void myMethodWithIdentifier() {
     public void methodWithFieldsUsingEnvironmentProperties() {
 
     }
+
+    @QueueListener(value = "test", concurrencyLevel = 6, messageVisibilityTimeoutInSeconds = 300, maxPeriodBetweenBatchesInMs = 60)
+    public void myMethodWithParameters() {
+
+    }
 }
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/batching/BatchingQueueListenerWrapperTest.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/batching/BatchingQueueListenerWrapperTest.java
@@ -7,6 +7,8 @@
 
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.container.SimpleMessageListenerContainer;
+import com.jashmore.sqs.retriever.batching.BatchingMessageRetrieverProperties;
+import com.jashmore.sqs.retriever.batching.StaticBatchingMessageRetrieverProperties;
 import com.jashmore.sqs.spring.IdentifiableMessageListenerContainer;
 import com.jashmore.sqs.spring.queue.QueueResolverService;
 import org.junit.Before;
@@ -156,6 +158,44 @@ public void validStringFieldsWillCorrectlyBuildMessageListener() throws Exceptio
         assertThat(messageListenerContainer).isNotNull();
     }
 
+    @Test
+    public void batchingMessageRetrieversBuiltFromAnnotationProperties() throws Exception {
+        // arrange
+        final Method method = BatchingQueueListenerWrapperTest.class.getMethod("methodWithFields");
+        final BatchingQueueListener annotation = method.getAnnotation(BatchingQueueListener.class);
+
+        // act
+        final BatchingMessageRetrieverProperties properties = batchingQueueListenerWrapper.batchingMessageRetrieverProperties(annotation, 2);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticBatchingMessageRetrieverProperties.builder()
+                .visibilityTimeoutInSeconds(300)
+                .messageRetrievalPollingPeriodInMs(40L)
+                .numberOfThreadsWaitingTrigger(2)
+                .build()
+        );
+    }
+
+    @Test
+    public void batchingMessageRetrieversBuiltFromAnnotationStringProperties() throws Exception {
+        // arrange
+        final Method method = BatchingQueueListenerWrapperTest.class.getMethod("methodWithFieldsUsingEnvironmentProperties");
+        final BatchingQueueListener annotation = method.getAnnotation(BatchingQueueListener.class);
+        when(environment.resolvePlaceholders("${prop.period}")).thenReturn("30");
+        when(environment.resolvePlaceholders("${prop.visibility}")).thenReturn("40");
+
+        // act
+        final BatchingMessageRetrieverProperties properties = batchingQueueListenerWrapper.batchingMessageRetrieverProperties(annotation, 2);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticBatchingMessageRetrieverProperties.builder()
+                .visibilityTimeoutInSeconds(40)
+                .messageRetrievalPollingPeriodInMs(30L)
+                .numberOfThreadsWaitingTrigger(2)
+                .build()
+        );
+    }
+
     @BatchingQueueListener("test")
     public void myMethod() {
 
@@ -171,4 +211,9 @@ public void myMethodWithIdentifier() {
     public void methodWithFieldsUsingEnvironmentProperties() {
 
     }
+
+    @BatchingQueueListener(value = "test2", messageVisibilityTimeoutInSeconds = 300, maxPeriodBetweenBatchesInMs = 40)
+    public void methodWithFields() {
+
+    }
 }
diff --git a/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/prefetch/PrefetchingQueueListenerWrapperTest.java b/java-dynamic-sqs-listener-spring/java-dynamic-sqs-listener-spring-starter/src/test/java/com/jashmore/sqs/spring/container/prefetch/PrefetchingQueueListenerWrapperTest.java
@@ -1,12 +1,15 @@
 package com.jashmore.sqs.spring.container.prefetch;
 
+import static com.jashmore.sqs.aws.AwsConstants.MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.jashmore.sqs.argument.ArgumentResolverService;
 import com.jashmore.sqs.container.SimpleMessageListenerContainer;
+import com.jashmore.sqs.retriever.prefetch.PrefetchingMessageRetrieverProperties;
+import com.jashmore.sqs.retriever.prefetch.StaticPrefetchingMessageRetrieverProperties;
 import com.jashmore.sqs.spring.IdentifiableMessageListenerContainer;
 import com.jashmore.sqs.spring.queue.QueueResolverService;
 import org.junit.Before;
@@ -174,6 +177,49 @@ public void validStringFieldsWillCorrectlyBuildMessageListener() throws Exceptio
         assertThat(messageListenerContainer).isNotNull();
     }
 
+    @Test
+    public void prefetchingQueueListenerCanBeBuiltFromStringProperties() throws Exception {
+        // arrange
+        when(environment.resolvePlaceholders(anyString())).thenReturn("1");
+        final Method method = PrefetchingQueueListenerWrapperTest.class.getMethod("methodWithFieldsUsingEnvironmentProperties");
+        when(environment.resolvePlaceholders("${prop.maxPrefetched}")).thenReturn("30");
+        when(environment.resolvePlaceholders("${prop.desiredMinPrefetchedMessages}")).thenReturn("40");
+        when(environment.resolvePlaceholders("${prop.visibility}")).thenReturn("40");
+        final PrefetchingQueueListener annotation = method.getAnnotation(PrefetchingQueueListener.class);
+
+        // act
+        final PrefetchingMessageRetrieverProperties properties = prefetchingQueueListenerWrapper.buildMessageRetrieverProperties(annotation);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticPrefetchingMessageRetrieverProperties.builder()
+                .maxPrefetchedMessages(30)
+                .desiredMinPrefetchedMessages(40)
+                .visibilityTimeoutForMessagesInSeconds(40)
+                .maxWaitTimeInSecondsToObtainMessagesFromServer(MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS)
+                .build()
+        );
+    }
+
+    @Test
+    public void prefetchingQueueListenerCanBeBuiltFromProperties() throws Exception {
+        // arrange
+        when(environment.resolvePlaceholders(anyString())).thenReturn("1");
+        final Method method = PrefetchingQueueListenerWrapperTest.class.getMethod("methodWithFieldsUsingProperties");
+        final PrefetchingQueueListener annotation = method.getAnnotation(PrefetchingQueueListener.class);
+
+        // act
+        final PrefetchingMessageRetrieverProperties properties = prefetchingQueueListenerWrapper.buildMessageRetrieverProperties(annotation);
+
+        // assert
+        assertThat(properties).isEqualTo(StaticPrefetchingMessageRetrieverProperties.builder()
+                .maxPrefetchedMessages(20)
+                .desiredMinPrefetchedMessages(5)
+                .visibilityTimeoutForMessagesInSeconds(300)
+                .maxWaitTimeInSecondsToObtainMessagesFromServer(MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS)
+                .build()
+        );
+    }
+
     @PrefetchingQueueListener("test")
     public void myMethod() {
 
@@ -191,4 +237,11 @@ public void myMethodWithIdentifier() {
     public void methodWithFieldsUsingEnvironmentProperties() {
 
     }
+
+    @PrefetchingQueueListener(value = "test2", concurrencyLevel = 2, messageVisibilityTimeoutInSeconds = 300,
+            maxPrefetchedMessages = 20, desiredMinPrefetchedMessages = 5
+    )
+    public void methodWithFieldsUsingProperties() {
+
+    }
 }
