com.google.protobuf:protobuf-java - maven Package Compare versions

Comparing version 4.35.1 to 4.36.0-RC1

google/protobuf/descriptor.proto

@@ -527,3 +527,10 @@ // Protocol Buffers - Google's data interchange format
   // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default = true];
+  optional bool cc_enable_arenas = 31 [
+    default = true,
+    feature_support = {
+      edition_removed: EDITION_2026
+      removal_error: "cc_enable_arenas is enabled by default in every edition and overrides are ignored."
+                     "This option is removed in editions 2026 and above."
+    }
+  ];
 
@@ -933,3 +940,7 @@ // Sets the objective c class prefix which is prepended to all objective c
   // team. Custom options must use the 1000+ range instead.
-  extensions 990 to 998;
+  extensions 990 to 998 [declaration = {
+    number: 998,
+    full_name: ".pb.enumvalue.json",
+    type: ".pb.enumvalue.JsonEnumValueOptions"
+  }];
 
@@ -1173,3 +1184,3 @@ // The parser stores options it doesn't recognize here. See above.
     edition_defaults = { edition: EDITION_2024, value: "STYLE2024" },
-    edition_defaults = { edition: EDITION_UNSTABLE, value: "STYLE2026" }
+    edition_defaults = { edition: EDITION_2026, value: "STYLE2026" }
   ];
@@ -1205,5 +1216,37 @@
         edition_defaults = { edition: EDITION_LEGACY, value: "EXPORT_ALL" },
-        edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" }
+        edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" },
+        edition_defaults = { edition: EDITION_2026, value: "STRICT" }
       ];
 
+  message ProtoLimitsFeature {
+    enum EnforceProtoLimits {
+      PROTO_LIMITS_UNKNOWN = 0;
+
+      // Default pre-EDITION_2026: there are no limit enforcement at the protoc
+      // level. Practical limits still exist, but they will tend to fail while
+      // compiling protoc-generated code, and these limits tend to be language
+      // or toolchain specific.
+      LEGACY_NO_EXPLICIT_LIMITS = 1;
+
+      // A set of limits enforced by Edition 2026 by default. For a detailed
+      // list of all the limits please consult the Edition 2026 documentation.
+      PROTO_LIMITS2026 = 2;
+    }
+  }
+  optional ProtoLimitsFeature.EnforceProtoLimits enforce_proto_limits = 9 [
+    retention = RETENTION_SOURCE,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_FIELD,
+    targets = TARGET_TYPE_ONEOF,
+    feature_support = {
+      edition_introduced: EDITION_2026,
+    },
+    edition_defaults = {
+      edition: EDITION_LEGACY,
+      value: "LEGACY_NO_EXPLICIT_LIMITS"
+    },
+    edition_defaults = { edition: EDITION_2026, value: "PROTO_LIMITS2026" }
+  ];
+
   reserved 999;
@@ -1360,2 +1403,19 @@
     // of the label to the terminating semicolon).
+    //
+    // For options, the path refers to the interpreted option in the descriptor.
+    // E.g., for a custom option `(my_opt) = "foo"` on a message using extension
+    // number 10101, the path is:
+    //   [ 4, 3, 7, 10101 ]
+    // refers to:
+    //   file.message_type(3)     // 4, 3
+    //       .options()           // 7
+    //       .my_opt()            // 10101
+    //
+    // Sub-locations corresponding to the interpreted option's corresponding
+    // `UninterpretedOption` are also appended to the interpreted option, which
+    // deviates from the actual FileDescriptorProto path. E.g.:
+    //   [ 4, 3, 7, 10101, 2 ]
+    // refers to the option name `(my_opt)`, and:
+    //   [ 4, 3, 7, 10101, 7 ]
+    // refers to the "foo" string value of the option.
     repeated int32 path = 1 [packed = true];
@@ -1362,0 +1422,0 @@

google/protobuf/struct.proto

@@ -99,5 +99,5 @@ // Protocol Buffers - Google's data interchange format
 // A field of type `NullValue` with any value other than `0` is considered
-// invalid. Most ProtoJSON serializers will emit a Value with a `null_value` set
-// as a JSON `null` regardless of the integer value, and so will round trip to
-// a `0` value.
+// invalid. Most ProtoJSON serializers will emit a `Value` with a `null_value`
+// set as a JSON `null` regardless of the integer value, and so will round trip
+// to a `0` value.
 enum NullValue {
@@ -104,0 +104,0 @@ // Null value.

No alert changes

No metric changes