Feature/3465 support for java variants

src/dotnet/APIView/APIView/Model/CodeFile.cs

@@ -34,6 +34,8 @@ public string VersionString
 
         public string Language { get; set; }
 
+        public string LanguageVariant { get; set; }
+
         public string PackageName { get; set; }
 
         public string ServiceName { get; set; }

src/dotnet/APIView/APIViewWeb/Models/ReviewCodeFileModel.cs

@@ -14,7 +14,6 @@ public class ReviewCodeFileModel
         // This is field is more of a display name. It is set to name value returned by parser which has package name and version in following format
         // Package name ( Version )
         public string Name { get; set; }
-
         public string Language
         {
             get => _language ?? (Name.EndsWith(".json", StringComparison.OrdinalIgnoreCase) ? "Json" : "C#");
@@ -23,6 +22,8 @@ public string Language
 
         public string VersionString { get; set; }
 
+        public string LanguageVariant { get; set; }
+
         public bool HasOriginal { get; set; }
 
         public DateTime CreationDate { get; set; } = DateTime.Now;
@@ -36,4 +37,4 @@ public string Language
         // This field stores original file name uploaded to create review
         public string FileName { get; set; }
     }
-}
+}

src/dotnet/APIView/APIViewWeb/Models/ReviewModel.cs

@@ -78,6 +78,9 @@ public string DisplayName
         [JsonIgnore]
         public string Language => Revisions.LastOrDefault()?.Files.LastOrDefault()?.Language;
 
+        [JsonIgnore]
+        public string LanguageVariant => Revisions.LastOrDefault()?.Files.LastOrDefault()?.LanguageVariant;
+
         [JsonIgnore]
         public string PackageName {
             get

src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml

@@ -32,7 +32,25 @@
                         imageSource = "icons/go-original.svg";
                         break;
                     case "java":
-                        imageSource = "icons/java-original.svg";
+                        if(@Model.Review.LanguageVariant != null)
+                        {
+                            switch(@Model.Review.LanguageVariant.ToLower())
+                            {
+                                case "spring":
+                                    imageSource = "icons/java-spring-original.svg";
+                                    break;
+                                case "android":
+                                    imageSource = "icons/java-android-original.svg";
+                                    break;
+                                default:
+                                    imageSource = "icons/java-original.svg";
+                                    break;
+                            }
+                        }
+                        else
+                        {
+                            imageSource = "icons/java-original.svg";
+                        }
                         break;
                     case "swift":
                         imageSource = "icons/swift-original.svg";
@@ -49,11 +67,11 @@
                 }
                 if (String.IsNullOrEmpty(imageSource))
                 {
-                    <span class="badge badge-info"><em>@Model.Review.Language</em></span> 
+                    <span class="badge badge-info"><em>@Model.Review.Language @Model.Review.LanguageVariant</em></span> 
                 }
                 else
                 {
-                    <span><img class="mr-2 mt-1 p-1 border rounded" src="~/@imageSource" width="34" alt="@Model.Review.Language" /></span>   
+                    <span><img class="mr-2 mt-1 p-1 border rounded" src="~/@imageSource" width="34" alt="@Model.Review.Language @Model.Review.LanguageVariant" /></span>   
                 } 
             }
             <p class="h6 mb-0 mr-auto">

src/dotnet/APIView/APIViewWeb/Pages/Shared/_ReviewsPartial.cshtml

@@ -46,7 +46,25 @@
                                             <img class="mx-1" src="~/icons/go-original.svg" alt="@review.Language">
                                             break;
                                         case "java":
-                                            <img class="mx-1" src="~/icons/java-original.svg" alt="@review.Language">
+                                            if(@review.LanguageVariant != null)
+                                            {
+                                                switch(@review.LanguageVariant.ToLower())
+                                                {
+                                                    case "spring":
+                                                        <img class="mx-1" src="~/icons/java-spring-original.svg" alt="@review.Language @review.LanguageVariant">
+                                                        break;
+                                                    case "android":
+                                                        <img class="mx-1" src="~/icons/java-android-original.svg" alt="@review.Language @review.LanguageVariant">
+                                                        break;
+                                                    default:
+                                                        <img class="mx-1" src="~/icons/java-original.svg" alt="@review.Language">
+                                                        break;
+                                                }
+                                            }
+                                            else
+                                            {
+                                                <img class="mx-1" src="~/icons/java-original.svg" alt="@review.Language">
+                                            }
                                             break;
                                         case "swift":
                                             <img class="mx-1" src="~/icons/swift-original.svg" alt="@review.Language">

src/dotnet/APIView/APIViewWeb/Repositories/ReviewManager.cs

@@ -361,6 +361,7 @@ public async Task ToggleIsClosedAsync(ClaimsPrincipal user, string id)
         private void InitializeFromCodeFile(ReviewCodeFileModel file, CodeFile codeFile)
         {
             file.Language = codeFile.Language;
+            file.LanguageVariant = codeFile.LanguageVariant;
             file.VersionString = codeFile.VersionString;
             file.Name = codeFile.Name;
             file.PackageName = codeFile.PackageName;

src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/Main.java

@@ -6,6 +6,7 @@
 import com.azure.tools.apiview.processor.model.APIListing;
 import com.azure.tools.apiview.processor.model.Diagnostic;
 import com.azure.tools.apiview.processor.model.DiagnosticKind;
+import com.azure.tools.apiview.processor.model.LanguageVariant;
 import com.azure.tools.apiview.processor.model.Token;
 import com.azure.tools.apiview.processor.model.maven.Pom;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -157,6 +158,15 @@ private static void processJavaSourcesJar(File inputFile, APIListing apiListing)
         apiListing.setLanguage("Java");
         apiListing.setMavenPom(reviewProperties.getMavenPom());
 
+        if(groupId.contains("spring")) {
+            apiListing.setLanguageVariant(LanguageVariant.SPRING);
+        } else if(groupId.contains("android")) {
+            apiListing.setLanguageVariant(LanguageVariant.ANDROID);
+        } else {
+            apiListing.setLanguageVariant(LanguageVariant.DEFAULT);
+        }
+        System.out.println("  Using '" + apiListing.getLanguageVariant() + "' for the language variant");
+
         final Analyser analyser = new JavaASTAnalyser(inputFile, apiListing);
 
         // Read all files within the jar file so that we can create a list of files to analyse

src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/APIListing.java

@@ -23,6 +23,9 @@ public class APIListing {
     @JsonProperty("Language")
     private String language;
 
+    @JsonProperty("LanguageVariant")
+    private LanguageVariant languageVariant;
+
     @JsonProperty("PackageName")
     private String packageName;
 
@@ -91,6 +94,14 @@ public void setLanguage(final String language) {
         this.language = language;
     }
 
+    public LanguageVariant getLanguageVariant() {
+        return languageVariant;
+    }
+
+    public void setLanguageVariant(final LanguageVariant variant) {
+        this.languageVariant = variant;
+    }
+
     public String getPackageName() {
         return packageName;
     }

src/java/apiview-java-processor/src/main/java/com/azure/tools/apiview/processor/model/LanguageVariant.java

@@ -0,0 +1,21 @@
+package com.azure.tools.apiview.processor.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum LanguageVariant {
+    DEFAULT("Default"),
+    SPRING("Spring"),
+    ANDROID("Android");
+
+    private final String variantName;
+
+    LanguageVariant(String name) {
+        this.variantName = name;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return this.variantName;
+    }
+}