Skip to content

Commit 595e161

Browse files
samvaitysamvaity
committed
remove RuleConfigLoaderInitializer + comments
1 parent e275a81 commit 595e161

29 files changed

+184
-240
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ConnectionStringCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
1414
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
1515
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
16+
import java.util.Map;
1617
import org.jetbrains.annotations.NotNull;
1718

1819
/**
@@ -22,24 +23,24 @@ public class ConnectionStringCheck extends LocalInspectionTool {
2223

2324
@Override
2425
public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
25-
return new ConnectionStringCheckVisitor(holder, RuleConfigLoader.getInstance());
26+
return new ConnectionStringCheckVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
2627
}
2728

2829
static class ConnectionStringCheckVisitor extends JavaElementVisitor {
2930
private final ProblemsHolder holder;
3031
private static RuleConfig RULE_CONFIG;
3132
private static boolean SKIP_WHOLE_RULE;
3233

33-
ConnectionStringCheckVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
34+
ConnectionStringCheckVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
3435
this.holder = holder;
35-
initializeRuleConfig(ruleConfigLoader);
36+
initializeRuleConfig(ruleConfigs);
3637
}
3738

38-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
39+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
3940
if (RULE_CONFIG == null) {
4041
final String ruleName = "ConnectionStringCheck";
41-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
42-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
42+
RULE_CONFIG = ruleConfigs.get(ruleName);
43+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
4344
}
4445
}
4546

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DisableAutoCompleteCheck.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
1818
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
1919
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
20+
import java.util.Map;
2021
import org.jetbrains.annotations.NotNull;
2122

2223
/**
@@ -36,7 +37,7 @@ public class DisableAutoCompleteCheck extends LocalInspectionTool {
3637
@NotNull
3738
@Override
3839
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
39-
return new DisableAutoCompleteVisitor(holder, RuleConfigLoader.getInstance());
40+
return new DisableAutoCompleteVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
4041
}
4142

4243
/**
@@ -50,17 +51,16 @@ static class DisableAutoCompleteVisitor extends JavaElementVisitor {
5051
private static boolean SKIP_WHOLE_RULE;
5152
private final ProblemsHolder holder;
5253

53-
54-
DisableAutoCompleteVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
54+
DisableAutoCompleteVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
5555
this.holder = holder;
56-
initializeRuleConfig(ruleConfigLoader);
56+
initializeRuleConfig(ruleConfigs);
5757
}
5858

59-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
59+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
6060
if (RULE_CONFIG == null) {
6161
final String ruleName = "DisableAutoCompleteCheck";
62-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
63-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
62+
RULE_CONFIG = ruleConfigs.get(ruleName);
63+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
6464
}
6565
}
6666
/**

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/DynamicClientCreationCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
2222
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
2323
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
24+
import java.util.Map;
2425
import org.jetbrains.annotations.NotNull;
2526

2627
/**
@@ -31,7 +32,7 @@ public class DynamicClientCreationCheck extends LocalInspectionTool {
3132
@NotNull
3233
@Override
3334
public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
34-
return new DynamicClientCreationVisitor(holder, RuleConfigLoader.getInstance());
35+
return new DynamicClientCreationVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
3536
}
3637

3738
static class DynamicClientCreationVisitor extends JavaElementVisitor {
@@ -40,16 +41,16 @@ static class DynamicClientCreationVisitor extends JavaElementVisitor {
4041
private static RuleConfig RULE_CONFIG;
4142
private static boolean SKIP_WHOLE_RULE;
4243

43-
public DynamicClientCreationVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
44+
public DynamicClientCreationVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
4445
this.holder = holder;
45-
initializeRuleConfig(ruleConfigLoader);
46+
initializeRuleConfig(ruleConfigs);
4647
}
4748

48-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
49+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
4950
if (RULE_CONFIG == null) {
5051
final String ruleName = "DynamicClientCreationCheck";
51-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
52-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
52+
RULE_CONFIG = ruleConfigs.get(ruleName);
53+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
5354
}
5455
}
5556

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/EventHubConsumerAsyncClientCheck.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
88
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
99
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
10+
import java.util.Map;
1011
import org.jetbrains.annotations.NotNull;
1112

1213
/**
@@ -24,7 +25,7 @@ public class EventHubConsumerAsyncClientCheck extends LocalInspectionTool {
2425
@Override
2526
public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
2627
return new EventHubConsumerAsyncClientCheck.EventHubConsumerAsyncClientVisitor(holder,
27-
RuleConfigLoader.getInstance());
28+
RuleConfigLoader.getInstance().getRuleConfigs());
2829
}
2930

3031
/**
@@ -41,18 +42,18 @@ static class EventHubConsumerAsyncClientVisitor extends JavaElementVisitor {
4142
* Constructor to initialize the visitor with the holder and isOnTheFly flag.
4243
*
4344
* @param holder Holder for the problems found by the inspection
44-
* @param ruleConfigLoader RuleConfigLoader object to load the rule configuration
45+
* @param ruleConfigs Rule configurations for the inspection
4546
*/
46-
public EventHubConsumerAsyncClientVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
47+
public EventHubConsumerAsyncClientVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
4748
this.holder = holder;
48-
initializeRuleConfig(ruleConfigLoader);
49+
initializeRuleConfig(ruleConfigs);
4950
}
5051

51-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
52+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
5253
if (RULE_CONFIG == null) {
5354
final String ruleName = "EventHubConsumerAsyncClientCheck";
54-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
55-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
55+
RULE_CONFIG = ruleConfigs.get(ruleName);
56+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
5657
}
5758
}
5859

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetCompletionsCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
1414
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
1515
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
16+
import java.util.Map;
1617
import org.jetbrains.annotations.NotNull;
1718

1819
/**
@@ -22,24 +23,24 @@ public class GetCompletionsCheck extends LocalInspectionTool {
2223

2324
@Override
2425
public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
25-
return new GetCompletionsCheck.GetCompletionsVisitor(holder, RuleConfigLoader.getInstance());
26+
return new GetCompletionsCheck.GetCompletionsVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
2627
}
2728

2829
static class GetCompletionsVisitor extends JavaElementVisitor {
2930
private final ProblemsHolder holder;
3031
private static RuleConfig RULE_CONFIG;
3132
private static boolean SKIP_WHOLE_RULE;
3233

33-
GetCompletionsVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
34+
GetCompletionsVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
3435
this.holder = holder;
35-
initializeRuleConfig(ruleConfigLoader);
36+
initializeRuleConfig(ruleConfigs);
3637
}
3738

38-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
39+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
3940
if (RULE_CONFIG == null) {
4041
final String ruleName = "GetCompletionsCheck";
41-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
42-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
42+
RULE_CONFIG = ruleConfigs.get(ruleName);
43+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
4344
}
4445
}
4546

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/GetSyncPollerOnPollerFluxCheck.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
1313
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
1414
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
15+
import java.util.Map;
1516
import org.jetbrains.annotations.NotNull;
1617

1718
/**
@@ -39,7 +40,7 @@ public class GetSyncPollerOnPollerFluxCheck extends LocalInspectionTool {
3940
@NotNull
4041
@Override
4142
public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
42-
return new GetSyncPollerOnPollerFluxVisitor(holder, RuleConfigLoader.getInstance());
43+
return new GetSyncPollerOnPollerFluxVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
4344
}
4445

4546
/**
@@ -56,18 +57,18 @@ class GetSyncPollerOnPollerFluxVisitor extends JavaElementVisitor {
5657
* Constructor to initialize the visitor with the holder and isOnTheFly flag.
5758
*
5859
* @param holder Holder for the problems found by the inspection
59-
* @param ruleConfigLoader RuleConfigLoader object to load the rule configuration
60+
* @param ruleConfigs Rule configurations for the inspection
6061
*/
61-
public GetSyncPollerOnPollerFluxVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
62+
public GetSyncPollerOnPollerFluxVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
6263
this.holder = holder;
63-
initializeRuleConfig(ruleConfigLoader);
64+
initializeRuleConfig(ruleConfigs);
6465
}
6566

66-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
67+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
6768
if (RULE_CONFIG == null) {
6869
final String ruleName = "GetSyncPollerOnPollerFluxCheck";
69-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
70-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
70+
RULE_CONFIG = ruleConfigs.get(ruleName);
71+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
7172
}
7273
}
7374

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/HardcodedAPIKeysAndTokensCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
2424
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
2525
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
26+
import java.util.Map;
2627
import java.util.regex.Pattern;
2728
import javax.annotation.Nonnull;
2829
import org.jetbrains.annotations.NotNull;
@@ -37,7 +38,7 @@ public class HardcodedAPIKeysAndTokensCheck extends LocalInspectionTool {
3738
@NotNull
3839
@Override
3940
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
40-
return new APIKeysAndTokensVisitor(holder, RuleConfigLoader.getInstance());
41+
return new APIKeysAndTokensVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
4142
}
4243

4344
/**
@@ -49,16 +50,16 @@ static class APIKeysAndTokensVisitor extends JavaElementVisitor {
4950
private static RuleConfig RULE_CONFIG;
5051
private static boolean SKIP_WHOLE_RULE;
5152

52-
APIKeysAndTokensVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
53+
APIKeysAndTokensVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
5354
this.holder = holder;
54-
initializeRuleConfig(ruleConfigLoader);
55+
initializeRuleConfig(ruleConfigs);
5556
}
5657

57-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
58+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
5859
if (RULE_CONFIG == null) {
5960
final String ruleName = "HardcodedAPIKeysAndTokensCheck";
60-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
61-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
61+
RULE_CONFIG = ruleConfigs.get(ruleName);
62+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
6263
}
6364
}
6465
@Override

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/ServiceBusReceiverAsyncClientCheck.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
88
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.HelperUtils;
99
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
10+
import java.util.Map;
1011
import org.jetbrains.annotations.NotNull;
1112

1213
/**
@@ -18,7 +19,7 @@ public class ServiceBusReceiverAsyncClientCheck extends LocalInspectionTool {
1819
@Override
1920
public JavaElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
2021
return new ServiceBusReceiverAsyncClientCheck.ServiceBusReceiverAsyncClientCheckVisitor(holder,
21-
RuleConfigLoader.getInstance());
22+
RuleConfigLoader.getInstance().getRuleConfigs());
2223
}
2324

2425

@@ -32,18 +33,18 @@ static class ServiceBusReceiverAsyncClientCheckVisitor extends JavaElementVisito
3233
* Constructor to initialize the visitor with the holder and isOnTheFly flag.
3334
*
3435
* @param holder Holder for the problems found by the inspection
35-
* @param ruleConfigLoader RuleConfigLoader object to load the rule configuration
36+
* @param ruleConfigs Rule configurations for the inspection
3637
*/
37-
public ServiceBusReceiverAsyncClientCheckVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
38+
public ServiceBusReceiverAsyncClientCheckVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
3839
this.holder = holder;
39-
initializeRuleConfig(ruleConfigLoader);
40+
initializeRuleConfig(ruleConfigs);
4041
}
4142

42-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
43+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
4344
if (RULE_CONFIG == null) {
4445
final String ruleName = "ServiceBusReceiverAsyncClientCheck";
45-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
46-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
46+
RULE_CONFIG = ruleConfigs.get(ruleName);
47+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
4748
}
4849
}
4950

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/SingleOperationInLoopTextAnalyticsCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.microsoft.azure.toolkit.intellij.java.sdk.models.RuleConfig;
2525
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
2626
import java.util.List;
27+
import java.util.Map;
2728
import org.jetbrains.annotations.NotNull;
2829

2930
/**
@@ -52,7 +53,7 @@ public class SingleOperationInLoopTextAnalyticsCheck extends LocalInspectionTool
5253
@NotNull
5354
@Override
5455
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
55-
return new SingleOperationInLoopVisitor(holder, RuleConfigLoader.getInstance());
56+
return new SingleOperationInLoopVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
5657
}
5758

5859
/**
@@ -66,16 +67,16 @@ static class SingleOperationInLoopVisitor extends JavaElementVisitor {
6667
private static RuleConfig RULE_CONFIG;
6768
private static boolean SKIP_WHOLE_RULE;
6869

69-
public SingleOperationInLoopVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
70+
public SingleOperationInLoopVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
7071
this.holder = holder;
71-
initializeRuleConfig(ruleConfigLoader);
72+
initializeRuleConfig(ruleConfigs);
7273
}
7374

74-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
75+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
7576
if (RULE_CONFIG == null) {
7677
final String ruleName = "SingleOperationInLoopTextAnalyticsCheck";
77-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
78-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
78+
RULE_CONFIG = ruleConfigs.get(ruleName);
79+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
7980
}
8081
}
8182

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/analyzer/StorageUploadWithoutLengthCheck.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.microsoft.azure.toolkit.intellij.java.sdk.utils.RuleConfigLoader;
2222
import java.util.Arrays;
2323
import java.util.List;
24+
import java.util.Map;
2425
import org.jetbrains.annotations.NotNull;
2526

2627
/**
@@ -31,7 +32,7 @@ public class StorageUploadWithoutLengthCheck extends LocalInspectionTool {
3132
@NotNull
3233
@Override
3334
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
34-
return new StorageUploadVisitor(holder, RuleConfigLoader.getInstance());
35+
return new StorageUploadVisitor(holder, RuleConfigLoader.getInstance().getRuleConfigs());
3536
}
3637

3738
/**
@@ -44,16 +45,16 @@ static class StorageUploadVisitor extends JavaRecursiveElementWalkingVisitor {
4445
private static boolean SKIP_WHOLE_RULE;
4546

4647

47-
StorageUploadVisitor(ProblemsHolder holder, RuleConfigLoader ruleConfigLoader) {
48+
StorageUploadVisitor(ProblemsHolder holder, Map<String, RuleConfig> ruleConfigs) {
4849
this.holder = holder;
49-
initializeRuleConfig(ruleConfigLoader);
50+
initializeRuleConfig(ruleConfigs);
5051
}
5152

52-
private void initializeRuleConfig(RuleConfigLoader ruleConfigLoader) {
53+
private void initializeRuleConfig(Map<String, RuleConfig> ruleConfigs) {
5354
if (RULE_CONFIG == null) {
5455
final String ruleName = "StorageUploadWithoutLengthCheck";
55-
RULE_CONFIG = ruleConfigLoader.getRuleConfig(ruleName);
56-
SKIP_WHOLE_RULE = RULE_CONFIG.skipRuleCheck();
56+
RULE_CONFIG = ruleConfigs.get(ruleName);
57+
SKIP_WHOLE_RULE = RULE_CONFIG.isSkipRuleCheck();
5758
}
5859
}
5960
@Override

0 commit comments

Comments
 (0)