Merge branch '7.0.x' into 7.1.x

confluentinc · Sep 13, 2022 · 940b619 · 940b619
2 parents 14e44da + b14aae7
commit 940b619
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...buf-provider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchema.java b/...buf-provider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchema.java
@@ -807,6 +807,7 @@ private static ReservedElement toReserved(ReservedRange range) {
     List<Object> values = new ArrayList<>();
     int start = range.getStart();
     int end = range.getEnd();
+    // inclusive, exclusive
     values.add(start == end - 1 ? start : new IntRange(start, end - 1));
     return new ReservedElement(DEFAULT_LOCATION, "", values);
   }
@@ -815,7 +816,8 @@ private static ReservedElement toReserved(EnumReservedRange range) {
     List<Object> values = new ArrayList<>();
     int start = range.getStart();
     int end = range.getEnd();
-    values.add(start == end - 1 ? start : new IntRange(start, end - 1));
+    // inclusive, inclusive
+    values.add(start == end ? start : new IntRange(start, end));
     return new ReservedElement(DEFAULT_LOCATION, "", values);
   }
 
@@ -1382,10 +1384,10 @@ private static EnumDefinition toDynamicEnum(EnumElement enumElem) {
           enumer.addReservedName((String) elem);
         } else if (elem instanceof Integer) {
           int tag = (Integer) elem;
-          enumer.addReservedRange(tag, tag + 1);
+          enumer.addReservedRange(tag, tag);
         } else if (elem instanceof IntRange) {
           IntRange range = (IntRange) elem;
-          enumer.addReservedRange(range.getStart(), range.getEndInclusive() + 1);
+          enumer.addReservedRange(range.getStart(), range.getEndInclusive());
         } else {
           throw new IllegalStateException("Unsupported reserved type: " + elem.getClass()
               .getName());

diff --git a/...provider/src/test/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaTest.java b/...provider/src/test/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaTest.java
@@ -373,6 +373,7 @@ public void testEnumReserved() {
         + "enum FooParameterType {\n"
         + "  reserved 20, 100 to max;\n"
         + "  reserved 10;\n"
+        + "  reserved 1 to 3;\n"
         + "  reserved \"BAD\", \"OLD\";\n"
         + "  NUMBER = 1;\n"
         + "  STRING = 2;\n"
@@ -385,6 +386,7 @@ public void testEnumReserved() {
         + "  optional .FooParameterType type = 2;\n"
         + "}\n"
         + "enum FooParameterType {\n"
+        + "  reserved 1 to 3;\n"
         + "  reserved 10;\n"
         + "  reserved 20;\n"
         + "  reserved 100 to max;\n"
@@ -862,6 +864,7 @@ public void testNormalization() {
         + "      string id = 1;\n"
         + "    }\n"
         + "    enum InnerEnum {\n"
+        + "      reserved 100 to 110;\n"
         + "      option allow_alias = true;\n"
         + "      TWO = 2;\n"
         + "      ONE = 1;\n"
@@ -966,6 +969,7 @@ public void testNormalization() {
         + "      string id = 1;\n"
         + "    }\n"
         + "    enum InnerEnum {\n"
+        + "      reserved 100 to 110;\n"
         + "      option allow_alias = true;\n"
         + "      ALSO_ZERO = 0;\n"
         + "      ZERO = 0 [deprecated = true];\n"