ensure lazy initialzation (#64)

* ensure lazy initialzation * apply spotless
teragrep · Jan 23, 2025 · 80210c3 · 80210c3
1 parent daca951
commit 80210c3
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 62 deletions.
diff --git a/src/main/java/com/teragrep/aer_02/InitializationOnDemandHolder.java b/src/main/java/com/teragrep/aer_02/InitializationOnDemandHolder.java
@@ -72,75 +72,82 @@ private InitializationOnDemandHolder() {
 
     }
 
-    private static final LazyInstance INSTANCE = new LazyInstance();
-
-    public static LazyInstance lazyInstance() {
-        return INSTANCE;
+    static LazyHolder.LazyInstance lazyInstance() {
+        return LazyHolder.INSTANCE;
     }
 
-    static final class LazyInstance {
-
-        private final DefaultOutput defaultOutput;
-        private final MetricRegistry metricRegistry;
-        private final Report report;
-
-        private LazyInstance() {
-            final Logger logger = Logger.getAnonymousLogger();
-            metricRegistry = new MetricRegistry();
-            Sourceable environmentSource = new EnvironmentSource();
-            RelpConnectionConfig relpConnectionConfig = new RelpConnectionConfig(environmentSource);
-            report = new JmxReport(
-                    new Slf4jReport(new PrometheusReport(new DropwizardExports(metricRegistry)), metricRegistry),
-                    metricRegistry
-            );
-
-            report.start();
-
-            Pool<IManagedRelpConnection> relpConnectionPool;
-            if (environmentSource.source("relp.tls.mode", "none").equals("keyVault")) {
-                logger.info("Using keyVault TLS mode");
-                relpConnectionPool = new UnboundPool<>(
-                        new ManagedRelpConnectionWithMetricsFactory(
-                                logger,
-                                relpConnectionConfig.asRelpConfig(),
-                                "defaultOutput",
-                                metricRegistry,
-                                relpConnectionConfig.asSocketConfig(),
-                                new AzureSSLContextSupplier()
-                        ),
-                        new ManagedRelpConnectionStub()
-                );
-            }
-            else {
-                logger.info("Using plain mode");
-                relpConnectionPool = new UnboundPool<>(
-                        new ManagedRelpConnectionWithMetricsFactory(
-                                logger,
-                                relpConnectionConfig.asRelpConfig(),
-                                "defaultOutput",
-                                metricRegistry,
-                                relpConnectionConfig.asSocketConfig()
-                        ),
-                        new ManagedRelpConnectionStub()
-                );
-            }
+    static final class LazyHolder {
 
-            defaultOutput = new DefaultOutput(logger, relpConnectionPool);
+        private LazyHolder() {
 
-            Runtime.getRuntime().addShutdownHook(new Thread(this::close));
         }
 
-        public DefaultOutput defaultOutput() {
-            return defaultOutput;
-        }
+        private static final LazyInstance INSTANCE = new LazyInstance();
 
-        public MetricRegistry metricRegistry() {
-            return metricRegistry;
-        }
+        static final class LazyInstance {
 
-        private void close() {
-            report.close();
-            defaultOutput.close();
+            private final DefaultOutput defaultOutput;
+            private final MetricRegistry metricRegistry;
+            private final Report report;
+
+            private LazyInstance() {
+                final Logger logger = Logger.getAnonymousLogger();
+                metricRegistry = new MetricRegistry();
+                Sourceable environmentSource = new EnvironmentSource();
+                RelpConnectionConfig relpConnectionConfig = new RelpConnectionConfig(environmentSource);
+                report = new JmxReport(
+                        new Slf4jReport(new PrometheusReport(new DropwizardExports(metricRegistry)), metricRegistry),
+                        metricRegistry
+                );
+
+                report.start();
+
+                Pool<IManagedRelpConnection> relpConnectionPool;
+                if (environmentSource.source("relp.tls.mode", "none").equals("keyVault")) {
+                    logger.info("Using keyVault TLS mode");
+                    relpConnectionPool = new UnboundPool<>(
+                            new ManagedRelpConnectionWithMetricsFactory(
+                                    logger,
+                                    relpConnectionConfig.asRelpConfig(),
+                                    "defaultOutput",
+                                    metricRegistry,
+                                    relpConnectionConfig.asSocketConfig(),
+                                    new AzureSSLContextSupplier()
+                            ),
+                            new ManagedRelpConnectionStub()
+                    );
+                }
+                else {
+                    logger.info("Using plain mode");
+                    relpConnectionPool = new UnboundPool<>(
+                            new ManagedRelpConnectionWithMetricsFactory(
+                                    logger,
+                                    relpConnectionConfig.asRelpConfig(),
+                                    "defaultOutput",
+                                    metricRegistry,
+                                    relpConnectionConfig.asSocketConfig()
+                            ),
+                            new ManagedRelpConnectionStub()
+                    );
+                }
+
+                defaultOutput = new DefaultOutput(logger, relpConnectionPool);
+
+                Runtime.getRuntime().addShutdownHook(new Thread(this::close));
+            }
+
+            public DefaultOutput defaultOutput() {
+                return defaultOutput;
+            }
+
+            public MetricRegistry metricRegistry() {
+                return metricRegistry;
+            }
+
+            private void close() {
+                report.close();
+                defaultOutput.close();
+            }
         }
     }
 }
diff --git a/src/main/java/com/teragrep/aer_02/SyslogBridge.java b/src/main/java/com/teragrep/aer_02/SyslogBridge.java
@@ -119,7 +119,8 @@ public void eventHubTriggerToSyslog(
 
             context.getLogger().info("initializing at " + this);
 
-            final InitializationOnDemandHolder.LazyInstance lazyInstance = InitializationOnDemandHolder.lazyInstance();
+            final InitializationOnDemandHolder.LazyHolder.LazyInstance lazyInstance = InitializationOnDemandHolder
+                    .lazyInstance();
             final DefaultOutput defaultOutput = lazyInstance.defaultOutput();
             context.getLogger().info("initialized at " + this);