move to singleton instance

samvaity · samvaity · commit a6b6d4eee5e8 · 2025-09-17T16:09:34.000-07:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ConnectionStringCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ConnectionStringCheck.java
@@ -13,8 +13,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,9 +23,7 @@ public class ConnectionStringCheck extends LocalInspectionTool {
 
     @Override
     public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new ConnectionStringCheckVisitor(holder, rules);
+        return new ConnectionStringCheckVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     static class ConnectionStringCheckVisitor extends JavaElementVisitor {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DisableAutoCompleteCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DisableAutoCompleteCheck.java
@@ -17,8 +17,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -39,11 +37,9 @@ public class DisableAutoCompleteCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new DisableAutoCompleteVisitor(holder, rules);
+        return new DisableAutoCompleteVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
-
+    
     /**
      * This class extends the JavaElementVisitor and is used to visit the Java elements in the code. It checks for the
      * usage of Azure SDK ServiceBusReceiver & ServiceBusProcessor clients and whether the auto-complete feature is
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DynamicClientCreationCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DynamicClientCreationCheck.java
@@ -21,8 +21,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,9 +32,7 @@ public class DynamicClientCreationCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new DynamicClientCreationVisitor(holder, rules);
+        return new DynamicClientCreationVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     static class DynamicClientCreationVisitor extends JavaElementVisitor {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/EventHubConsumerAsyncClientCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/EventHubConsumerAsyncClientCheck.java
@@ -7,8 +7,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,10 +24,8 @@ public class EventHubConsumerAsyncClientCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
         return new EventHubConsumerAsyncClientCheck.EventHubConsumerAsyncClientVisitor(holder,
-            rules);
+            RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetCompletionsCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetCompletionsCheck.java
@@ -13,8 +13,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,9 +23,7 @@ public class GetCompletionsCheck extends LocalInspectionTool {
 
     @Override
     public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new GetCompletionsCheck.GetCompletionsVisitor(holder, rules);
+        return new GetCompletionsCheck.GetCompletionsVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     static class GetCompletionsVisitor extends JavaElementVisitor {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetSyncPollerOnPollerFluxCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetSyncPollerOnPollerFluxCheck.java
@@ -12,8 +12,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -42,9 +40,7 @@ public class GetSyncPollerOnPollerFluxCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new GetSyncPollerOnPollerFluxVisitor(holder, rules);
+        return new GetSyncPollerOnPollerFluxVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/HardcodedAPIKeysAndTokensCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/HardcodedAPIKeysAndTokensCheck.java
@@ -23,8 +23,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import java.util.regex.Pattern;
 import javax.annotation.Nonnull;
@@ -40,9 +38,7 @@ public class HardcodedAPIKeysAndTokensCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new APIKeysAndTokensVisitor(holder, rules);
+        return new APIKeysAndTokensVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ServiceBusReceiverAsyncClientCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ServiceBusReceiverAsyncClientCheck.java
@@ -7,8 +7,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,10 +18,8 @@ public class ServiceBusReceiverAsyncClientCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
         return new ServiceBusReceiverAsyncClientCheck.ServiceBusReceiverAsyncClientCheckVisitor(holder,
-            rules);
+            RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/SingleOperationInLoopTextAnalyticsCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/SingleOperationInLoopTextAnalyticsCheck.java
@@ -23,8 +23,6 @@
 import com.intellij.psi.PsiWhileStatement;
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
@@ -55,9 +53,7 @@ public class SingleOperationInLoopTextAnalyticsCheck extends LocalInspectionTool
     @NotNull
     @Override
     public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new SingleOperationInLoopVisitor(holder, rules);
+        return new SingleOperationInLoopVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/StorageUploadWithoutLengthCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/StorageUploadWithoutLengthCheck.java
@@ -20,7 +20,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
@@ -33,9 +32,7 @@ public class StorageUploadWithoutLengthCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new StorageUploadVisitor(holder, rules);
+        return new StorageUploadVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/UpdateCheckpointAsyncSubscribeCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/UpdateCheckpointAsyncSubscribeCheck.java
@@ -13,8 +13,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,9 +34,7 @@ public class UpdateCheckpointAsyncSubscribeCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new UpdateCheckpointAsyncVisitor(holder, rules);
+        return new UpdateCheckpointAsyncVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/UseOfBlockOnAsyncClientsCheck.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/UseOfBlockOnAsyncClientsCheck.java
@@ -17,8 +17,6 @@
 import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
 import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
-
-import java.util.Collections;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -31,9 +29,7 @@ public class UseOfBlockOnAsyncClientsCheck extends LocalInspectionTool {
     @NotNull
     @Override
     public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-        final RuleConfigLoader loader = RuleConfigLoader.getInstance();
-        final Map<String, RuleConfig> rules = (loader != null) ? loader.getRuleConfigs() : Collections.emptyMap();
-        return new UseOfBlockOnAsyncClientsVisitor(holder, rules);
+        return new UseOfBlockOnAsyncClientsVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
     }
 
     /**
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/utils/RuleConfigLoader.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/utils/RuleConfigLoader.java
@@ -24,17 +24,28 @@
 @Slf4j
 public class RuleConfigLoader implements ProjectActivity {
     private static final String CONFIG_FILE_PATH = "./ruleConfigs.json";
-    private static RuleConfigLoader INSTANCE;
+    private static volatile RuleConfigLoader INSTANCE = new RuleConfigLoader();
     private Map<String, RuleConfig> ruleConfigs;
+    private volatile boolean initialized = false;
 
     private RuleConfigLoader() {
         this.ruleConfigs = new HashMap<>();
     }
 
+    static {
+        try {
+            // Eagerly load configuration at class load time
+            INSTANCE.initialize();
+        } catch (Exception e) {
+            // Never fail class loading; keep instance alive with empty configs
+            log.warn("Failed to eagerly initialize RuleConfigLoader: " + e.getMessage(), e);
+        }
+    }
+
     /**
      * Gets the singleton instance of RuleConfigLoader.
      *
-     * @return The singleton instance of RuleConfigLoader.
+     * @return The singleton instance of RuleConfigLoader (never null).
      */
     public static RuleConfigLoader getInstance() {
         return INSTANCE;
@@ -56,12 +67,19 @@ public Map<String, RuleConfig> getRuleConfigs() {
         return Collections.unmodifiableMap(ruleConfigs);
     }
 
-    private void initialize(){
+    private synchronized void initialize() {
+        if (initialized) {
+            return;
+        }
         try {
+            this.ruleConfigs.clear();
             this.ruleConfigs.putAll(this.loadRuleConfigurations());
-            INSTANCE = this;
+            // INSTANCE is already assigned in the static initializer; avoid reassigning it here
+            initialized = true;
         } catch (IOException e) {
+            // Keep INSTANCE non-null, but proceed with empty configs
             log.warn("Failed to initialize RuleConfigLoader: " + e.getMessage(), e);
+            initialized = true;
         }
     }
 
