Update implementation to resolve lang spec deviation misuse

ballerina-tests/http-interceptor-tests/Ballerina.toml

@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.9.0"
+version = "2.9.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.9.0"
+version = "2.9.1"
 
 [platform.java11]
 graalvmCompatible = true
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.9.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.9.1-SNAPSHOT.jar"

ballerina-tests/http-interceptor-tests/Dependencies.toml

@@ -66,7 +66,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.9.0"
+version = "2.9.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.9.0"
+version = "2.9.1"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "http_test_common"},
@@ -115,7 +115,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.9.0"
+version = "2.9.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

ballerina-tests/http-interceptor-tests/tests/interceptors_basic_tests.bal

@@ -196,7 +196,7 @@ listener http:Listener responseInterceptorReturnsErrorTestServerEP = new(respons
 
 service http:InterceptableService / on responseInterceptorReturnsErrorTestServerEP {
 
-    public function createInterceptors() returns [LastResponseInterceptor, ResponseInterceptorReturnsError, DefaultResponseInterceptor] {
+    public function createInterceptors() returns http:Interceptor[] {
         return [new LastResponseInterceptor(), new ResponseInterceptorReturnsError(), new DefaultResponseInterceptor()];
     }
 
@@ -561,7 +561,7 @@ service http:InterceptableService /requestInterceptorJwtInformation on new http:
         }
     }) {
 
-    public function createInterceptors() returns RequestInterceptorJwtInformation {
+    public function createInterceptors() returns http:Interceptor {
         return new RequestInterceptorJwtInformation();
     }
 

ballerina-tests/http-test-common/Ballerina.toml

@@ -1,4 +1,4 @@
 [package]
 org = "ballerina"
 name = "http_test_common"
-version = "2.9.0"
+version = "2.9.1"

ballerina-tests/http-test-common/Dependencies.toml

@@ -10,7 +10,7 @@ distribution-version = "2201.7.0"
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.9.0"
+version = "2.9.1"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},
 	{org = "ballerina", name = "mime"},

ballerina/Ballerina.toml

@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "http"
-version = "2.9.0"
+version = "2.9.1"
 authors = ["Ballerina"]
 keywords = ["http", "network", "service", "listener", "client"]
 repository = "https://github.com/ballerina-platform/module-ballerina-http"
@@ -16,8 +16,8 @@ graalvmCompatible = true
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "http-native"
-version = "2.9.0"
-path = "../native/build/libs/http-native-2.9.0.jar"
+version = "2.9.1"
+path = "../native/build/libs/http-native-2.9.1-SNAPSHOT.jar"
 
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"

ballerina/CompilerPlugin.toml

@@ -3,4 +3,4 @@ id = "http-compiler-plugin"
 class = "io.ballerina.stdlib.http.compiler.HttpCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/http-compiler-plugin-2.9.0.jar"
+path = "../compiler-plugin/build/libs/http-compiler-plugin-2.9.1-SNAPSHOT.jar"

ballerina/Dependencies.toml

@@ -76,7 +76,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.9.0"
+version = "2.9.1"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},

ballerina/http_service_endpoint.bal

@@ -23,7 +23,6 @@ public isolated class Listener {
 
     private int port;
     private InferredListenerConfiguration inferredConfig;
-    private Interceptor[] interceptors;
 
     # Gets invoked during module initialization to initialize the listener.
     #
@@ -40,20 +39,24 @@ public isolated class Listener {
             server: config.server,
             requestLimits: config.requestLimits
         };
-        self.interceptors = [new DefaultErrorInterceptor()];
-        Interceptor|Interceptor[]? interceptors = config["interceptors"];
-        if interceptors is Interceptor[] {
-            foreach Interceptor interceptor in interceptors {
-                self.interceptors.push(interceptor);
-            }
-        } else if interceptors is Interceptor {
-            self.interceptors.push(interceptors);
-        }
         self.inferredConfig = inferredListenerConfig.cloneReadOnly();
         self.port = port;
         return externInitEndpoint(self, config);
     }
 
+    isolated function createInterceptors(Interceptor|Interceptor[]? interceptorConfigValues) returns Interceptor[] {
+        Interceptor|Interceptor[]? configValues = interceptorConfigValues;
+        Interceptor[] interceptors = [new DefaultErrorInterceptor()];
+        if configValues is Interceptor[] {
+            foreach Interceptor interceptor in configValues {
+                interceptors.push(interceptor);
+            }
+        } else if configValues is Interceptor {
+            interceptors.push(configValues);
+        }
+        return interceptors;
+    }
+
     # Starts the registered service programmatically.
     #
     # + return - An `error` if an error occurred during the listener starting process

ballerina/resiliency_failover_client.bal

@@ -49,12 +49,13 @@ public client isolated class FailoverClient {
         self.succeededEndpointIndex = 0;
         self.failoverClientsArray = [];
         Client clientEp;
-        Client?[] httpClients = self.failoverClientsArray;
         int i = 0;
         foreach var target in failoverClientConfig.targets {
             ClientConfiguration epConfig = createClientEPConfigFromFailoverEPConfig(failoverClientConfig, target);
             clientEp = check new(target.url, epConfig);
-            httpClients[i] = clientEp;
+            lock {
+                self.failoverClientsArray[i] = clientEp;
+            }
             i += 1;
         }
         FailoverInferredConfig failoverInferredConfig = {

ballerina/resiliency_load_balance_client.bal

@@ -40,12 +40,13 @@ public client isolated class LoadBalanceClient {
         self.failover = loadBalanceClientConfig.failover;
         self.loadBalanceClientsArray = [];
         Client clientEp;
-        Client?[] lbClients = self.loadBalanceClientsArray;
         int i = 0;
         foreach var target in loadBalanceClientConfig.targets {
             ClientConfiguration epConfig = createClientEPConfigFromLoalBalanceEPConfig(loadBalanceClientConfig, target);
-            clientEp =  check new(target.url , epConfig);
-            lbClients[i] = clientEp;
+            clientEp = check new(target.url , epConfig);
+            lock {
+                self.loadBalanceClientsArray[i] = clientEp;
+            }
             i += 1;
         }
         var lbRule = loadBalanceClientConfig.lbRule;

changelog.md

@@ -5,6 +5,12 @@ This file contains all the notable changes done to the Ballerina HTTP package th
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to 
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- [Fix exception when return type of `createInterceptors` function is an array type](https://github.com/ballerina-platform/ballerina-standard-library/issues/4649)
+
 ## [2.9.0] - 2023-06-30
 
 ### Added

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=2.9.1-SNAPSHOT
-ballerinaLangVersion= 2201.7.0
+ballerinaLangVersion=2201.7.0
 ballerinaTomlParserVersion=1.2.2
 commonsLang3Version=3.8.1
 nettyVersion=4.1.94.Final

native/spotbugs-exclude.xml

@@ -76,6 +76,10 @@
         <Class name="io.ballerina.stdlib.http.api.HttpService$1" />
         <Bug pattern="DM_EXIT" />
     </Match>
+    <Match>
+        <Class name="io.ballerina.stdlib.http.api.HttpUtil$1" />
+        <Bug pattern="DM_EXIT" />
+    </Match>
     <Match>
         <Class name="io.ballerina.stdlib.http.api.client.endpoint.CreateSimpleHttpClient" />
         <Bug pattern="REC_CATCH_EXCEPTION" />

native/src/main/java/io/ballerina/stdlib/http/api/HttpService.java

@@ -499,6 +499,9 @@ public void notifyFailure(BError bError) {
         Object[] interceptors = interceptorsArrayFromService.getValues();
         List<Object> interceptorServices = new ArrayList<>();
         for (Object interceptor: interceptors) {
+            if (Objects.isNull(interceptor)) {
+                break;
+            }
             interceptorServices.add(interceptor);
         }
 
@@ -529,6 +532,9 @@ private static void populateBalInterceptorServicesArray(HttpService service, BAr
                 interceptorsArray.append(interceptor);
             }
             for (Object interceptor : fromService.getValues()) {
+                if (Objects.isNull(interceptor)) {
+                    break;
+                }
                 interceptorsArray.append(interceptor);
             }
             service.setBalInterceptorServicesArray(interceptorsArray);

native/src/main/java/io/ballerina/stdlib/http/api/HttpUtil.java

@@ -20,8 +20,10 @@
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Module;
+import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.Runtime;
 import io.ballerina.runtime.api.TypeTags;
+import io.ballerina.runtime.api.async.Callback;
 import io.ballerina.runtime.api.creators.ErrorCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.Field;
@@ -115,6 +117,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 import static io.ballerina.runtime.api.constants.RuntimeConstants.BALLERINA_VERSION;
@@ -130,7 +133,9 @@
 import static io.ballerina.runtime.observability.ObservabilityConstants.TAG_KEY_PEER_ADDRESS;
 import static io.ballerina.stdlib.http.api.HttpConstants.ANN_CONFIG_ATTR_COMPRESSION_CONTENT_TYPES;
 import static io.ballerina.stdlib.http.api.HttpConstants.ANN_CONFIG_ATTR_SSL_ENABLED_PROTOCOLS;
+import static io.ballerina.stdlib.http.api.HttpConstants.CREATE_INTERCEPTORS_FUNCTION_NAME;
 import static io.ballerina.stdlib.http.api.HttpConstants.ENDPOINT_CONFIG_HTTP2_INITIAL_WINDOW_SIZE;
+import static io.ballerina.stdlib.http.api.HttpConstants.ENDPOINT_CONFIG_INTERCEPTORS;
 import static io.ballerina.stdlib.http.api.HttpConstants.HTTP_HEADERS;
 import static io.ballerina.stdlib.http.api.HttpConstants.RESOLVED_REQUESTED_URI;
 import static io.ballerina.stdlib.http.api.HttpConstants.RESPONSE_CACHE_CONTROL;
@@ -143,6 +148,7 @@
 import static io.ballerina.stdlib.http.api.HttpConstants.SECURESOCKET_CONFIG_SESSION_TIMEOUT;
 import static io.ballerina.stdlib.http.api.HttpConstants.SECURESOCKET_CONFIG_TRUSTSTORE_FILE_PATH;
 import static io.ballerina.stdlib.http.api.HttpConstants.SECURESOCKET_CONFIG_TRUSTSTORE_PASSWORD;
+import static io.ballerina.stdlib.http.api.HttpConstants.SERVICE_ENDPOINT_CONFIG;
 import static io.ballerina.stdlib.http.api.HttpConstants.SINGLE_SLASH;
 import static io.ballerina.stdlib.http.api.HttpConstants.SOCKET_CONFIG_CONNECT_TIMEOUT;
 import static io.ballerina.stdlib.http.api.HttpConstants.SOCKET_CONFIG_KEEP_ALIVE;
@@ -1600,22 +1606,52 @@
     }
 
     public static void populateInterceptorServicesFromListener(BObject serviceEndpoint, Runtime runtime) {
-        Object[] interceptors = {};
         List<BObject> interceptorServices = new ArrayList<>();
-        BArray interceptorsArray = serviceEndpoint.getArrayValue(HttpConstants.ENDPOINT_CONFIG_INTERCEPTORS);
 
-        if (interceptorsArray != null) {
-            interceptors = interceptorsArray.getValues();
+        BMap listenerConfig = ((BMap) serviceEndpoint.getNativeData(SERVICE_ENDPOINT_CONFIG));
+        final CountDownLatch latch = new CountDownLatch(1);
+        final BArray[] interceptorResponse = new BArray[1];
+        Callback interceptorCallback = new Callback() {
+            @Override
+            public void notifySuccess(Object result) {
+                if (result instanceof BArray) {
+                    interceptorResponse[0] = (BArray) result;
+                } else {
+                    ((BError) result).printStackTrace();
+                }
+                latch.countDown();
+            }
+            @Override
+            public void notifyFailure(BError bError) {
+                bError.printStackTrace();
+                System.exit(1);
+            }
+        };
+        if (listenerConfig != null && listenerConfig.get(ENDPOINT_CONFIG_INTERCEPTORS) != null) {
+            Object interceptorConfig = listenerConfig.get(ENDPOINT_CONFIG_INTERCEPTORS);
+            runtime.invokeMethodAsyncSequentially(serviceEndpoint, CREATE_INTERCEPTORS_FUNCTION_NAME, null, null,
+                    interceptorCallback, null, PredefinedTypes.TYPE_ANY, interceptorConfig, true);
+        } else {
+            runtime.invokeMethodAsyncSequentially(serviceEndpoint, CREATE_INTERCEPTORS_FUNCTION_NAME, null, null,
+                    interceptorCallback, null, PredefinedTypes.TYPE_ANY, null, true);
         }
-
+        try {
+            latch.await();
+        } catch (InterruptedException exception) {
+            log.warn("Interrupted before receiving the interceptor response");
+        }
+        if (interceptorResponse[0] == null) {
+            return;
+        }
+        Object[] interceptors = interceptorResponse[0].getValues();
         for (Object interceptor: interceptors) {
             if (interceptor == null) {
                 break;
             }
             interceptorServices.add((BObject) interceptor);
         }
 
-        serviceEndpoint.addNativeData(HttpConstants.INTERCEPTORS, interceptorsArray);
+        serviceEndpoint.addNativeData(HttpConstants.INTERCEPTORS, interceptorResponse[0]);
         Register.resetInterceptorRegistry(serviceEndpoint, interceptorServices.size());
         List<HTTPInterceptorServicesRegistry> httpInterceptorServicesRegistries
                 = Register.getHttpInterceptorServicesRegistries(serviceEndpoint);