Merge branch '7.0.x' into 7.1.x

confluentinc · Sep 15, 2022 · 9d0af34 · 9d0af34
2 parents 940b619 + 0ed50cd
commit 9d0af34
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...rovider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaUtils.java b/...rovider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaUtils.java
@@ -26,6 +26,7 @@
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
 
+import com.squareup.wire.Syntax;
 import com.squareup.wire.schema.Field.Label;
 import com.squareup.wire.schema.ProtoType;
 import com.squareup.wire.schema.internal.parser.EnumConstantElement;
@@ -110,9 +111,11 @@ protected static String toString(ProtoFileElement protoFile) {
   private static String toString(Context ctx, ProtoFileElement protoFile, boolean normalize) {
     StringBuilder sb = new StringBuilder();
     if (protoFile.getSyntax() != null) {
-      sb.append("syntax = \"");
-      sb.append(protoFile.getSyntax());
-      sb.append("\";\n");
+      if (!normalize || protoFile.getSyntax() == Syntax.PROTO_3) {
+        sb.append("syntax = \"");
+        sb.append(protoFile.getSyntax());
+        sb.append("\";\n");
+      }
     }
     if (protoFile.getPackageName() != null) {
       sb.append("package ");