cosmetics

Author: HanSolo

src/main/java/io/foojay/api/distribution/GraalVM.java

@@ -349,7 +349,7 @@ private List<Pkg> getAllPkgs(final String query, final ReleaseStatus releaseStat
         }
     }
 
-    public List<Pkg> getAllPkgsFrom17AndAbove(final boolean onlyNewPkgs) {
+    public List<Pkg> getAllPkgsFrom17AndAbove(final boolean includingEA, final boolean onlyNewPkgs) {
         final List<Pkg>                                                  pkgs             = new ArrayList<>();
         final String                                                     baseUrl          = "https://download.oracle.com/graalvm/";
         final List<OperatingSystem>                                      operatingSystems = List.of(OperatingSystem.LINUX, OperatingSystem.MACOS, OperatingSystem.WINDOWS);
@@ -429,15 +429,20 @@ public List<Pkg> getAllPkgsFrom17AndAbove(final boolean onlyNewPkgs) {
                                      });
                                  });
                              });
+
+        if (includingEA) {
+            pkgs.addAll(getEaBuildsFromGithub());
+        }
+
         return pkgs;
     }
 
     public List<Pkg> getEaBuildsFromGithub() {
+        LOGGER.error("Fetching ea-pkgs from github");
         List<Pkg> pkgsFound = new ArrayList<>();
         CacheManager.INSTANCE.getMajorVersions().stream().filter(majorVersion -> majorVersion.getAsInt() > 21).forEach(majorVersion -> {
             String jsonFilename = majorVersion.getAsInt() + "-ea.json";
             String eaJsonUri    = EA_BUILDS_URL + jsonFilename;
-            System.out.println(eaJsonUri);
             try {
                 HttpResponse<String> response = Helper.get(eaJsonUri);
                 if (null != response) {
@@ -494,6 +499,7 @@ public List<Pkg> getEaBuildsFromGithub() {
                         }
                     }
                 }
+                LOGGER.error("Successfully fetched {} ea-pkgs from github", pkgsFound.size());
             } catch (Exception e) {
                 LOGGER.error("Error reading {} file from github. {}", jsonFilename, e.getMessage());
             }

src/main/java/io/foojay/api/distribution/LibericaNative.java

@@ -194,7 +194,7 @@ public class LibericaNative implements Distribution {
 
     public List<Pkg> getAllPkgs(final boolean onlyNewPkgs) {
         final List<Pkg>           pkgsFound = new ArrayList<>();
-        final String              apiUrl    = "https://api.bell-sw.com/v1/nik/releases?bundle-type=standard&components=liberica&fields=bitness,components,os,downloadUrl,LTS,bundleType,packageType,version,filename,size,GA,architecture&components=nik";
+        final String              apiUrl    = "https://api.bell-sw.com/v1/nik/releases?bundle-type=standard&bundle-type=full&components=liberica&fields=bitness,components,os,downloadUrl,LTS,bundleType,packageType,version,filename,size,GA,architecture&components=nik";
         final Map<String, String> headers   = new HashMap<>();
         headers.put("accept", "application/json");
 
@@ -217,9 +217,14 @@ public List<Pkg> getAllPkgs(final boolean onlyNewPkgs) {
                         pkg.setFPU(FPU.UNKNOWN);
                         pkg.setDirectlyDownloadable(true);
                         pkg.setFreeUseInProduction(true);
-                        pkg.setJavaFXBundled(false);
                         pkg.setPackageType(JDK);
 
+                        boolean bundleTypeFull = false;
+                        if (pkgJsonObj.has(FIELD_BUNDLE_TYPE)) {
+                            bundleTypeFull = pkgJsonObj.get(FIELD_BUNDLE_TYPE).getAsString().toLowerCase().equals("full");
+                        }
+                        pkg.setJavaFXBundled(bundleTypeFull);
+
                         if (pkgJsonObj.has(FIELD_BITNESS)) {
                             Bitness bitness = Bitness.fromInt(pkgJsonObj.get(FIELD_BITNESS).getAsInt());
                             if (Bitness.NOT_FOUND == bitness) {
@@ -253,7 +258,7 @@ public List<Pkg> getAllPkgs(final boolean onlyNewPkgs) {
                         }
 
 
-                        String   filenameWithoutPreset = filename.replace("bellsoft-liberica-vm-openjdk", "");
+                        String   filenameWithoutPreset = filename.replace(bundleTypeFull ? "bellsoft-liberica-vm-full-openjdk": "bellsoft-liberica-vm-openjdk", "");
                         String[] withoutPresetParts    = filenameWithoutPreset.split("-");
                         if (withoutPresetParts.length == 4) {
                             MajorVersion    jv = new MajorVersion(VersionNumber.fromText(withoutPresetParts[0]).getFeature().getAsInt());