Merge pull request #31 from MadhukaHarith92/int-subtypes

Add support for integer subtypes
ballerina-platform · Jul 13, 2023 · 0648ca1 · 0648ca1
2 parents 9a03bc9 + 202ac66
commit 0648ca1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,9 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- [Support subtypes of int in protoc-tool and gRPC](https://github.com/ballerina-platform/ballerina-standard-library/issues/4543)
+
+## [0.1.2] - 2023-07-03
+
 ### Fixed
 
 - [Add descriptor map to `grpc:Descriptor` and stub initialization](https://github.com/ballerina-platform/ballerina-standard-library/issues/4555)
+- [Tool does not properly handle the types from google.protobuf.wrappers in messages](https://github.com/ballerina-platform/ballerina-standard-library/issues/4576)
 
 ## [0.1.1] - 2023-06-01
 

diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/builder/stub/Field.java b/protoc-cli/src/main/java/io/ballerina/protoc/builder/stub/Field.java
@@ -153,9 +153,9 @@ private Builder(DescriptorProtos.FieldDescriptorProto fieldDescriptor, String fi
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_FLOAT, "float");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_INT32, "int");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_INT64, "int");
-        FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_UINT32, "int");
+        FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_UINT32, "int:Unsigned32");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_UINT64, "int");
-        FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_SINT32, "int");
+        FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_SINT32, "int:Signed32");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_SINT64, "int");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_FIXED32, "int");
         FIELD_TYPE_MAP.put(DescriptorProtos.FieldDescriptorProto.Type.TYPE_FIXED64, "int");

diff --git a/...c/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ClientSampleSyntaxTreeUtils.java b/...c/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ClientSampleSyntaxTreeUtils.java
@@ -345,6 +345,8 @@ private static Node getFieldPatternNode(Field field, Map<String, Message> msgMap
         Node node;
         switch (field.getFieldType()) {
             case "int":
+            case "int:Signed32":
+            case "int:Unsigned32":
             case "float":
             case "decimal":
                 node = getCaptureBindingPatternNode("1");

diff --git a/...s/src/test/resources/test-src/generated-sources/tool_test_data_type_12/testMessage_pb.bal b/...s/src/test/resources/test-src/generated-sources/tool_test_data_type_12/testMessage_pb.bal
@@ -2,7 +2,7 @@ import ballerina/protobuf;
 import ballerina/time;
 import ballerina/protobuf.types.'any;
 
-public const string TESTMESSAGE_DESC = "0A11746573744D6573736167652E70726F746F1A1F676F6F676C652F70726F746F6275662F74696D657374616D702E70726F746F1A19676F6F676C652F70726F746F6275662F616E792E70726F746F1A1C676F6F676C652F70726F746F6275662F7374727563742E70726F746F1A1E676F6F676C652F70726F746F6275662F6475726174696F6E2E70726F746F1A1E676F6F676C652F70726F746F6275662F77726170706572732E70726F746F221B0A05546573743112120A046E616D6518012001280952046E616D652285010A055465737432120C0A0161180120012809520161120C0A0162180220012801520162120C0A0163180320012802520163120C0A0164180420012805520164120C0A0165180520012803520165120C0A016618062001280D520166120C0A0167180720012804520167120C0A0168180820012807520168120C0A01691809200128065201692285010A055465737433120C0A0161180120032809520161120C0A0162180220032801520162120C0A0163180320032802520163120C0A0164180420032805520164120C0A0165180520032803520165120C0A016618062003280D520166120C0A0167180720032804520167120C0A0168180820032807520168120C0A016918092003280652016922FF010A055465737434123C0A0B74696D6544657461696C7318012001280B321A2E676F6F676C652E70726F746F6275662E54696D657374616D70520B74696D6544657461696C7312340A0A616E7944657461696C7318022001280B32142E676F6F676C652E70726F746F6275662E416E79520A616E7944657461696C73123D0A0D73747275637444657461696C7318032001280B32172E676F6F676C652E70726F746F6275662E537472756374520D73747275637444657461696C7312430A0F6475726174696F6E44657461696C7318042001280B32192E676F6F676C652E70726F746F6275662E4475726174696F6E520F6475726174696F6E44657461696C7322FF010A055465737435123C0A0B74696D6544657461696C7318012003280B321A2E676F6F676C652E70726F746F6275662E54696D657374616D70520B74696D6544657461696C7312340A0A616E7944657461696C7318022003280B32142E676F6F676C652E70726F746F6275662E416E79520A616E7944657461696C73123D0A0D73747275637444657461696C7318032003280B32172E676F6F676C652E70726F746F6275662E537472756374520D73747275637444657461696C7312430A0F6475726174696F6E44657461696C7318042003280B32192E676F6F676C652E70726F746F6275662E4475726174696F6E520F6475726174696F6E44657461696C73228D030A055465737436122A0A016118012001280B321C2E676F6F676C652E70726F746F6275662E537472696E6756616C756552016112290A016218022001280B321B2E676F6F676C652E70726F746F6275662E496E74333256616C7565520162122A0A016318032001280B321C2E676F6F676C652E70726F746F6275662E55496E74333256616C756552016312290A016418042001280B321B2E676F6F676C652E70726F746F6275662E496E74363456616C7565520164122A0A016518052001280B321C2E676F6F676C652E70726F746F6275662E55496E74363456616C7565520165122A0A016618062001280B321C2E676F6F676C652E70726F746F6275662E446F75626C6556616C756552016612290A016718072001280B321B2E676F6F676C652E70726F746F6275662E466C6F617456616C756552016712280A016818082001280B321A2E676F6F676C652E70726F746F6275662E426F6F6C56616C756552016812290A016918092001280B321B2E676F6F676C652E70726F746F6275662E427974657356616C7565520169620670726F746F33";
+public const string TESTMESSAGE_DESC = "0A11746573744D6573736167652E70726F746F1A1F676F6F676C652F70726F746F6275662F74696D657374616D702E70726F746F1A19676F6F676C652F70726F746F6275662F616E792E70726F746F1A1C676F6F676C652F70726F746F6275662F7374727563742E70726F746F1A1E676F6F676C652F70726F746F6275662F6475726174696F6E2E70726F746F1A1E676F6F676C652F70726F746F6275662F77726170706572732E70726F746F221B0A05546573743112120A046E616D6518012001280952046E616D652293010A055465737432120C0A0161180120012809520161120C0A0162180220012801520162120C0A0163180320012802520163120C0A0164180420012805520164120C0A0165180520012803520165120C0A016618062001280D520166120C0A0167180720012804520167120C0A0168180820012807520168120C0A0169180920012806520169120C0A016A180A2001281152016A2293010A055465737433120C0A0161180120032809520161120C0A0162180220032801520162120C0A0163180320032802520163120C0A0164180420032805520164120C0A0165180520032803520165120C0A016618062003280D520166120C0A0167180720032804520167120C0A0168180820032807520168120C0A0169180920032806520169120C0A016A180A2003281152016A22FF010A055465737434123C0A0B74696D6544657461696C7318012001280B321A2E676F6F676C652E70726F746F6275662E54696D657374616D70520B74696D6544657461696C7312340A0A616E7944657461696C7318022001280B32142E676F6F676C652E70726F746F6275662E416E79520A616E7944657461696C73123D0A0D73747275637444657461696C7318032001280B32172E676F6F676C652E70726F746F6275662E537472756374520D73747275637444657461696C7312430A0F6475726174696F6E44657461696C7318042001280B32192E676F6F676C652E70726F746F6275662E4475726174696F6E520F6475726174696F6E44657461696C7322FF010A055465737435123C0A0B74696D6544657461696C7318012003280B321A2E676F6F676C652E70726F746F6275662E54696D657374616D70520B74696D6544657461696C7312340A0A616E7944657461696C7318022003280B32142E676F6F676C652E70726F746F6275662E416E79520A616E7944657461696C73123D0A0D73747275637444657461696C7318032003280B32172E676F6F676C652E70726F746F6275662E537472756374520D73747275637444657461696C7312430A0F6475726174696F6E44657461696C7318042003280B32192E676F6F676C652E70726F746F6275662E4475726174696F6E520F6475726174696F6E44657461696C73228D030A055465737436122A0A016118012001280B321C2E676F6F676C652E70726F746F6275662E537472696E6756616C756552016112290A016218022001280B321B2E676F6F676C652E70726F746F6275662E496E74333256616C7565520162122A0A016318032001280B321C2E676F6F676C652E70726F746F6275662E55496E74333256616C756552016312290A016418042001280B321B2E676F6F676C652E70726F746F6275662E496E74363456616C7565520164122A0A016518052001280B321C2E676F6F676C652E70726F746F6275662E55496E74363456616C7565520165122A0A016618062001280B321C2E676F6F676C652E70726F746F6275662E446F75626C6556616C756552016612290A016718072001280B321B2E676F6F676C652E70726F746F6275662E466C6F617456616C756552016712280A016818082001280B321A2E676F6F676C652E70726F746F6275662E426F6F6C56616C756552016812290A016918092001280B321B2E676F6F676C652E70726F746F6275662E427974657356616C7565520169620670726F746F33";
 
 @protobuf:Descriptor {value: TESTMESSAGE_DESC}
 public type Test1 record {|
@@ -45,10 +45,11 @@ public type Test3 record {|
     float[] c = [];
     int[] d = [];
     int[] e = [];
-    int[] f = [];
+    int:Unsigned32[] f = [];
     int[] g = [];
     int[] h = [];
     int[] i = [];
+    int:Signed32[] j = [];
 |};
 
 @protobuf:Descriptor {value: TESTMESSAGE_DESC}
@@ -58,9 +59,10 @@ public type Test2 record {|
     float c = 0.0;
     int d = 0;
     int e = 0;
-    int f = 0;
+    int:Unsigned32 f = 0;
     int g = 0;
     int h = 0;
     int i = 0;
+    int:Signed32 j = 0;
 |};
 
diff --git a/tooling-tests/src/test/resources/test-src/proto-files/data-types/testMessage.proto b/tooling-tests/src/test/resources/test-src/proto-files/data-types/testMessage.proto
@@ -38,6 +38,7 @@ message Test2 {
     uint64 g = 7;
     fixed32 h = 8;
     fixed64 i = 9;
+    sint32 j = 10;
 }
 
 message Test3 {
@@ -50,6 +51,7 @@ message Test3 {
     repeated uint64 g = 7;
     repeated fixed32 h = 8;
     repeated fixed64 i = 9;
+    repeated sint32 j = 10;
 }
 
 message Test4 {