Use enum for no-op PauseDetectorWrapper #2474

redis · Aug 7, 2023 · 69c6fa2 · 69c6fa2
1 parent 92f462c
commit 69c6fa2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java b/src/main/java/io/lettuce/core/metrics/DefaultCommandLatencyCollector.java
@@ -357,41 +357,45 @@ public void shutdown() {
     }
 
     /**
-     * Wrapper for initialization of {@link PauseDetector}. Encapsulates absence of LatencyUtils.
+     * No-op implementation of {@link PauseDetectorWrapper}.
      */
-    interface PauseDetectorWrapper {
+    enum NoOpPauseDetectorWrapper implements PauseDetectorWrapper {
 
-        /**
-         * No-operation {@link PauseDetectorWrapper} implementation.
-         */
-        PauseDetectorWrapper NO_OP = new PauseDetectorWrapper() {
+        INSTANCE;
 
-            @Override
-            public void release() {
-            }
+        @Override
+        public void retain() {
 
-            @Override
-            public void retain() {
-            }
+        }
 
-            @Override
-            public Object getPauseDetector() {
-                return NoPauseDetector.INSTANCE;
-            }
+        @Override
+        public void release() {
 
-        };
+        }
+
+        @Override
+        public Object getPauseDetector() {
+            return NoPauseDetector.INSTANCE;
+        }
+
+    }
+
+    /**
+     * Wrapper for initialization of {@link PauseDetector}. Encapsulates absence of LatencyUtils.
+     */
+    interface PauseDetectorWrapper {
 
         static PauseDetectorWrapper create() {
 
             if (HDR_UTILS_AVAILABLE && LATENCY_UTILS_AVAILABLE) {
                 return new DefaultPauseDetectorWrapper();
             }
 
-            return NO_OP;
+            return NoOpPauseDetectorWrapper.INSTANCE;
         }
 
         static PauseDetectorWrapper noop() {
-            return NO_OP;
+            return NoOpPauseDetectorWrapper.INSTANCE;
         }
 
         /**

diff --git a/src/main/resources/META-INF/native-image/io.lettuce/lettuce-core/native-image.properties b/src/main/resources/META-INF/native-image/io.lettuce/lettuce-core/native-image.properties
@@ -1 +1 @@
-Args=--initialize-at-build-time=io.lettuce.core.metrics.DefaultCommandLatencyCollector,io.lettuce.core.internal.LettuceClassUtils
+Args=--initialize-at-build-time=io.lettuce.core.metrics.DefaultCommandLatencyCollector,io.lettuce.core.metrics.DefaultCommandLatencyCollector$NoOpPauseDetectorWrapper,io.lettuce.core.internal.LettuceClassUtils