fix for #15 removing default parameter style information

Author: bartoszm

pom.xml

@@ -28,7 +28,7 @@
 <version>1.10.1-SNAPSHOT</version>
 <properties>
 <openapi.generator.version>6.2.0</openapi.generator.version>
-<jackson.version>2.14.0</jackson.version>
+<jackson.version>2.14.2</jackson.version>
 </properties>
 <dependencies>
 <!-- https://mvnrepository.com/artifact/org.openapitools/openapi-generator -->
@@ -61,7 +61,7 @@
 <dependency>
 <groupId>io.swagger.parser.v3</groupId>
 <artifactId>swagger-parser-v3</artifactId>
-<version>2.1.8</version>
+<version>2.1.12</version>
 </dependency>
 <dependency>
 <groupId>com.networknt</groupId>
@@ -100,7 +100,7 @@
 <dependency>
 <groupId>net.javacrumbs.json-unit</groupId>
 <artifactId>json-unit-assertj</artifactId>
-<version>2.36.0</version>
+<version>2.37.0</version>
 <scope>test</scope>
 </dependency>
 </dependencies>

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

@@ -46,6 +46,7 @@ public class ComposedPostprocessor implements Consumer<OpenAPI> {
 new ConvertOneOfToAllOffInheritance(),
 new UpdateDiscriminatorMapping(),
 new ConstrainDiscriminatorValueWithEnum(),
+new RemoveDefaultParameterValues(),
 new RemoveSchemaExtensions(Set.of(
 "x-try-renaming-on"
 ))

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

@@ -0,0 +1,88 @@
+package com.amartus.sonata.blender.impl.postprocess;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.headers.Header;
+import io.swagger.v3.oas.models.parameters.CookieParameter;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.QueryParameter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class RemoveDefaultParameterValues implements Consumer<OpenAPI> {
+
+
+@Override
+public void accept(OpenAPI api) {
+nullSafe(api.getPaths()).forEach(this::process);
+nullSafe(Optional
+.ofNullable(api.getComponents())
+.map(Components::getPathItems).orElse(null)
+).forEach(this::process);
+Optional.ofNullable(api.getComponents())
+.stream().flatMap(it -> nullSafe(it.getParameters()).entrySet().stream())
+.forEach(it -> process(it.getValue()));
+
+}
+
+private <T,V> Map<T, V> nullSafe(Map<T, V> v) {
+if(v == null) return Map.of();
+return v;
+}
+
+private <T> List<T> nullSafe(List<T> v) {
+return Optional.ofNullable(v).orElse(List.of());
+}
+protected void process(String name, PathItem item) {
+nullSafe(item.readOperations())
+.forEach(this::process);
+}
+
+private void process(Operation operation) {
+nullSafe(operation.getParameters()).forEach(this::process);
+nullSafe(operation.getResponses()).values().stream()
+.flatMap(it -> nullSafe(it.getHeaders()).values().stream())
+.forEach(this::process);
+}
+
+private final Function<Parameter, Parameter.StyleEnum> defaultFormat = par -> {
+if(par instanceof QueryParameter || par instanceof CookieParameter) {
+return Parameter.StyleEnum.FORM;
+}
+return Parameter.StyleEnum.SIMPLE;
+};
+
+private void process(Header header) {
+if(header == null) {
+return;
+}
+if(header.getStyle() == Header.StyleEnum.SIMPLE) {
+if(header.getExplode() == Boolean.FALSE) {
+header.setExplode(null);
+}
+header.setStyle(null);
+}
+}
+
+private void process(Parameter parameter) {
+var defStyle = defaultFormat.apply(parameter);
+
+if(defaultExplode(defStyle, parameter.getExplode())) {
+parameter.setExplode(null);
+}
+
+if(parameter.getStyle() == defStyle) {
+parameter.setStyle(null);
+}
+}
+
+private boolean defaultExplode(Parameter.StyleEnum defStyle, Boolean explode) {
+return (defStyle == Parameter.StyleEnum.FORM) == explode;
+}
+}

src/test/java/com/amartus/sonata/blender/impl/ValidateSpecificationTest.java

@@ -25,7 +25,9 @@
 import java.util.stream.Stream;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.contentOf;
 import static org.assertj.core.api.Assertions.entry;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ValidateSpecificationTest {
@@ -118,6 +120,15 @@ public void strictModeSupportsInheritance() throws IOException {
 );
 }
 
+@Test
+public void doesNotHaveDefaultValuesForParameters() throws IOException {
+Stream<String> args = args(target);
+var builder = builder();
+builder.build().parse(args.toArray(String[]::new)).run();
+
+assertThat(contentOf(target.toFile())).doesNotContain("exploded", "style");
+}
+
 @Test
 public void respectTarget() throws Exception {
 Stream<String> args = Streams.concat(args(target), Stream.of("--auto-discover"));