Migrate FindBugsCompileAfterHook and PluginSuggestion from services t…

…o simple classes
JetBrains · Jul 7, 2020 · aaa4a58 · aaa4a58
1 parent e4dfbc0
commit aaa4a58
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/...core/FindBugsCompileAfterHookService.java → ...otbugs/core/FindBugsCompileAfterHook.java b/...core/FindBugsCompileAfterHookService.java → ...otbugs/core/FindBugsCompileAfterHook.java
@@ -49,7 +49,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-public class FindBugsCompileAfterHookService {
+public class FindBugsCompileAfterHook {
 
 	private static final int DEFAULT_DELAY_MS = 30000;
 	private static final int DELAY_MS = StringUtil.parseInt(System.getProperty("idea.findbugs.autoanalyze.delaymillis", String.valueOf(DEFAULT_DELAY_MS)), DEFAULT_DELAY_MS);

diff --git a/...potbugs/core/PluginSuggestionService.java → ...ugins/spotbugs/core/PluginSuggestion.java b/...potbugs/core/PluginSuggestionService.java → ...ugins/spotbugs/core/PluginSuggestion.java
@@ -40,27 +40,22 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public final class PluginSuggestionService {
+public final class PluginSuggestion {
 
 	private static final String NOTIFICATION_GROUP_ID_PLUGIN_SUGGESTION = "SpotBugs: Plugin Suggestion";
 	private static final NotificationGroup NOTIFICATION_GROUP_PLUGIN_SUGGESTION = new NotificationGroup(NOTIFICATION_GROUP_ID_PLUGIN_SUGGESTION, NotificationDisplayType.STICKY_BALLOON, false);
-	private final Project myProject;
 
-	public PluginSuggestionService(@NotNull final Project project) {
-		myProject = project;
-	}
-
-	public void suggestPlugins() {
-		final ProjectSettings settings = ProjectSettings.getInstance(myProject);
+	public static void suggestPlugins(@NotNull final Project project) {
+		final ProjectSettings settings = ProjectSettings.getInstance(project);
 		if (!NotificationUtil.isGroupEnabled(NOTIFICATION_GROUP_ID_PLUGIN_SUGGESTION)) {
 			return;
 		}
 		if (isAndroidFindbugsPluginEnabled(settings)) {
 			return;
 		}
-		final Set<Suggestion> suggestions = collectSuggestions(myProject, settings);
+		final Set<Suggestion> suggestions = collectSuggestions(project, settings);
 		if (!suggestions.isEmpty()) {
-			showSuggestions(myProject, suggestions);
+			showSuggestions(project, suggestions);
 		}
 	}
 

diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectOpenCloseListener.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ProjectOpenCloseListener.java
@@ -39,7 +39,7 @@ public ProjectOpenCloseListener() {
             public void compilationFinished(final boolean aborted, final int errors, final int warnings, final @NotNull CompileContext compileContext) {
                 // note that this is not invoked when auto make trigger compilation
                 if (!aborted && errors == 0) {
-                    FindBugsCompileAfterHookService.initWorker(compileContext);
+                    FindBugsCompileAfterHook.initWorker(compileContext);
                 }
             }
 
@@ -56,12 +56,11 @@ public void fileGenerated(final String s) {
     @Override
     public void projectOpened(@NotNull Project project) {
         CompilerManager.getInstance(project).addCompilationStatusListener(compilationStatusListener);
-        if (FindBugsCompileAfterHookService.isAfterAutoMakeEnabled(project)) {
-            FindBugsCompileAfterHookService.setAnalyzeAfterAutomake(project, true);
+        if (FindBugsCompileAfterHook.isAfterAutoMakeEnabled(project)) {
+            FindBugsCompileAfterHook.setAnalyzeAfterAutomake(project, true);
         }
 
-        PluginSuggestionService pluginSuggestionService = project.getService(PluginSuggestionService.class);
-        pluginSuggestionService.suggestPlugins();
+        PluginSuggestion.suggestPlugins(project);
         new RFilerFilterSuggestion(project).suggest();
 
         LegacyProjectSettingsConverter.convertSettings(project);
@@ -70,6 +69,6 @@ public void projectOpened(@NotNull Project project) {
     @Override
     public void projectClosed(@NotNull Project project) {
         CompilerManager.getInstance(project).removeCompilationStatusListener(compilationStatusListener);
-        FindBugsCompileAfterHookService.setAnalyzeAfterAutomake(project, false);
+        FindBugsCompileAfterHook.setAnalyzeAfterAutomake(project, false);
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -156,8 +156,6 @@
                             displayName="SpotBugs"/>
         <checkinHandlerFactory implementation="org.jetbrains.plugins.spotbugs.core.CheckinHandlerFactoryImpl"/>
         <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.ProblemCacheService"/>
-        <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.PluginSuggestionService"/>
-        <projectService serviceImplementation="org.jetbrains.plugins.spotbugs.core.FindBugsCompileAfterHookService"/>
     </extensions>
     <extensions defaultExtensionNs="com.intellij">
         <errorHandler implementation="org.jetbrains.plugins.spotbugs.core.ErrorReportSubmitterImpl"/>