fix issue 1454 (almost?) completely: fix unit test

Author: Bruno Freudensprung

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/ResolverFully.java

@@ -380,6 +380,7 @@ public Schema resolveSchema(Schema schema) {
 
             if (aggregateCombinators && (hasAllOf || adjacent)) {
                 Schema combinedModel = SchemaTypeUtil.createSchema(composedSchema.getType(), composedSchema.getFormat());
+//                combinedModel.setDefault(composedSchema.getDefault());
                 Set<Object> examples = new HashSet<>();
                 Set<Object> defaultValues = new HashSet<>();
 
@@ -476,7 +477,6 @@ private void aggregateSchemaCombinators(ComposedSchema sourceSchema, Schema targ
                                             List<Schema> schemasToAggregate, Set<Object> examples, Set<Object> defaultValues) {
 
         Set<String> requiredProperties = new HashSet<>();
-
         for (Schema innerModel : schemasToAggregate) {
             Schema resolved = resolveSchema(innerModel);
             Map<String, Schema> properties = resolved.getProperties();
@@ -500,7 +500,11 @@ private void aggregateSchemaCombinators(ComposedSchema sourceSchema, Schema targ
             if (resolved.getExample() != null) {
                 examples.add(resolved.getExample());
             }
-            defaultValues.add(resolved.getDefault());
+            if (sourceSchema.getDefault() != null && resolved.getDefault() == null)
+                defaultValues.add(sourceSchema.getDefault());
+            else
+                defaultValues.add(resolved.getDefault());
+
             if (resolved.getExtensions() != null) {
                 Map<String, Object> extensions = resolved.getExtensions();
                 for (String key : extensions.keySet()) {

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java

@@ -2765,13 +2765,14 @@ public void testIssue1454AllOfDefaultValue(){
                 .get("enumProperty")
                 .getDefault(), "SCHEMA_DEFAULT");
 
+        OpenAPIV3Parser parser2 = new OpenAPIV3Parser();
         ParseOptions options = new ParseOptions();
         options.setResolve(true);
         options.setResolveFully(true);
         options.setResolveCombinators(true);
-        result = parser.readContents(json, null, options);
-        openAPI = result.getOpenAPI();
-        assertEquals(((Map<String, Schema>)openAPI.getComponents()
+        SwaggerParseResult result2 = parser2.readContents(json, null, options);
+        OpenAPI openAPI2 = result2.getOpenAPI();
+        assertEquals(((Map<String, Schema>)openAPI2.getComponents()
                 .getSchemas()
                 .get("SchemaWithDefaultAndEnum")
                 .getProperties())