Apply suggestions from code review

ballerina-platform · Jan 13, 2022 · 7a89708 · 7a89708
1 parent 54127b1
commit 7a89708
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/ballerina/tests/08_unions_types.bal b/ballerina/tests/08_unions_types.bal
@@ -16,12 +16,6 @@
 
 import ballerina/test;
 
-type Information Address|Person;
-
-type Details record {
-    Information information;
-};
-
 @test:Config {
     groups: ["union"]
 }

diff --git a/ballerina/tests/19_distinct_service_unions.bal b/ballerina/tests/19_distinct_service_unions.bal
@@ -16,8 +16,6 @@
 
 import ballerina/test;
 
-type Services StudentService|TeacherService;
-
 @test:Config {
     groups: ["service", "union"]
 }

diff --git a/ballerina/tests/object_types.bal b/ballerina/tests/object_types.bal
@@ -14,6 +14,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+type Services StudentService|TeacherService;
+
+type SearchResult Lift|Trail;
+
 isolated service class Name {
     isolated resource function get first() returns string {
         return "Sherlock";
@@ -46,8 +50,6 @@ distinct isolated service class HierarchicalName {
     }
 }
 
-type SearchResult Lift|Trail;
-
 distinct isolated service class Lift {
     private final readonly & LiftRecord lift;
 

diff --git a/ballerina/tests/records.bal b/ballerina/tests/records.bal
@@ -14,6 +14,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+type Information Address|Person;
+
+type Details record {
+    Information information;
+};
 public type Address readonly & record {
     string number;
     string street;

diff --git a/changelog.md b/changelog.md
@@ -14,7 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [[#2500] Fix returning NPE when multiple file uploading](https://github.com/ballerina-platform/ballerina-standard-library/issues/2500)
 - [[#2518] Fix Intermittently Skipping Fields when Executing Resources](https://github.com/ballerina-platform/ballerina-standard-library/issues/2518)
 - [[#2552] Fix returning error when querying a union type includes a field returns an object](https://github.com/ballerina-platform/ballerina-standard-library/issues/2552)
-- [[#2571] Fix service crashing when fields return nullable, union type arrays](https://github.com/ballerina-platform/ballerina-standard-library/issues/2571)
+- [[#2571] Fix Service Crashing when Fields Return Nullable, Union Type Arrays](https://github.com/ballerina-platform/ballerina-standard-library/issues/2571)
+- [[#2578] Fix Incorrect Response Returning for GraphQL Scalar Type Arrays](https://github.com/ballerina-platform/ballerina-standard-library/issues/2578)
 
 ## [1.1.0] - 2021-12-14
 

diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java
@@ -156,6 +156,7 @@ static boolean isScalarType(Type type) {
             if (memberType.size() == 1) {
                 return isScalarType(memberType.get(0));
             }
+            return false;
         }
         return tag == INT_TAG || tag == FLOAT_TAG || tag == BOOLEAN_TAG || tag == STRING_TAG;
     }