Remove dependency for azuretools-core and better naming

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/build.gradle

@@ -29,11 +29,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2', {
         exclude group: "com.fasterxml.jackson", module: "jackson-bom"
     }
-    compile 'com.microsoft.azuretools:azuretools-core:3.51.0-SNAPSHOT', {
-        exclude group: "com.microsoft.azure", module: "azure-client-authentication"
-        exclude group: "com.microsoft.azure", module: "azure-client-runtime"
-        exclude group: "javax.xml.bind", module: "jaxb-api"
-    }
     compile project(':azure-intellij-plugin-lib')
     compile "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
 

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/dependencesurvey/activity/WorkspaceTaggingActivity.java

@@ -10,20 +10,24 @@
 import com.intellij.openapi.roots.OrderEnumerator;
 import com.intellij.openapi.startup.StartupActivity;
 import com.microsoft.azure.toolkit.intellij.azuresdk.service.WorkspaceTaggingService;
-import com.microsoft.azuretools.telemetry.TelemetryConstants;
-import com.microsoft.azuretools.telemetrywrapper.EventType;
-import com.microsoft.azuretools.telemetrywrapper.EventUtil;
+import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
+import com.microsoft.azure.toolkit.lib.common.telemetry.Telemetry;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 public class WorkspaceTaggingActivity implements StartupActivity.DumbAware {
     private static final Pattern PATTERN = Pattern.compile("(Gradle|Maven): (.*):(.*):(.*)");
+    private static final String WORKSPACE_TAGGING = "workspace-tagging";
+    private static final String OPERATION_NAME = "operationName";
+    private static final String SERVICE_NAME = "serviceName";
+    private static final String SYSTEM = "system";
+    private static final String TAG = "tag";
 
     @Override
     public void runActivity(@NotNull final Project project) {
@@ -43,7 +47,14 @@ private void trackProjectDependencies(@NotNull final Project project) {
             }
             return true;
         });
-        final Map<String, String> properties = tagSet.stream().collect(Collectors.toMap(tag -> tag, tag -> "true"));
-        EventUtil.logEvent(EventType.info, TelemetryConstants.SYSTEM, TelemetryConstants.WORKSPACE_TAGGING, properties);
+        sendWorkspaceTaggingTelemetry(tagSet);
+    }
+
+    private void sendWorkspaceTaggingTelemetry(final Set<String> tagSet) {
+        final Map<String, String> properties = new HashMap<>();
+        properties.put(SERVICE_NAME, SYSTEM);
+        properties.put(OPERATION_NAME, WORKSPACE_TAGGING);
+        properties.put(TAG, StringUtils.join(tagSet, ","));
+        AzureTelemeter.log(Telemetry.Type.INFO, properties);
     }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/service/WorkspaceTaggingService.java

@@ -37,12 +37,12 @@ public static String getWorkspaceTag(String groupId, final String artifactId) {
         if (StringUtils.isAnyEmpty(groupId, artifactId)) {
             return null;
         }
-        return ObjectUtils.firstNonNull(getAzureArtifactTag(groupId, artifactId), getDependencyTag(groupId, artifactId));
+        return ObjectUtils.firstNonNull(getAzureDependencyTag(groupId, artifactId), getExternalDependencyTag(groupId, artifactId));
     }
 
-    private static String getAzureArtifactTag(final String groupId, final String artifactId) {
+    private static String getAzureDependencyTag(final String groupId, final String artifactId) {
         try {
-            return getAzureSDKArtifacts()
+            return getAzureSDKEntities()
                 .stream()
                 .filter(entity -> StringUtils.isNotEmpty(entity.getType())
                     && StringUtils.equalsIgnoreCase(entity.getGroupId(), groupId)
@@ -55,12 +55,12 @@ private static String getAzureArtifactTag(final String groupId, final String art
         }
     }
 
-    private static String getDependencyTag(final String groupId, final String artifactId) {
+    private static String getExternalDependencyTag(final String groupId, final String artifactId) {
         try {
             return getWorkspaceTagEntities()
                 .stream()
-                .filter(entity -> (StringUtils.equalsIgnoreCase(entity.getGroupId(), groupId) || entity.getGroupId().matches(groupId))
-                    && (StringUtils.equalsIgnoreCase(entity.getArtifactId(), artifactId) || entity.getArtifactId().matches(artifactId)))
+                .filter(entity -> (StringUtils.isEmpty(entity.getGroupId()) || StringUtils.equalsIgnoreCase(entity.getGroupId(), groupId))
+                    && (StringUtils.isEmpty(entity.getArtifactId()) || StringUtils.equalsIgnoreCase(entity.getArtifactId(), artifactId)))
                 .map(WorkspaceTagEntity::getTag)
                 .findFirst().orElse(null);
         } catch (IOException e) {
@@ -80,7 +80,7 @@ public static List<WorkspaceTagEntity> getWorkspaceTagEntities(boolean... force)
 
     @Preload
     @Cacheable(value = "workspace-tag-azure", condition = "!(force&&force[0])")
-    public static List<AzureJavaSdkEntity> getAzureSDKArtifacts(boolean... force) throws IOException {
+    public static List<AzureJavaSdkEntity> getAzureSDKEntities(boolean... force) throws IOException {
         final URL destination = new URL(SDK_METADATA_URL);
         final CsvSchema schema = CsvSchema.emptySchema().withHeader();
         final MappingIterator<AzureJavaSdkEntity> mappingIterator = CSV_MAPPER.readerFor(AzureJavaSdkEntity.class).with(schema).readValues(destination);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/workspaceTag.json

@@ -20,7 +20,7 @@
 	{ "groupId": "org.redisson", "artifactId": "redisson", "tag": "redis" },
 	{ "groupId": "io.lettuce", "artifactId": "lettuce-core", "tag": "redis" },
 	// spring boot
-	{ "groupId": "org.springframework.boot", "artifactId": ".*", "tag": "springboot" },
+	{ "groupId": "org.springframework.boot", "artifactId": "", "tag": "springboot" },
 	// sql
 	{ "groupId": "org.jooq", "artifactId": "jooq", "tag": "sql" },
 	{ "groupId": "org.mybatis", "artifactId": "mybatis", "tag": "sql" },

Utils/azuretools-core/src/com/microsoft/azuretools/telemetry/TelemetryConstants.java

@@ -181,7 +181,6 @@ public class TelemetryConstants {
     public static final String UPDATE_A_CLUSTER = "update-a-cluster";
     public static final String SHOW_WHATS_NEW = "show-whats-new";
     public static final String UNHANDLED_EXCEPTION = "unhandled-exception";
-    public static final String WORKSPACE_TAGGING = "workspace-tagging";
     // property name
     public static final String WEBAPP_DEPLOY_TO_SLOT = "webappDeployToSlot";
     public static final String RUNTIME = "runtime";