Merge pull request #6085 from microsoft/sdkbook/1894061

#1894061: maven repo link is not correct on sdk deprecation notification when there are multiple replaces.

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureIntegerInput.java

@@ -12,6 +12,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 public class AzureIntegerInput extends BaseAzureTextInput<Integer> {
 
@@ -39,8 +40,12 @@ public void setValue(final Integer val) {
 
     @Nonnull
     public AzureValidationInfo doValidate(Integer value) {
-        if (value < minValue || value > maxValue) {
+        if (Objects.nonNull(minValue) && Objects.nonNull(maxValue) && (value < minValue || value > maxValue)) {
             return AzureValidationInfo.error(String.format("Value should be in range [%d, %d]", minValue, maxValue), this);
+        } else if (Objects.nonNull(minValue) && value < minValue) {
+            return AzureValidationInfo.error(String.format("Value should be >= %d", minValue), this);
+        } else if (Objects.nonNull(maxValue) && value > maxValue) {
+            return AzureValidationInfo.error(String.format("Value should be <= %d", maxValue), this);
         } else {
             return AzureValidationInfo.success(this);
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureTextInput.java

@@ -5,15 +5,15 @@
 
 package com.microsoft.azure.toolkit.intellij.common;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 import javax.swing.*;
 
 public class AzureTextInput extends BaseAzureTextInput<String> {
     public AzureTextInput() {
-        this(null);
+        super();
     }
 
-    public AzureTextInput(@Nullable JTextField comp) {
+    public AzureTextInput(@Nonnull JTextField comp) {
         super(comp);
     }
 

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

@@ -23,6 +23,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -62,12 +63,15 @@ private static void warnDeprecatedLibs(@AzureTelemetry.Property List<? extends A
     private static String buildMessage(@Nonnull List<? extends AzureJavaSdkEntity> libs) {
         final String liPackages = libs.stream().map(l -> {
             if (StringUtils.isNotBlank(l.getReplace())) {
-                final String replacePackage = l.getReplace().trim();
+                final String[] replacePackages = l.getReplace().trim().split(",");
+                final String replaces = Arrays.stream(replacePackages)
+                    .map(p -> String.format("<a href='%s'>%s</a>", getMavenArtifactUrl(p.trim()), p.trim()))
+                    .collect(Collectors.joining(", "));
                 return String.format("<li>%s" +
-                        "   <ul style='margin-top:0;margin-bottom:0;padding:0'>" +
-                        "       <li>Replaced by: <a href='%s'>%s</a></li>" +
-                        "   </ul>" +
-                        "</li>", l.getPackageName(), getMavenArtifactUrl(replacePackage), replacePackage);
+                    "   <ul style='margin-top:0;margin-bottom:0;padding:0'>" +
+                    "       <li>Replaced by: %s</li>" +
+                    "   </ul>" +
+                    "</li>", l.getPackageName(), replaces);
             } else {
                 return String.format("<li>%s</li>", l.getPackageName());
             }

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

@@ -6,6 +6,8 @@
 package com.microsoft.azure.toolkit.intellij.azuresdk.referencebook;
 
 import com.intellij.ui.components.JBScrollPane;
+import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import lombok.Getter;
 
 import javax.swing.*;
@@ -22,7 +24,7 @@ public class AzureSdkReferenceBookPanel {
     public AzureSdkReferenceBookPanel() {
         this.contentPanel.setPreferredSize(new Dimension(840, 600));
         this.initListeners();
-        this.servicesTreePanel.refresh();
+        AzureTaskManager.getInstance().runInBackground(AzureString.fromString("loading Azure SDK data"), () -> this.servicesTreePanel.refresh());
     }
 
     private void initListeners() {

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

@@ -104,14 +104,14 @@ private void filter(final String text) {
 
     public void refresh(boolean... force) {
         try {
-            if(ArrayUtils.isNotEmpty(force) && force[0]){
+            if (ArrayUtils.isNotEmpty(force) && force[0]) {
                 AzureSdkLibraryService.refresh();
             }
             this.services = AzureSdkLibraryService.loadAzureSdkServices();
             this.categories = AzureSdkCategoryService.loadAzureSDKCategories();
             this.fillDescriptionFromCategoryIfMissing(this.categories, this.services);
             this.filter.debounce();
-            Optional.ofNullable(this.lastNodePath).ifPresent(p -> TreeUtil.selectPath(this.tree, p));
+            AzureTaskManager.getInstance().runLater(() -> Optional.ofNullable(this.lastNodePath).ifPresent(p -> TreeUtil.selectPath(this.tree, p)));
         } catch (final IOException e) {
             //TODO: messager.warning(...)
             e.printStackTrace();