Merge IJ-MR-24582: [maven] collect cases when user has added module/library/folder...

GitOrigin-RevId: 8ea64a464a6529f2bd7d14c4d02e65f2575ac2bc

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporterImpl.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporterImpl.java
index 6835746b37413b1aa139b4a7abb0bc0b838e8e4d..2a1e3ed2280504870dca78493bb466a51666a47c 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporterImpl.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporterImpl.java
@@ -36,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.project.*;
+import org.jetbrains.idea.maven.statistics.MavenImportCollector;
 import org.jetbrains.idea.maven.utils.MavenLog;
 import org.jetbrains.idea.maven.utils.MavenUtil;
 import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions;
@@ -615,9 +616,14 @@ class MavenProjectImporterImpl extends MavenProjectImporterBase {
 
     boolean removed = false;
     for (Library each : unusedLibraries) {
-      if (!isDisposed(each) && MavenRootModelAdapter.isMavenLibrary(each) && !MavenRootModelAdapter.isChangedByUser(each)) {
-        myModelsProvider.removeLibrary(each);
-        removed = true;
+      if (!isDisposed(each) && MavenRootModelAdapter.isMavenLibrary(each)) {
+        if (!MavenRootModelAdapter.isChangedByUser(each)) {
+          myModelsProvider.removeLibrary(each);
+          removed = true;
+        }
+        else {
+          MavenImportCollector.HAS_USER_MODIFIED_IMPORTED_LIBRARY.log(myProject);
+        }
       }
     }
     return removed;

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapterLegacyImpl.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapterLegacyImpl.java
index ff3850ff772751c7e4630a3ef0fa1e0082bf4a9a..b470cdddfd08fcfc53eae4ad188f33fe52f10baa 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapterLegacyImpl.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapterLegacyImpl.java
@@ -20,6 +20,7 @@ import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
+import org.jetbrains.idea.maven.statistics.MavenImportCollector;
 import org.jetbrains.idea.maven.utils.MavenUtil;
 import org.jetbrains.idea.maven.utils.Path;
 import org.jetbrains.idea.maven.utils.Url;
@@ -94,10 +95,16 @@ public class MavenRootModelAdapterLegacyImpl implements MavenRootModelAdapterInt
 
       if (e instanceof LibraryOrderEntry) {
         if (Registry.is("maven.always.remove.bad.entries")) {
-          if (!isMavenLibrary((LibraryOrderEntry)e)) continue;
+          if (!isMavenLibrary((LibraryOrderEntry)e)) {
+            MavenImportCollector.HAS_USER_ADDED_LIBRARY_DEP.log(myRootModel.getProject());
+            continue;
+          }
         }
         else {
-          if (!isMavenLibrary(((LibraryOrderEntry)e).getLibrary())) continue;
+          if (!isMavenLibrary(((LibraryOrderEntry)e).getLibrary())) {
+            MavenImportCollector.HAS_USER_ADDED_LIBRARY_DEP.log(myRootModel.getProject());
+            continue;
+          }
         }
       }
       if (e instanceof ModuleOrderEntry) {
@@ -105,6 +112,7 @@ public class MavenRootModelAdapterLegacyImpl implements MavenRootModelAdapterInt
         if (m != null &&
             !MavenProjectsManager.getInstance(myRootModel.getProject()).isMavenizedModule(m) &&
             ExternalSystemModulePropertyManager.getInstance(m).getExternalSystemId() == null) {
+          MavenImportCollector.HAS_USER_ADDED_MODULE_DEP.log(myRootModel.getProject());
           continue;
         }
       }

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenImportCollector.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenImportCollector.kt
new file mode 100644 (file)
index 0000000..1159d89
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenImportCollector.kt
@@ -0,0 +1,24 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.idea.maven.statistics
+
+import com.intellij.internal.statistic.eventLog.EventLogGroup
+import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
+
+class MavenImportCollector : CounterUsagesCollector() {
+  companion object {
+    val GROUP = EventLogGroup("maven.import", 1)
+
+    @JvmField
+    val HAS_USER_ADDED_LIBRARY_DEP = GROUP.registerEvent("hasUserAddedLibraryDependency")
+
+    @JvmField
+    val HAS_USER_ADDED_MODULE_DEP = GROUP.registerEvent("hasUserAddedModuleDependency")
+
+    @JvmField
+    val HAS_USER_MODIFIED_IMPORTED_LIBRARY = GROUP.registerEvent("hasUserModifiedImportedLibrary")
+  }
+
+  override fun getGroup(): EventLogGroup {
+    return GROUP
+  }
+}
\ No newline at end of file

diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index ecfd837e6b0e2d6d8a4b6e451dcfdaf568f64e58..d2212b937ec2e16a1c660203ed18b612d48874ae 100644 (file)
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -262,6 +262,7 @@
 
     <statistics.projectUsagesCollector implementation="org.jetbrains.idea.maven.statistics.MavenSettingsCollector"/>
     <statistics.counterUsagesCollector implementationClass="org.jetbrains.idea.maven.statistics.MavenActionsUsagesCollector"/>
+    <statistics.counterUsagesCollector implementationClass="org.jetbrains.idea.maven.statistics.MavenImportCollector"/>
     <statistics.counterUsagesCollector groupId="build.maven.packagesearch" version="2"/>
 
     <registryKey key="maven.linear.import" defaultValue="false"