tests and fix bug

Sixt · Sep 19, 2024 · 0b326c7 · 0b326c7
1 parent 812af6b
commit 0b326c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/internal/converter/testdata/proto/WellKnown.proto b/internal/converter/testdata/proto/WellKnown.proto
@@ -13,7 +13,7 @@ message WellKnown {
     map<int32, int32> map_of_scalar_integers = 3;
     repeated google.protobuf.Int32Value list_of_integers = 4;
 
-    google.protobuf.BoolValue bool_value = 5;
+    google.protobuf.BoolValue bool_value = 5; // description
     google.protobuf.BytesValue bytes_value = 6;
     google.protobuf.DoubleValue double_value = 7;
     google.protobuf.Duration duration = 8;

diff --git a/internal/converter/testdata/wellknown.go b/internal/converter/testdata/wellknown.go
@@ -53,7 +53,8 @@ const WellKnown = `{
                 {
                     "type": "boolean"
                 }
-            ]
+            ],
+            "description": "description"
         },
         "bytes_value": {
             "oneOf": [

diff --git a/internal/converter/types.go b/internal/converter/types.go
@@ -281,7 +281,8 @@ func (c *Converter) convertField(curPkg *ProtoPackage, desc *descriptor.FieldDes
 		case pkgName == ".google.protobuf":
 			jsonSchemaType.Type = recursedJSONSchemaType.Type
 			jsonSchemaType.OneOf = recursedJSONSchemaType.OneOf
-			return recursedJSONSchemaType, nil
+			jsonSchemaType.AdditionalProperties = nil
+			return jsonSchemaType, nil
 
 		// Objects:
 		default: