Merge pull request #43625 from dulajdilshan/flow_model-update

Fix project components API with tests and sync with `master`

.github/workflows/pull_request_full_build.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - master
-      - java21
 
 jobs:
   build-lang:
@@ -93,12 +92,6 @@ jobs:
           do git clone https://github.com/ballerina-platform/${module_name}.git; \
           done
 
-      - name: Checkout non-default branch
-        run: |
-          for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
-          cd $module_name && git fetch origin && git checkout -t origin/java21 && cd ..; \
-          done
-
       - name: Update Lang Version in Module
         run: |
           for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
@@ -139,10 +132,6 @@ jobs:
           distribution: 'temurin'
           java-version: '21.0.3'
 
-      - name: Checkout non-default branch
-        run: |
-          git fetch origin && git checkout -t origin/java21
-
       - name: Download Ballerina Lang Artifacts
         uses: actions/download-artifact@v4
         with:

.github/workflows/pull_request_ubuntu_build.yml

@@ -15,7 +15,6 @@ on:
       - native-build
       - revert-client-decl-master
       - query-grouping-aggregation
-      - java21
 
 jobs:
   ubuntu_build:

.github/workflows/pull_request_windows_build.yml

@@ -15,7 +15,6 @@ on:
       - native-build
       - revert-client-decl-master
       - query-grouping-aggregation
-      - java21
 jobs:
   windows_build:
     name: Build with some tests on Windows

cli/central-client/src/main/java/org/ballerinalang/central/client/CentralAPIClient.java

@@ -54,6 +54,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.Proxy;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,6 +141,8 @@ public class CentralAPIClient {
     private static final String ERR_PACKAGE_UN_DEPRECATE = "error: failed to undo deprecation of the package: ";
     private static final String ERR_PACKAGE_RESOLUTION = "error: while connecting to central: ";
     private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    private static final MediaType JSON_CONTENT_TYPE = MediaType.parse("application/json");
+
     // System property name for enabling central verbose
     public static final String SYS_PROP_CENTRAL_VERBOSE_ENABLED = "CENTRAL_VERBOSE_ENABLED";
     private static final int DEFAULT_CONNECT_TIMEOUT = 60;
@@ -1346,52 +1349,45 @@ public void deprecatePackage(String packageInfo, String deprecationMsg, String s
     }
 
     /**
-     * Get packages from central.
+     * Get packages information using graphql API.
      *
-     * @param params            Search query param map.
-     * @param supportedPlatform The supported platform.
-     * @param ballerinaVersion  The ballerina version.
-     * @return Package list
-     * @throws CentralClientException Central client exception.
+     * @param query payload query
+     * @param supportedPlatform supported platform
+     * @param ballerinaVersion ballerina version
+     * @return {@link JsonElement} Json Response
      */
-    public JsonElement getPackages(Map<String, String> params, String supportedPlatform, String ballerinaVersion)
+    public JsonElement getCentralPackagesUsingGraphQL(String query, String supportedPlatform, String ballerinaVersion)
             throws CentralClientException {
         Optional<ResponseBody> body = Optional.empty();
         OkHttpClient client = new OkHttpClient.Builder()
                 .followRedirects(false)
-                .connectTimeout(connectTimeout, TimeUnit.SECONDS)
+                .connectTimeout(callTimeout, TimeUnit.SECONDS)
                 .readTimeout(readTimeout, TimeUnit.SECONDS)
                 .writeTimeout(writeTimeout, TimeUnit.SECONDS)
                 .callTimeout(callTimeout, TimeUnit.SECONDS)
                 .proxy(this.proxy)
                 .build();
 
         try {
-            HttpUrl.Builder httpBuilder = Objects.requireNonNull(HttpUrl.parse(this.baseUrl))
-                    .newBuilder().addPathSegment(PACKAGES);
-            for (Map.Entry<String, String> param : params.entrySet()) {
-                httpBuilder.addQueryParameter(param.getKey(), param.getValue());
-            }
-
-            Request searchReq = getNewRequest(supportedPlatform, ballerinaVersion)
-                    .get()
-                    .url(httpBuilder.build())
+            HttpUrl.Builder httpUrl = Objects.requireNonNull(HttpUrl.parse(this.baseUrl)).newBuilder();
+            Request request = getNewRequest(supportedPlatform, ballerinaVersion)
+                    .url(httpUrl.build())
+                    .post(RequestBody.create(JSON_CONTENT_TYPE, query.getBytes(StandardCharsets.UTF_8)))
                     .build();
 
-            Call httpRequestCall = client.newCall(searchReq);
-            Response searchResponse = httpRequestCall.execute();
-
-            ResponseBody responseBody = searchResponse.body();
+            Call httpRequest = client.newCall(request);
+            Response response = httpRequest.execute();
+            ResponseBody responseBody = response.body();
             body = responseBody != null ? Optional.of(responseBody) : Optional.empty();
             if (body.isPresent()) {
                 MediaType contentType = body.get().contentType();
                 if (contentType != null && isApplicationJsonContentType(contentType.toString()) &&
-                        searchResponse.code() == HttpsURLConnection.HTTP_OK) {
+                        response.code() == HttpsURLConnection.HTTP_OK) {
                     return new Gson().toJsonTree(body.get().string());
                 }
             }
-            handleResponseErrors(searchResponse, ERR_CANNOT_SEARCH);
-            return new JsonArray();
+            handleResponseErrors(response, ERR_CANNOT_SEARCH);
+            return new JsonObject();
         } catch (IOException e) {
             throw new CentralClientException(ERR_CANNOT_SEARCH + "'. Reason: " + e.getMessage());
         } finally {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/util/RepoUtils.java

@@ -57,6 +57,9 @@ public final class RepoUtils {
     private static final String PRODUCTION_URL = "https://api.central.ballerina.io/2.0/registry";
     private static final String STAGING_URL = "https://api.staging-central.ballerina.io/2.0/registry";
     private static final String DEV_URL = "https://api.dev-central.ballerina.io/2.0/registry";
+    private static final String PRODUCTION_GRAPHQL_URL = "https://api.central.ballerina.io/2.0/graphql";
+    private static final String STAGING_GRAPHQL_URL = "https://api.staging-central.ballerina.io/2.0/graphql";
+    private static final String DEV_GRAPHQL_URL = "https://api.dev-central.ballerina.io/2.0/graphql";
 
     private static final String BALLERINA_ORG = "ballerina";
     private static final String BALLERINAX_ORG = "ballerinax";
@@ -158,6 +161,20 @@ public static String getRemoteRepoURL() {
         return PRODUCTION_URL;
     }
 
+    /**
+     * Get the graphQL remote repo URL.
+     *
+     * @return URL of the remote repository
+     */
+    public static String getRemoteRepoGraphQLURL() {
+        if (SET_BALLERINA_STAGE_CENTRAL) {
+            return STAGING_GRAPHQL_URL;
+        } else if (SET_BALLERINA_DEV_CENTRAL) {
+            return DEV_GRAPHQL_URL;
+        }
+        return PRODUCTION_GRAPHQL_URL;
+    }
+
     /**
      * Get the staging URL.
      *

distribution/zip/jballerina-tools/resources/language-server-launcher.bat

@@ -42,11 +42,11 @@ rem -------------------------- set BALLERINA_HOME -----------------------------
 rem TODO: Validate BALLERINA_HOME
 rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
 set BALLERINA_HOME=%~sdp0..\..\..\..
-if exist "%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre" goto setJava
+if exist "%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre" goto setJava
 goto checkJava
 
 :setJava
-set JAVA_HOME="%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre"
+set JAVA_HOME="%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre"
 goto checkJava
 
 :checkJava

distribution/zip/jballerina-tools/resources/language-server-launcher.sh

@@ -29,7 +29,7 @@
 
 # ---------------------- Override JAVA_HOME for Installers -------------------
 DIR="$(cd "$(dirname "$0")" && pwd)"
-JAVA_PATH="$DIR/../../../../../../dependencies/jdk-17.0.7+7-jre"
+JAVA_PATH="$DIR/../../../../../../dependencies/jdk-21.0.5+11-jre"
 if test -d "$JAVA_PATH"; then
   JAVA_HOME=$JAVA_PATH
 fi

distribution/zip/jballerina/bin/bal

@@ -32,7 +32,7 @@
 # OS specific support.  $var _must_ be set to either true or false.
 
 # Set JAVA_HOME for installers
-JAVA_PATH=$BALLERINA_HOME/../../dependencies/jdk-17.0.7+7-jre
+JAVA_PATH=$BALLERINA_HOME/../../dependencies/jdk-21.0.5+11-jre
 if test -d "$JAVA_PATH"; then
   JAVA_HOME=$JAVA_PATH
 fi

distribution/zip/jballerina/bin/bal.bat

@@ -34,8 +34,8 @@ rem ----- if JAVA_HOME is not set we're not happy ------------------------------
 :checkJava
 
 set BALLERINA_HOME=%~sdp0..
-if exist %BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre (
-   set "JAVA_HOME=%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre"
+if exist %BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre (
+   set "JAVA_HOME=%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre"
 )
 
 if "%JAVA_HOME%" == "" goto noJavaHome

language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/CentralPackageDescriptorLoader.java

@@ -17,21 +17,15 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import io.ballerina.projects.PackageName;
-import io.ballerina.projects.PackageOrg;
-import io.ballerina.projects.PackageVersion;
 import io.ballerina.projects.Settings;
 import io.ballerina.projects.util.ProjectUtils;
 import org.ballerinalang.central.client.CentralAPIClient;
-import org.ballerinalang.central.client.model.Package;
 import org.ballerinalang.langserver.commons.LanguageServerContext;
-import org.ballerinalang.langserver.extensions.ballerina.connector.CentralPackageListResult;
 import org.wso2.ballerinalang.util.RepoUtils;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -43,6 +37,8 @@ public class CentralPackageDescriptorLoader {
     public static final LanguageServerContext.Key<CentralPackageDescriptorLoader> CENTRAL_PACKAGE_HOLDER_KEY =
             new LanguageServerContext.Key<>();
     private final List<LSPackageLoader.ModuleInfo> centralPackages = new ArrayList<>();
+    private static final String GET_PACKAGES_QUERY =
+            "{\"query\": \"{packages(orgName:\\\"%s\\\" limit: %s) {packages {name version organization}}}\"}";
     private boolean isLoaded = false;
 
     private final LSClientLogger clientLogger;
@@ -65,103 +61,38 @@ public CompletableFuture<List<LSPackageLoader.ModuleInfo>> getCentralPackages()
             if (!isLoaded) {
                 //Load packages from central
                 clientLogger.logTrace("Loading packages from Ballerina Central");
-                this.getPackagesFromCentral().forEach(packageInfo -> {
-                    PackageOrg packageOrg = PackageOrg.from(packageInfo.getOrganization());
-                    PackageName packageName = PackageName.from(packageInfo.getName());
-                    PackageVersion packageVersion = PackageVersion.from(packageInfo.getVersion());
-                    centralPackages.add(new LSPackageLoader.ModuleInfo(packageOrg, packageName, packageVersion, null));
-                });
+                centralPackages.addAll(this.getCentralGraphQLPackages());
                 clientLogger.logTrace("Successfully loaded packages from Ballerina Central");
             }
             isLoaded = true;
             return this.centralPackages;
         });
     }
 
-    private List<Package> getPackagesFromCentral() {
-        List<Package> packageList = new ArrayList<>();
+    private List<LSPackageLoader.ModuleInfo> getCentralGraphQLPackages() {
         try {
-            for (int page = 0;; page++) {
-                Settings settings = RepoUtils.readSettings();
-
-                CentralAPIClient centralAPIClient = new CentralAPIClient(RepoUtils.getRemoteRepoURL(),
-                        ProjectUtils.initializeProxy(settings.getProxy()), ProjectUtils.getAccessTokenOfCLI(settings));
-                CentralPackageDescriptor descriptor = new CentralPackageDescriptor("ballerinax", 10, page * 10);
-
-                JsonElement newClientConnectors = centralAPIClient.getPackages(descriptor.getQueryMap(),
-                        "any", RepoUtils.getBallerinaVersion());
-
-                CentralPackageListResult packageListResult = new Gson().fromJson(newClientConnectors.getAsString(),
-                        CentralPackageListResult.class);
-                packageList.addAll(packageListResult.getPackages());
-                int listResultCount = packageListResult.getCount();
-
-                if (packageList.size() == listResultCount || descriptor.getOffset() >= listResultCount) {
-                    break;
-                }
-            }
+            Settings settings = RepoUtils.readSettings();
+            CentralAPIClient centralAPIClient = new CentralAPIClient(RepoUtils.getRemoteRepoGraphQLURL(),
+                    ProjectUtils.initializeProxy(settings.getProxy()), ProjectUtils.getAccessTokenOfCLI(settings));
+            String query = String.format(GET_PACKAGES_QUERY, "ballerinax", 800);
+            JsonElement allPackagesResponse = centralAPIClient.getCentralPackagesUsingGraphQL(query, "any",
+                    RepoUtils.getBallerinaVersion());
+            CentralPackageGraphQLResponse response = new Gson().fromJson(allPackagesResponse.getAsString(),
+                    CentralPackageGraphQLResponse.class);
+            return response.data.packages.packages;
 
         } catch (Exception e) {
             // ignore
         }
-        return packageList;
+        return Collections.emptyList();
     }
 
-    /**
-     * Central package descriptor.
-     */
-    public static class CentralPackageDescriptor {
-        private String organization;
-        private int limit;
-        private int offset;
-
-        public CentralPackageDescriptor(String organization, int limit, int offset) {
-            this.organization = organization;
-            this.limit = limit;
-            this.offset = offset;
-        }
-
-        public String getOrganization() {
-            return organization;
-        }
-
-        public void setOrganization(String organization) {
-            this.organization = organization;
-        }
-
-        public int getLimit() {
-            return limit;
-        }
-
-        public void setLimit(int limit) {
-            this.limit = limit;
-        }
-
-        public int getOffset() {
-            return offset;
-        }
-
-        public void setOffset(int offset) {
-            this.offset = offset;
-        }
-
-        public Map<String, String> getQueryMap() {
-            Map<String, String> params = new HashMap<>();
-            params.put("readme", "false");
-
-            if (getOrganization() != null) {
-                params.put("org", getOrganization());
-            }
-
-            if (getLimit() != 0) {
-                params.put("limit", Integer.toString(getLimit()));
-            }
+    public record CentralPackageGraphQLResponse(Packages data) {
+    }
 
-            if (getOffset() != 0) {
-                params.put("offset", Integer.toString(getOffset()));
-            }
+    public record Packages(PackageList packages) {
+    }
 
-            return params;
-        }
+    public record PackageList(List<LSPackageLoader.ModuleInfo> packages) {
     }
 }