fix

Author: lucy66hw

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java

@@ -443,17 +443,13 @@ private void processNestedSchemas(Schema schema, Set<Schema> visitedSchemas) {
             List<Schema> newOneOfs = new ArrayList<>();
             for (Schema oneOf : oneOfs) {
                 Schema oneOfSchema = oneOf;
-                if (ModelUtils.isAllOf(oneOf) && oneOf.getAllOf() != null && !oneOf.getAllOf().isEmpty()) {
-                    if (oneOf.getAllOf().size() == 1) {
-                        Object allOfObj = oneOf.getAllOf().get(0);
-                        if (allOfObj instanceof Schema) {
-                            Schema allOfItem = (Schema) allOfObj;
-                            if (StringUtils.isNotEmpty(allOfItem.get$ref())) {
-                                oneOfSchema = ModelUtils.getReferencedSchema(openAPI, allOfItem);
-                            }
+                if (ModelUtils.isAllOf(oneOf) && oneOf.getAllOf() != null && oneOf.getAllOf().size() == 1) {
+                    Object allOfObj = oneOf.getAllOf().get(0);
+                    if (allOfObj instanceof Schema) {
+                        Schema allOfItem = (Schema) allOfObj;
+                        if (StringUtils.isNotEmpty(allOfItem.get$ref())) {
+                            oneOfSchema = ModelUtils.getReferencedSchema(openAPI, allOfItem);
                         }
-                    } else {
-                        LOGGER.warn("oneOf item has allOf with multiple items, which is not supported.");
                     }
                 } else {
                     oneOfSchema = ModelUtils.getReferencedSchema(openAPI, oneOf);

modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java

@@ -46,7 +46,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 
 import static org.openapitools.codegen.TestUtils.createCodegenModelWrapper;
@@ -102,38 +101,23 @@ private void assertFileEquals(Path generatedFilePath, Path expectedFilePath) thr
     public void testCodeGenWithPrimitiveOneOf() throws IOException {
         // set line break to \n across all platforms
         System.setProperty("line.separator", "\n");
-        Map<String, String> importmapping = new HashMap<>();
-        Map<String, String> typemapping = new HashMap<>();
-        typemapping.put("AnyType", "ObjectMap");
-        typemapping.put("object", "ObjectMap");
-        typemapping.put("bytes", "bytes");
-        typemapping.put("NullValue", "NullValue");
-        typemapping.put("number", "GeneralNumber");
+
         File output = Files.createTempDirectory("test").toFile();
-        Map<String, Object> additionalProperties = new HashMap<>();
-        additionalProperties.put("numberedFieldNumberList", true);
-        additionalProperties.put("aggregateModelsName", "aaaa");
-        additionalProperties.put("supportMultipleResponses", false);
-        Map<String, String> inline = new HashMap<>();
-        Map<String, String> globalProperty = new HashMap<>();
-        globalProperty.put("skipFormModel", "true");
-        inline.put("RESOLVE_INLINE_ENUMS", "true");
-        inline.put("SKIP_SCHEMA_REUSE", "true");
+
         final CodegenConfigurator configurator = new CodegenConfigurator()
                 .setGeneratorName("protobuf-schema")
                 .setInputSpec("src/test/resources/3_0/oneOf.yaml")
-                .setAdditionalProperties(additionalProperties)
-                .setTypeMappings(typemapping)
-                .setImportMappings(importmapping)
-                .setGlobalProperties(globalProperty)
-                .setInlineSchemaOptions(inline)
-                .setValidateSpec(false)
-                .setOutputDir("/home/user/openapi-generator/test/");
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
 
         final ClientOptInput clientOptInput = configurator.toClientOptInput();
         DefaultGenerator generator = new DefaultGenerator();
         List<File> files = generator.opts(clientOptInput).generate();
 
+        TestUtils.ensureContainsFile(files, output, "models/fruit.proto");
+        Path path = Paths.get(output + "/models/fruit.proto");
+
+        assertFileEquals(path, Paths.get("src/test/resources/3_0/protobuf-schema/fruitOneOf.proto"));
+
         output.deleteOnExit();
     }