Merge pull request #13 from Amartus/issue09

Fix for #9

Author: bartoszm

src/main/java/com/amartus/sonata/blender/impl/postprocess/PropertyPostProcessor.java

@@ -23,14 +23,11 @@
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.text.WordUtils;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.*;
 import java.util.stream.Stream;
 
+import static com.amartus.sonata.blender.impl.util.Collections.mapCollector;
+
 /**
 * Abstract OAS API property postprocessor.
 * It traverse all properties from schemas (including compose schemas).
@@ -47,8 +44,7 @@ protected void process(String type, Schema schema) {
 Map<String, Schema> properties = toProperties(schema)
 .entrySet().stream()
 .map(e -> processProperty(e.getKey(), e.getValue()))
-
-.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+.collect(mapCollector());
 schema.setProperties(properties);
 if (schema instanceof ComposedSchema) {
 schemas(((ComposedSchema) schema).getAllOf())