Merge pull request #1753 from DimuthuMadushan/2201.8.x

Fix GraphiQL Client Service Url
ballerina-platform · Feb 15, 2024 · 5fad5b0 · 5fad5b0
2 parents 8d85d6b + d53fe76
commit 5fad5b0
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "graphql"
-version = "1.10.0"
+version = "1.10.1"
 authors = ["Ballerina"]
 export=["graphql", "graphql.subgraph", "graphql.dataloader"]
 keywords = ["gql", "network", "query", "service"]
@@ -16,11 +16,11 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-native"
-version = "1.10.0"
-path = "../native/build/libs/graphql-native-1.10.0.jar"
+version = "1.10.1"
+path = "../native/build/libs/graphql-native-1.10.1-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "graphql-commons"
-version = "1.10.0"
-path = "../commons/build/libs/graphql-commons-1.10.0.jar"
+version = "1.10.1"
+path = "../commons/build/libs/graphql-commons-1.10.1-SNAPSHOT.jar"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,7 +3,7 @@ id = "graphql-compiler-plugin"
 class = "io.ballerina.stdlib.graphql.compiler.GraphqlCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.10.0.jar"
+path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.10.1-SNAPSHOT.jar"
 
 [[dependency]]
-path = "../commons/build/libs/graphql-commons-1.10.0.jar"
+path = "../commons/build/libs/graphql-commons-1.10.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -25,7 +25,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.7.0"
+version = "3.7.1"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -67,7 +67,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "graphql"
-version = "1.10.0"
+version = "1.10.1"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "file"},
@@ -97,7 +97,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.0"
+version = "2.10.7"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -301,7 +301,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -376,7 +376,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "websocket"
-version = "2.10.0"
+version = "2.10.1"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "constraint"},

diff --git a/ballerina/constants.bal b/ballerina/constants.bal
@@ -81,3 +81,6 @@ const PATH = "path";
 
 // Constants related to the DataLoader
 const DEFAULT_PREFETCH_METHOD_NAME_PREFIX = "pre";
+
+// Localhost
+const LOCALHOST = "localhost";
diff --git a/ballerina/listener.bal b/ballerina/listener.bal
@@ -46,14 +46,13 @@ public class Listener {
         }
         self.wsListener = ();
         self.graphiql = {};
-        string host = configuration.host;
         int port = self.httpListener.getPort();
         if configuration.secureSocket is () {
-            self.httpEndpoint = string `http://${host}:${port}`;
-            self.websocketEndpoint = string `ws://${host}:${port}`;
+            self.httpEndpoint = string `http://${LOCALHOST}:${port}`;
+            self.websocketEndpoint = string `ws://${LOCALHOST}:${port}`;
         } else {
-            self.httpEndpoint = string `https://${host}:${port}`;
-            self.websocketEndpoint = string `wss://${host}:${port}`;
+            self.httpEndpoint = string `https://${LOCALHOST}:${port}`;
+            self.websocketEndpoint = string `wss://${LOCALHOST}:${port}`;
         }
     }
 

diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+- [[#6067] Fix Returning Error while Accessing the Service via GraphiQL Client in Windows](https://github.com/ballerina-platform/ballerina-library/issues/6067)
+
+## [1.10.0] - 2023-09-18
+
 ### Added
 - [[#2998] Add `@deprecated` Directive Support for Output Object Defined using Record Types](https://github.com/ballerina-platform/ballerina-standard-library/issues/2998)
 - [[#4586] Add Support for Printing GraphiQL Url to Stdout](https://github.com/ballerina-platform/ballerina-standard-library/issues/4586)

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=1.10.0
+version=1.10.1-SNAPSHOT
 ballerinaLangVersion=2201.8.0
 
 checkstylePluginVersion=10.12.0