google-protobuf 4.27.1-java → 4.27.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ccd99fe5ea28ca639a3567625a2f2aea02484539776caa477c3df3b835d293
-  data.tar.gz: eedd76e3b0a6d5794c4a29cd98ef9ce5de477b69762acce8ff0fd44bc86ac576
+  metadata.gz: 5327aff0383472d63ff24c373dd141df494d4bedbca16dbd4d69ca05757133b7
+  data.tar.gz: 6c3f73739aee552cd012f5f301dab861054f6b92508d7ede8fd722af3e71d2e9
 SHA512:
-  metadata.gz: d78be23c4c4ab359fd72de99fbac5ca4c9cee171413d85d5840a16fe9f44604dc533be2f3fd8ac7aeab5369f6ab6269fbb5144d2ef54937ba2878041242ea61e
-  data.tar.gz: 7ed71024a1820a0f91d72d9c270370a76bf8f8223bc25f85bf7d08a379aafc7034136e45f087bc259725ad0905069aa92f5312d8e0e7513072c2d4b078727a04
+  metadata.gz: bd90a85f9df1111d1c5688682f90ef001a7734b7c6590313f43e01e7d68e3e3c8f78198462e5153190f20bceebcc04d1b1266206326d69f1ee4574bde08f6887
+  data.tar.gz: 21e408974134fb82783f6461f4687c7d033015c356e456cdc67d7518d7f90c42f644b4df2ef3133c5e8b7ee71cdceedf59dcf58aa08bda0215e4b45f239a9f28

data/ext/google/protobuf_c/ruby-upb.c

@@ -13212,8 +13212,7 @@ bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) {
 
 bool _upb_FieldDef_IsGroupLike(const upb_FieldDef* f) {
   // Groups are always tag-delimited.
-  if (UPB_DESC(FeatureSet_message_encoding)(upb_FieldDef_ResolvedFeatures(f)) !=
-      UPB_DESC(FeatureSet_DELIMITED)) {
+  if (f->type_ != kUpb_FieldType_Group) {
     return false;
   }
 
@@ -13647,12 +13646,6 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
       UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto);
 
   f->type_ = (int)UPB_DESC(FieldDescriptorProto_type)(field_proto);
-  if (f->type_ == kUpb_FieldType_Message &&
-      // TODO: remove once we can deprecate kUpb_FieldType_Group.
-      UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
-          UPB_DESC(FeatureSet_DELIMITED)) {
-    f->type_ = kUpb_FieldType_Group;
-  }
 
   if (has_type) {
     switch (f->type_) {
@@ -13673,7 +13666,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix,
     }
   }
 
-  if (!has_type && has_type_name) {
+  if ((!has_type && has_type_name) || f->type_ == kUpb_FieldType_Message) {
     f->type_ =
         UPB_FIELD_TYPE_UNSPECIFIED;  // We'll assign this in resolve_subdef()
   } else {
@@ -13823,8 +13816,15 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix,
           break;
         case UPB_DEFTYPE_MSG:
           f->sub.msgdef = def;
-          f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
-                                              // this being a group.
+          f->type_ = kUpb_FieldType_Message;
+          // TODO: remove once we can deprecate
+          // kUpb_FieldType_Group.
+          if (UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) ==
+                  UPB_DESC(FeatureSet_DELIMITED) &&
+              !upb_MessageDef_IsMapEntry(def) &&
+              !(f->msgdef && upb_MessageDef_IsMapEntry(f->msgdef))) {
+            f->type_ = kUpb_FieldType_Group;
+          }
           f->has_presence = !upb_FieldDef_IsRepeated(f);
           break;
         default:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 4.27.1
+  version: 4.27.2
 platform: java
 authors:
 - Protobuf Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.1/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.27.2/ruby
 post_install_message:
 rdoc_options: []
 require_paths: