[Java] Fix warnings.

Boog-Jiang · Aug 9, 2024 · a054780 · a054780
1 parent fb263d8
commit a054780
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 34 deletions.
diff --git a/aeron-agent/src/test/java/io/aeron/agent/ArchiveEventEncoderTest.java b/aeron-agent/src/test/java/io/aeron/agent/ArchiveEventEncoderTest.java
@@ -34,6 +34,11 @@
 
 class ArchiveEventEncoderTest
 {
+    enum State
+    {
+        ALPHA, BETA
+    }
+
     private final UnsafeBuffer buffer = new UnsafeBuffer(new byte[MAX_EVENT_LENGTH]);
 
     @Test
@@ -106,11 +111,6 @@ void testEncodeCatalogResize()
         assertEquals(newCatalogLength, buffer.getLong(offset + LOG_HEADER_LENGTH + SIZE_OF_LONG));
     }
 
-    enum State
-    {
-        ALPHA, BETA;
-    }
-
     @Test
     void testEncodeReplaySessionStateChange()
     {

diff --git a/aeron-agent/src/test/java/io/aeron/agent/ClusterEventLoggerTest.java b/aeron-agent/src/test/java/io/aeron/agent/ClusterEventLoggerTest.java
@@ -32,7 +32,6 @@
 import static io.aeron.agent.AgentTests.verifyLogHeader;
 import static io.aeron.agent.ClusterEventCode.*;
 import static io.aeron.agent.ClusterEventEncoder.*;
-import static io.aeron.agent.ClusterEventEncoder.MAX_REASON_LENGTH;
 import static io.aeron.agent.CommonEventEncoder.LOG_HEADER_LENGTH;
 import static io.aeron.agent.CommonEventEncoder.STATE_SEPARATOR;
 import static io.aeron.agent.CommonEventEncoder.enumName;

diff --git a/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java b/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java
@@ -179,8 +179,8 @@ private MediaDriver(final Context ctx)
                     sharedInvoker = null;
                     break;
 
-                default:
                 case DEDICATED:
+                default:
                     senderRunner = new AgentRunner(ctx.senderIdleStrategy(), errorHandler, errorCounter, sender);
                     receiverRunner = new AgentRunner(ctx.receiverIdleStrategy(), errorHandler, errorCounter, receiver);
                     conductorRunner = new AgentRunner(

diff --git a/aeron-test-support/src/main/java/io/aeron/test/cluster/TestNode.java b/aeron-test-support/src/main/java/io/aeron/test/cluster/TestNode.java
@@ -496,39 +496,37 @@ public void onSessionMessage(
                 }
             }
 
-            if (ClusterTests.UNEXPECTED_MSG.equals(message))
+            switch (message)
             {
-                hasReceivedUnexpectedMessage = true;
-                throw new IllegalStateException("unexpected message received");
-            }
+                case ClusterTests.UNEXPECTED_MSG:
+                    hasReceivedUnexpectedMessage = true;
+                    throw new IllegalStateException("unexpected message received");
 
-            if (ClusterTests.TERMINATE_MSG.equals(message))
-            {
-                throw new ClusterTerminationException(false);
-            }
+                case ClusterTests.TERMINATE_MSG:
+                    throw new ClusterTerminationException(false);
 
-            if (ClusterTests.ECHO_SERVICE_IPC_INGRESS_MSG.equals(message))
-            {
-                sendServiceIpcMessage(session, buffer, offset, length);
-            }
-            else if (ClusterTests.ECHO_SERVICE_IPC_INGRESS_MSG_SKIP_FOLLOWER.equals(message))
-            {
-                simulateBuggyApplicationCodeThatSkipsServiceMessageOnFollower(session, buffer, offset, length);
-            }
-            else
-            {
-                if (ClusterTests.ERROR_MSG.equals(message))
-                {
-                    cluster.context().errorHandler().onError(new Exception(message));
-                }
+                case ClusterTests.ECHO_SERVICE_IPC_INGRESS_MSG:
+                    sendServiceIpcMessage(session, buffer, offset, length);
+                    break;
 
-                if (null != session)
-                {
-                    while (session.offer(buffer, offset, length) < 0)
+                case ClusterTests.ECHO_SERVICE_IPC_INGRESS_MSG_SKIP_FOLLOWER:
+                    simulateBuggyApplicationCodeThatSkipsServiceMessageOnFollower(session, buffer, offset, length);
+                    break;
+
+                default:
+                    if (ClusterTests.ERROR_MSG.equals(message))
                     {
-                        idleStrategy.idle();
+                        cluster.context().errorHandler().onError(new Exception(message));
                     }
-                }
+
+                    if (null != session)
+                    {
+                        while (session.offer(buffer, offset, length) < 0)
+                        {
+                            idleStrategy.idle();
+                        }
+                    }
+                    break;
             }
 
             messageCount.incrementAndGet();