Refactor logic to exclude functions-java-library/function-java-core-library, fixes #7116

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/core/FunctionUtils.java

@@ -5,7 +5,6 @@
 
 package com.microsoft.azure.toolkit.intellij.legacy.function.runner.core;
 
-import com.google.gson.JsonObject;
 import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.MetaAnnotationUtil;
 import com.intellij.lang.jvm.JvmAnnotation;
@@ -52,6 +51,7 @@
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
@@ -69,6 +69,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
@@ -77,7 +79,6 @@
 public class FunctionUtils {
     private static final int MAX_PORT = 65535;
 
-    public static final String FUNCTION_JAVA_LIBRARY_ARTIFACT_ID = "azure-functions-java-library";
     private static final String AZURE_FUNCTION_ANNOTATION_CLASS =
             "com.microsoft.azure.functions.annotation.FunctionName";
     private static final String FUNCTION_JSON = "function.json";
@@ -94,6 +95,7 @@ public class FunctionUtils {
     private static final String AZURE_FUNCTIONS_APP_SETTINGS = "Azure Functions App Settings";
     private static final String AZURE_FUNCTIONS_JAVA_LIBRARY = "azure-functions-java-library";
     private static final String AZURE_FUNCTIONS_JAVA_CORE_LIBRARY = "azure-functions-java-core-library";
+    private static final Pattern ARTIFACT_NAME_PATTERN = Pattern.compile("(.*)-(\\d+\\.)?(\\d+\\.)?(\\*|\\d+).*");
 
     static {
         //initialize required attributes, which will be saved to function.json even if it equals to its default value
@@ -179,7 +181,7 @@ public static boolean isFunctionProject(Project project) {
         }
         final List<Library> libraries = new ArrayList<>();
         OrderEnumerator.orderEntries(project).productionOnly().forEachLibrary(library -> {
-            if (StringUtils.contains(library.getName(), FUNCTION_JAVA_LIBRARY_ARTIFACT_ID)) {
+            if (StringUtils.containsAnyIgnoreCase(library.getName(), AZURE_FUNCTIONS_JAVA_LIBRARY, AZURE_FUNCTIONS_JAVA_CORE_LIBRARY)) {
                 libraries.add(library);
             }
             return true;
@@ -295,18 +297,25 @@ public static Map<String, FunctionConfiguration> prepareStagingFolder(Path stagi
             });
         }
         final String libraryToExclude = dependencies.stream()
-                .filter(artifact -> StringUtils.equalsAnyIgnoreCase(artifact.getName(), AZURE_FUNCTIONS_JAVA_CORE_LIBRARY))
-                .map(File::getName).findFirst().orElse(AZURE_FUNCTIONS_JAVA_LIBRARY);
+                .map(FunctionUtils::getArtifactIdFromFile)
+                .filter(name -> StringUtils.equalsAnyIgnoreCase(name, AZURE_FUNCTIONS_JAVA_CORE_LIBRARY))
+                .findFirst().orElse(AZURE_FUNCTIONS_JAVA_LIBRARY);
 
         final File libFolder = new File(stagingFolder.toFile(), "lib");
         for (final File file : dependencies) {
-            if (!StringUtils.containsIgnoreCase(file.getName(), libraryToExclude)) {
+            if (!StringUtils.equalsIgnoreCase(getArtifactIdFromFile(file), libraryToExclude)) {
                 FileUtils.copyFileToDirectory(file, libFolder);
             }
         }
         return configMap;
     }
 
+    private static String getArtifactIdFromFile(@Nonnull final File file) {
+        final Matcher matcher = ARTIFACT_NAME_PATTERN.matcher(file.getName());
+        return matcher.matches() ? StringUtils.substringBeforeLast(file.getName(), "-") :
+                StringUtils.substringBeforeLast(file.getName(), ".jar");
+    }
+
     public static String getTargetFolder(Module module) {
         if (module == null) {
             return StringUtils.EMPTY;