Merge pull request #808 from ayeshLK/2201.4.x-dev

[2201.4.x] Fix logic issue in `ServiceExecutionError` not getting properly populated with error details when there is a `panic` from within the `websubhub:Service`
ballerina-platform · Mar 16, 2023 · f165f75 · f165f75
2 parents 34a3a74 + 0235ca5
commit f165f75
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "websubhub"
-version = "1.6.0"
+version = "1.6.1"
 authors = ["Ballerina"]
 keywords = ["websub", "hub", "publisher", "service", "listener", "client"]
 repository = "https://github.com/ballerina-platform/module-ballerina-websubhub"
@@ -12,5 +12,5 @@ distribution = "2201.4.0"
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "websubhub-native"
-version = "1.6.0"
-path = "../native/build/libs/websubhub-native-1.6.0.jar"
+version = "1.6.1"
+path = "../native/build/libs/websubhub-native-1.6.1-SNAPSHOT.jar"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "websubhub-compiler-plugin"
 class = "io.ballerina.stdlib.websubhub.WebSubHubCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/websubhub-compiler-plugin-1.6.0.jar"
+path = "../compiler-plugin/build/libs/websubhub-compiler-plugin-1.6.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -240,19 +240,20 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "oauth2"
-version = "2.6.0"
+version = "2.6.1"
 dependencies = [
 	{org = "ballerina", name = "cache"},
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "log"},
-	{org = "ballerina", name = "time"}
+	{org = "ballerina", name = "time"},
+	{org = "ballerina", name = "url"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.6"
+version = "1.0.7"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -336,7 +337,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "websubhub"
-version = "1.6.0"
+version = "1.6.1"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "http"},

diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,13 @@ This file contains all the notable changes done to the Ballerina WebSubHub packa
 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]
+
+## [1.5.1] - 2023-03-16
+
+### Fixed
+- [Ballerina `websubhub` module will fail to provide error details properly when there is a `panic` from within the `websubhub:Service`](https://github.com/ballerina-platform/ballerina-standard-library/issues/4217)
+
 ## [1.5.0] - 2022-11-29
 
 ### Fixed

diff --git a/native/src/main/java/io/ballerina/stdlib/websubhub/Constants.java b/native/src/main/java/io/ballerina/stdlib/websubhub/Constants.java
@@ -36,4 +36,9 @@ public interface Constants {
     String ON_UNSUBSCRIPTION = "onUnsubscription";
     String ON_UNSUBSCRIPTION_VALIDATION = "onUnsubscriptionValidation";
     String ON_UNSUBSCRIPTION_INTENT_VERIFIED = "onUnsubscriptionIntentVerified";
+
+    String COMMON_RESPONSE = "CommonResponse";
+    String STATUS_CODE = "statusCode";
+    String SERVICE_EXECUTION_ERROR = "ServiceExecutionError";
+    int PANIC_FROM_THE_SERVICE_ERROR = -6;
 }
diff --git a/native/src/main/java/io/ballerina/stdlib/websubhub/HubCallback.java b/native/src/main/java/io/ballerina/stdlib/websubhub/HubCallback.java
@@ -22,11 +22,19 @@
 import io.ballerina.runtime.api.Module;
 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.Type;
 import io.ballerina.runtime.api.values.BError;
+import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
 
+import java.util.Map;
+
 import static io.ballerina.runtime.api.utils.StringUtils.fromString;
+import static io.ballerina.stdlib.websubhub.Constants.COMMON_RESPONSE;
+import static io.ballerina.stdlib.websubhub.Constants.PANIC_FROM_THE_SERVICE_ERROR;
+import static io.ballerina.stdlib.websubhub.Constants.SERVICE_EXECUTION_ERROR;
+import static io.ballerina.stdlib.websubhub.Constants.STATUS_CODE;
 
 /**
  * {@code HubCallback} used to handle the websubhub remote method invocation results.
@@ -56,8 +64,10 @@ public void notifySuccess(Object result) {
     public void notifyFailure(BError bError) {
         bError.printStackTrace();
         BString errorMessage = fromString("service method invocation failed: " + bError.getErrorMessage());
-        BError invocationError = ErrorCreator.createError(module, "ServiceExecutionError",
-                errorMessage, bError, null);
+        BMap<BString, Object> errorDetails = ValueCreator.createRecordValue(module, COMMON_RESPONSE,
+                    Map.of(STATUS_CODE, PANIC_FROM_THE_SERVICE_ERROR));
+        BError invocationError = ErrorCreator.createError(module, SERVICE_EXECUTION_ERROR,
+                errorMessage, bError, errorDetails);
         future.complete(invocationError);
     }