Remove wrapping braces in if conditions

ballerina-platform · Oct 16, 2023 · fd3790a · fd3790a
1 parent 49226a8
commit fd3790a
Show file tree

Hide file tree

Showing 28 changed files with 62 additions and 70 deletions.
diff --git a/...i/src/main/java/io/ballerina/protoc/builder/syntaxtree/constants/SyntaxTreeConstants.java b/...i/src/main/java/io/ballerina/protoc/builder/syntaxtree/constants/SyntaxTreeConstants.java
@@ -73,7 +73,7 @@ private SyntaxTreeConstants() {
     public static final Token SYNTAX_TREE_KEYWORD_IF = AbstractNodeFactory.createIdentifierToken("if ");
     public static final Token SYNTAX_TREE_KEYWORD_ELSE = AbstractNodeFactory.createIdentifierToken("else ");
     public static final Token SYNTAX_TREE_KEYWORD_IS = AbstractNodeFactory.createIdentifierToken("is ");
-    public static final Token SYNTAX_TREE_KEYWORD_NOT_IS = AbstractNodeFactory.createIdentifierToken("!is");
+    public static final Token SYNTAX_TREE_KEYWORD_NOT_IS = AbstractNodeFactory.createIdentifierToken("!is ");
     public static final Token SYNTAX_TREE_KEYWORD_LISTENER = AbstractNodeFactory.createIdentifierToken("listener ");
     public static final Token SYNTAX_TREE_KEYWORD_SERVICE = AbstractNodeFactory.createIdentifierToken("service ");
     public static final Token SYNTAX_TREE_KEYWORD_ON = AbstractNodeFactory.createIdentifierToken("on ");

diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/MessageUtils.java b/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/MessageUtils.java
@@ -42,7 +42,6 @@
 
 import static io.ballerina.protoc.GrpcConstants.ANN_DESCRIPTOR;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getBinaryExpressionNode;
-import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getBracedExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getFieldAccessExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getMethodCallExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getOptionalFieldAccessExpressionNode;
@@ -263,9 +262,7 @@ private static Function getValidationFunction(Message message) {
         }
         if (counts.size() > 0) {
             IfElse countCheck = new IfElse(
-                    getBracedExpressionNode(
-                            getCountCheckBinaryExpression(counts)
-                    )
+                    getCountCheckBinaryExpression(counts)
             );
             countCheck.addIfStatement(
                     getReturnStatementNode(

diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ServerUtils.java b/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ServerUtils.java
@@ -34,7 +34,6 @@
 import static io.ballerina.protoc.builder.BallerinaFileBuilder.protofileModuleMap;
 import static io.ballerina.protoc.builder.balgen.BalGenConstants.COLON;
 import static io.ballerina.protoc.builder.balgen.BalGenConstants.PACKAGE_SEPARATOR;
-import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getBracedExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getExplicitNewExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getFieldAccessExpressionNode;
 import static io.ballerina.protoc.builder.syntaxtree.components.Expression.getMethodCallExpressionNode;
@@ -228,11 +227,9 @@ private static Function getNextFunction(Method method, String filename) {
         function.addVariableStatement(streamValue.getVariableDeclarationNode());
 
         IfElse streamValueNilCheck = new IfElse(
-                getBracedExpressionNode(
-                        getTypeTestExpressionNode(
-                                getSimpleNameReferenceNode("streamValue"),
-                                getNilTypeDescriptorNode()
-                        )
+                getTypeTestExpressionNode(
+                        getSimpleNameReferenceNode("streamValue"),
+                        getNilTypeDescriptorNode()
                 )
         );
         streamValueNilCheck.addIfStatement(
@@ -241,11 +238,9 @@ private static Function getNextFunction(Method method, String filename) {
                 )
         );
         IfElse streamValueErrorCheck = new IfElse(
-                getBracedExpressionNode(
-                        getTypeTestExpressionNode(
-                                getSimpleNameReferenceNode("streamValue"),
-                                SyntaxTreeConstants.SYNTAX_TREE_GRPC_ERROR
-                        )
+                getTypeTestExpressionNode(
+                        getSimpleNameReferenceNode("streamValue"),
+                        SyntaxTreeConstants.SYNTAX_TREE_GRPC_ERROR
                 )
         );
         streamValueErrorCheck.addIfStatement(

diff --git a/...ces/test-src/generated-sources/tool_test_client_9/helloWorldNestedRepeatedMessages_pb.bal b/...ces/test-src/generated-sources/tool_test_client_9/helloWorldNestedRepeatedMessages_pb.bal
@@ -135,9 +135,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ResMessage value;|} nextRecord = {value: <ResMessage>streamValue.value};

diff --git a/...t-src/generated-sources/tool_test_client_9/helloWorldNestedRepeatedMessages_pb_client.bal b/...t-src/generated-sources/tool_test_client_9/helloWorldNestedRepeatedMessages_pb_client.bal
@@ -135,9 +135,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ResMessage value;|} nextRecord = {value: <ResMessage>streamValue.value};

diff --git a/...st/resources/test-src/generated-sources/tool_test_data_type_11/oneof_field_service_pb.bal b/...st/resources/test-src/generated-sources/tool_test_data_type_11/oneof_field_service_pb.bal
@@ -185,7 +185,7 @@ isolated function isValidRequest1(Request1 r) returns boolean {
     if r?.'version !is () {
         nameCount += 1;
     }
-    if (otherCount > 1 || nameCount > 1) {
+    if otherCount > 1 || nameCount > 1 {
         return false;
     }
     return true;
@@ -241,7 +241,7 @@ isolated function isValidAddress1(Address1 r) returns boolean {
     if r?.street_number !is () {
         codeCount += 1;
     }
-    if (codeCount > 1) {
+    if codeCount > 1 {
         return false;
     }
     return true;
@@ -318,7 +318,7 @@ isolated function isValidZzz(ZZZ r) returns boolean {
     if r?.one_k !is () {
         valueCount += 1;
     }
-    if (valueCount > 1) {
+    if valueCount > 1 {
         return false;
     }
     return true;

diff --git a/...-tests/src/test/resources/test-src/generated-sources/tool_test_data_type_14/parent_pb.bal b/...-tests/src/test/resources/test-src/generated-sources/tool_test_data_type_14/parent_pb.bal
@@ -135,9 +135,9 @@ public class ParentMessageStream {
 
     public isolated function next() returns record {|ParentMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ParentMessage value;|} nextRecord = {value: <ParentMessage>streamValue.value};

diff --git a/.../resources/test-src/generated-sources/tool_test_data_type_22/duplicate_output_type_pb.bal b/.../resources/test-src/generated-sources/tool_test_data_type_22/duplicate_output_type_pb.bal
@@ -153,9 +153,9 @@ public class AlbumStream {
 
     public isolated function next() returns record {|Album value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Album value;|} nextRecord = {value: <Album>streamValue.value};

diff --git a/...st/resources/test-src/generated-sources/tool_test_data_type_24/empty_message_types_pb.bal b/...st/resources/test-src/generated-sources/tool_test_data_type_24/empty_message_types_pb.bal
@@ -361,9 +361,9 @@ public class EmptyStream {
 
     public isolated function next() returns record {|Empty value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Empty value;|} nextRecord = {value: <Empty>streamValue.value};

diff --git a/...urces/test-src/generated-sources/tool_test_data_type_9/helloWorldWithReservedNames_pb.bal b/...urces/test-src/generated-sources/tool_test_data_type_9/helloWorldWithReservedNames_pb.bal
@@ -164,7 +164,7 @@ isolated function isValidFieldrules(FieldRules r) returns boolean {
     if r?.'enum !is () {
         typeCount += 1;
     }
-    if (typeCount > 1) {
+    if typeCount > 1 {
         return false;
     }
     return true;

diff --git a/...ts/src/test/resources/test-src/generated-sources/tool_test_external_imports/parent_pb.bal b/...ts/src/test/resources/test-src/generated-sources/tool_test_external_imports/parent_pb.bal
@@ -135,9 +135,9 @@ public class ParentMessageStream {
 
     public isolated function next() returns record {|ParentMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ParentMessage value;|} nextRecord = {value: <ParentMessage>streamValue.value};

diff --git a/...esources/test-src/generated-sources/tool_test_packaging_2/packageWithMessageImport_pb.bal b/...esources/test-src/generated-sources/tool_test_packaging_2/packageWithMessageImport_pb.bal
@@ -158,9 +158,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|message:ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message:ResMessage value;|} nextRecord = {value: <message:ResMessage>streamValue.value};

diff --git a/...s/test-src/generated-sources/tool_test_packaging_2/packageWithMessageImport_pb_client.bal b/...s/test-src/generated-sources/tool_test_packaging_2/packageWithMessageImport_pb_client.bal
@@ -158,9 +158,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|message:ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message:ResMessage value;|} nextRecord = {value: <message:ResMessage>streamValue.value};

diff --git a/...ources/test-src/generated-sources/tool_test_packaging_3/packageWithMultipleImports_pb.bal b/...ources/test-src/generated-sources/tool_test_packaging_3/packageWithMultipleImports_pb.bal
@@ -143,9 +143,9 @@ public class ResMessage2Stream {
 
     public isolated function next() returns record {|message2:ResMessage2 value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message2:ResMessage2 value;|} nextRecord = {value: <message2:ResMessage2>streamValue.value};

diff --git a/...test-src/generated-sources/tool_test_packaging_3/packageWithMultipleImports_pb_client.bal b/...test-src/generated-sources/tool_test_packaging_3/packageWithMultipleImports_pb_client.bal
@@ -143,9 +143,9 @@ public class ResMessage2Stream {
 
     public isolated function next() returns record {|message2:ResMessage2 value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message2:ResMessage2 value;|} nextRecord = {value: <message2:ResMessage2>streamValue.value};

diff --git a/...est-src/generated-sources/tool_test_packaging_4/modules/message/messageWithService_pb.bal b/...est-src/generated-sources/tool_test_packaging_4/modules/message/messageWithService_pb.bal
@@ -135,9 +135,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ResMessage value;|} nextRecord = {value: <ResMessage>streamValue.value};

diff --git a/...urces/test-src/generated-sources/tool_test_packaging_5/packageWithNestedSubmodules_pb.bal b/...urces/test-src/generated-sources/tool_test_packaging_5/packageWithNestedSubmodules_pb.bal
@@ -143,9 +143,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|message2:ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message2:ResMessage value;|} nextRecord = {value: <message2:ResMessage>streamValue.value};

diff --git a/...est-src/generated-sources/tool_test_packaging_5/packageWithNestedSubmodules_pb_client.bal b/...est-src/generated-sources/tool_test_packaging_5/packageWithNestedSubmodules_pb_client.bal
@@ -143,9 +143,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|message2:ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|message2:ResMessage value;|} nextRecord = {value: <message2:ResMessage>streamValue.value};

diff --git a/...src/generated-sources/tool_test_packaging_with_enum_imports/packageWithEnumImports_pb.bal b/...src/generated-sources/tool_test_packaging_with_enum_imports/packageWithEnumImports_pb.bal
@@ -137,9 +137,9 @@ public class MessageStream {
 
     public isolated function next() returns record {|Message value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Message value;|} nextRecord = {value: <Message>streamValue.value};

diff --git a/...erated-sources/tool_test_packaging_with_enum_imports/packageWithEnumImports_pb_client.bal b/...erated-sources/tool_test_packaging_with_enum_imports/packageWithEnumImports_pb_client.bal
@@ -137,9 +137,9 @@ public class MessageStream {
 
     public isolated function next() returns record {|Message value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Message value;|} nextRecord = {value: <Message>streamValue.value};

diff --git a/...src/test/resources/test-src/generated-sources/tool_test_server_6/helloWorldMessage_pb.bal b/...src/test/resources/test-src/generated-sources/tool_test_server_6/helloWorldMessage_pb.bal
@@ -83,9 +83,9 @@ public class HelloResponseStream {
 
     public isolated function next() returns record {|HelloResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|HelloResponse value;|} nextRecord = {value: <HelloResponse>streamValue.value};
@@ -107,9 +107,9 @@ public class ByeResponseStream {
 
     public isolated function next() returns record {|ByeResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ByeResponse value;|} nextRecord = {value: <ByeResponse>streamValue.value};

diff --git a/...t/resources/test-src/generated-sources/tool_test_server_6/helloWorldMessage_pb_client.bal b/...t/resources/test-src/generated-sources/tool_test_server_6/helloWorldMessage_pb_client.bal
@@ -83,9 +83,9 @@ public class HelloResponseStream {
 
     public isolated function next() returns record {|HelloResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|HelloResponse value;|} nextRecord = {value: <HelloResponse>streamValue.value};
@@ -107,9 +107,9 @@ public class ByeResponseStream {
 
     public isolated function next() returns record {|ByeResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ByeResponse value;|} nextRecord = {value: <ByeResponse>streamValue.value};

diff --git a/...es/test-src/generated-sources/tool_test_server_7/helloWorldInputEmptyOutputMessage_pb.bal b/...es/test-src/generated-sources/tool_test_server_7/helloWorldInputEmptyOutputMessage_pb.bal
@@ -42,9 +42,9 @@ public class HelloResponseStream {
 
     public isolated function next() returns record {|HelloResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|HelloResponse value;|} nextRecord = {value: <HelloResponse>streamValue.value};

diff --git a/...-src/generated-sources/tool_test_server_7/helloWorldInputEmptyOutputMessage_pb_client.bal b/...-src/generated-sources/tool_test_server_7/helloWorldInputEmptyOutputMessage_pb_client.bal
@@ -42,9 +42,9 @@ public class HelloResponseStream {
 
     public isolated function next() returns record {|HelloResponse value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|HelloResponse value;|} nextRecord = {value: <HelloResponse>streamValue.value};

diff --git a/...c/test/resources/test-src/generated-sources/tool_test_server_8/helloWorldTimestamp_pb.bal b/...c/test/resources/test-src/generated-sources/tool_test_server_8/helloWorldTimestamp_pb.bal
@@ -208,9 +208,9 @@ public class GreetingStream {
 
     public isolated function next() returns record {|Greeting value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Greeting value;|} nextRecord = {value: <Greeting>streamValue.value};

diff --git a/...resources/test-src/generated-sources/tool_test_server_8/helloWorldTimestamp_pb_client.bal b/...resources/test-src/generated-sources/tool_test_server_8/helloWorldTimestamp_pb_client.bal
@@ -208,9 +208,9 @@ public class GreetingStream {
 
     public isolated function next() returns record {|Greeting value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|Greeting value;|} nextRecord = {value: <Greeting>streamValue.value};

diff --git a/.../src/test/resources/test-src/generated-sources/tool_test_server_9/dependingService_pb.bal b/.../src/test/resources/test-src/generated-sources/tool_test_server_9/dependingService_pb.bal
@@ -53,9 +53,9 @@ public class ResMessageStream {
 
     public isolated function next() returns record {|ResMessage value;|}|grpc:Error? {
         var streamValue = self.anydataStream.next();
-        if (streamValue is ()) {
+        if streamValue is () {
             return streamValue;
-        } else if (streamValue is grpc:Error) {
+        } else if streamValue is grpc:Error {
             return streamValue;
         } else {
             record {|ResMessage value;|} nextRecord = {value: <ResMessage>streamValue.value};