Merge pull request #9765 from srnagar/expand-groupid

Include spring and management group ids in Maven Report

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/src/main/java/com/microsoft/azure/toolkit/intellij/java/sdk/MavenProjectReportGenerator.java

@@ -166,16 +166,17 @@ private void analyzePom(MavenProjectsManager mavenProjectsManager, MavenProject
                     final Optional<DeprecatedDependency> deprecatedDependency = DeprecatedDependencyUtil.lookupReplacement(groupId, artifactId);
                     deprecatedDependency.ifPresent(deprecatedDependencies::add);
 
-                    if (AZURE_GROUP_ID.equals(groupId)) {
+                    final boolean isAzureGroupId = isAzureGroupId(groupId);
+                    if (isAzureGroupId) {
                         azureDependencies.add(dependency.getMavenId().getDisplayString());
                     }
 
-                    if (report.getBomVersion() == null && AZURE_GROUP_ID.equals(groupId) && versionId != null && !versionId.contains("beta")) {
+                    if (report.getBomVersion() == null && isAzureGroupId && versionId != null && !versionId.contains("beta")) {
                         report.addError(new Error("Azure SDK BOM not used",
                                 ErrorCode.BOM_NOT_USED, ErrorLevel.WARNING, List.of(dependency.getMavenId().getDisplayString())));
                     }
 
-                    if (AZURE_GROUP_ID.equals(groupId) && versionId != null && versionId.contains("beta")) {
+                    if (isAzureGroupId && versionId != null && versionId.contains("beta")) {
                         report.addError(new Error("Beta version of the library used",
                                 ErrorCode.BETA_DEPENDENCY_USED, ErrorLevel.WARNING, List.of(dependency.getMavenId().getDisplayString())));
                     }
@@ -184,6 +185,10 @@ private void analyzePom(MavenProjectsManager mavenProjectsManager, MavenProject
         report.addAllDeprecatedDependencies(deprecatedDependencies);
     }
 
+    private static boolean isAzureGroupId(String groupId) {
+        return groupId != null && groupId.startsWith(AZURE_GROUP_ID);
+    }
+
     private void analyzeCode(MavenProjectsManager mavenProjectsManager, MavenProject mavenProject, MavenProjectReport report) {
         final Map<String, Integer> methodCallFrequency = new HashMap<>();
         final Map<String, Integer> betaMethodCallFrequency = new HashMap<>();
@@ -284,7 +289,7 @@ private void checkDependencyManagement(MavenProjectsManager mavenProjectsManager
                         final String artifactId = getTextValue(dependencyTag, "artifactId");
                         final String versionId = getTextValue(dependencyTag, "version");
 
-                        if (AZURE_GROUP_ID.equals(groupId) && AZURE_SDK_BOM.equals(artifactId)) {
+                        if (isAzureGroupId(groupId) && AZURE_SDK_BOM.equals(artifactId)) {
                             final String latestArtifactVersion = MavenUtils.getLatestArtifactVersion(groupId, artifactId);
                             if (versionId != null && !versionId.equals(latestArtifactVersion)) {
                                 report.setBomVersion(versionId);