chore: organize code

Author: mvallim

.github/workflows/maven.yml

@@ -72,6 +72,8 @@ jobs:
     needs: [build, test]
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:

amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/RingBufferBlockingQueue.java

@@ -113,17 +113,11 @@ public int readSequence() {
   }
 
   @Override
-  @SneakyThrows
   public E peek() {
-    if (isEmpty()) {
-      return null;
-    }
-
-    return buffer[wrap(readSequence.get())].getValue();
+    return isEmpty() ? null : buffer[wrap(readSequence.get())].getValue();
   }
 
   @Override
-  @SneakyThrows
   public void put(final E element) {
     try {
       reentrantLock.lock();
@@ -134,7 +128,6 @@ public void put(final E element) {
   }
 
   @Override
-  @SneakyThrows
   public E take() {
     try {
       reentrantLock.lock();
@@ -154,47 +147,47 @@ static class Entry<E> {
 
   @Override
   public boolean offer(final E e) {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public E poll() {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public Iterator<E> iterator() {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public boolean add(final E e) {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public boolean offer(final E e, final long timeout, final TimeUnit unit) throws InterruptedException {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public E poll(final long timeout, final TimeUnit unit) throws InterruptedException {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public int remainingCapacity() {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public int drainTo(final Collection<? super E> c) {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
   @Override
   public int drainTo(final Collection<? super E> c, final int maxElements) {
-    throw new UnsupportedOperationException();
+    throw new UnsupportedOperationException(); // NOSONAR
   }
 
 }

amazon-sns-java-messaging-lib-template/src/test/java/com/amazon/sns/messaging/lib/concurrent/RingBufferBlockingQueueTest.java

@@ -20,6 +20,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.Mockito.spy;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -36,12 +37,12 @@
 
 class RingBufferBlockingQueueTest {
 
-  private final ExecutorService producer = Executors.newSingleThreadExecutor();
-
-  private final ScheduledExecutorService consumer = Executors.newSingleThreadScheduledExecutor();
-
   @Test
   void testSuccess() throws InterruptedException {
+    final ExecutorService producer = Executors.newSingleThreadExecutor();
+
+    final ScheduledExecutorService consumer = Executors.newSingleThreadScheduledExecutor();
+
     final List<RequestEntry<Integer>> requestEntriesOut = new LinkedList<>();
 
     final RingBufferBlockingQueue<RequestEntry<Integer>> ringBlockingQueue = new RingBufferBlockingQueue<>(5120);
@@ -80,4 +81,61 @@ void testSuccess() throws InterruptedException {
     }
   }
 
+  @Test
+  void testSuccessWhenIsEmpty() throws InterruptedException {
+    final RingBufferBlockingQueue<RequestEntry<Integer>> ringBlockingQueue = spy(new RingBufferBlockingQueue<>());
+
+    final ExecutorService producer = Executors.newSingleThreadExecutor();
+
+    final ExecutorService consumer = Executors.newSingleThreadExecutor();
+
+    consumer.submit(() -> {
+      final RequestEntry<Integer> entry = ringBlockingQueue.take();
+      assertThat(entry.getValue(), is(0));
+    });
+
+    Thread.sleep(2000);
+
+    producer.submit(() -> {
+      ringBlockingQueue.put(RequestEntry.<Integer>builder().withValue(0).build());
+    });
+
+    await().atMost(1, TimeUnit.MINUTES).until(() -> ringBlockingQueue.writeSequence() == 0);
+    producer.shutdownNow();
+
+    await().atMost(1, TimeUnit.MINUTES).until(() -> ringBlockingQueue.readSequence() == 1);
+    consumer.shutdownNow();
+
+    assertThat(ringBlockingQueue.isEmpty(), is(true));
+  }
+
+  @Test
+  void testSuccessWhenIsFull() throws InterruptedException {
+    final RingBufferBlockingQueue<RequestEntry<Integer>> ringBlockingQueue = spy(new RingBufferBlockingQueue<>(1));
+
+    final ExecutorService producer = Executors.newSingleThreadExecutor();
+
+    final ExecutorService consumer = Executors.newSingleThreadExecutor();
+
+    producer.submit(() -> {
+      ringBlockingQueue.put(RequestEntry.<Integer>builder().withValue(0).build());
+      ringBlockingQueue.put(RequestEntry.<Integer>builder().withValue(1).build());
+    });
+
+    Thread.sleep(2000);
+
+    consumer.submit(() -> {
+      assertThat(ringBlockingQueue.take().getValue(), is(0));
+      assertThat(ringBlockingQueue.take().getValue(), is(1));
+    });
+
+    await().atMost(1, TimeUnit.MINUTES).until(() -> ringBlockingQueue.writeSequence() == 1);
+    producer.shutdownNow();
+
+    await().atMost(1, TimeUnit.MINUTES).until(() -> ringBlockingQueue.readSequence() == 2);
+    consumer.shutdownNow();
+
+    assertThat(ringBlockingQueue.isEmpty(), is(true));
+  }
+
 }