Java client, adds header

docs/generators/java.md

@@ -182,7 +182,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |parameters|✗|OAS3
 |examples|✗|OAS3
 |requestBodies|✓|OAS3
-|headers|✗|OAS3
+|headers|✓|OAS3
 |securitySchemes|✓|OAS3
 |links|✗|OAS3
 |callbacks|✗|OAS3
@@ -223,7 +223,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ComponentResponses|✓|OAS3
 |ComponentParameters|✗|OAS3
 |ComponentRequestBodies|✓|OAS3
-|ComponentHeaders|✗|OAS3
+|ComponentHeaders|✓|OAS3
 |ComponentSecuritySchemes|✓|OAS3
 |ComponentLinks|✗|OAS3
 |ComponentCallbacks|✗|OAS3
@@ -245,10 +245,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ### Operation Feature
 | Name | Supported | Defined By |
 | ---- | --------- | ---------- |
-|Responses_HttpStatusCode|✗|OAS3
-|Responses_RangedResponseCodes|✗|OAS3
-|Responses_Default|✗|OAS3
-|Responses_RedirectionResponse|✗|OAS3
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✓|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✓|OAS3
 |Security|✓|OAS2,OAS3
 |Servers|✓|OAS3
 

samples/client/3_0_3_unit_test/java/.openapi-generator/FILES

@@ -179,20 +179,32 @@ src/main/java/org/openapijsonschematools/client/components/schemas/UriTemplateFo
 src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java
 src/main/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlags.java
 src/main/java/org/openapijsonschematools/client/configurations/SchemaConfiguration.java
+src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeDeserializer.java
+src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeDetector.java
+src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeSerializer.java
 src/main/java/org/openapijsonschematools/client/exceptions/ApiException.java
 src/main/java/org/openapijsonschematools/client/exceptions/BaseException.java
 src/main/java/org/openapijsonschematools/client/exceptions/InvalidAdditionalPropertyException.java
 src/main/java/org/openapijsonschematools/client/exceptions/InvalidTypeException.java
 src/main/java/org/openapijsonschematools/client/exceptions/UnsetPropertyException.java
 src/main/java/org/openapijsonschematools/client/exceptions/ValidationException.java
+src/main/java/org/openapijsonschematools/client/header/ContentHeader.java
+src/main/java/org/openapijsonschematools/client/header/Header.java
+src/main/java/org/openapijsonschematools/client/header/HeaderBase.java
+src/main/java/org/openapijsonschematools/client/header/PrefixSeparatorIterator.java
+src/main/java/org/openapijsonschematools/client/header/Rfc6570Serializer.java
+src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java
+src/main/java/org/openapijsonschematools/client/header/StyleSimpleSerializer.java
 src/main/java/org/openapijsonschematools/client/mediatype/Encoding.java
 src/main/java/org/openapijsonschematools/client/mediatype/MediaType.java
+src/main/java/org/openapijsonschematools/client/parameter/ParameterInType.java
 src/main/java/org/openapijsonschematools/client/parameter/ParameterStyle.java
 src/main/java/org/openapijsonschematools/client/requestbody/GenericRequestBody.java
 src/main/java/org/openapijsonschematools/client/requestbody/RequestBodySerializer.java
 src/main/java/org/openapijsonschematools/client/requestbody/SerializedRequestBody.java
 src/main/java/org/openapijsonschematools/client/response/ApiResponse.java
 src/main/java/org/openapijsonschematools/client/response/DeserializedHttpResponse.java
+src/main/java/org/openapijsonschematools/client/response/HeadersDeserializer.java
 src/main/java/org/openapijsonschematools/client/response/ResponseDeserializer.java
 src/main/java/org/openapijsonschematools/client/response/ResponsesDeserializer.java
 src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java
@@ -296,6 +308,8 @@ src/main/java/org/openapijsonschematools/client/servers/ServerProvider.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithVariables.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
 src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.java
+src/test/java/org/openapijsonschematools/client/header/ContentHeaderTest.java
+src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java
 src/test/java/org/openapijsonschematools/client/requestbody/RequestBodySerializerTest.java
 src/test/java/org/openapijsonschematools/client/response/ResponseDeserializerTest.java
 src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeDeserializer.java

@@ -0,0 +1,18 @@
+package org.openapijsonschematools.client.contenttype;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.ToNumberPolicy;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class ContentTypeDeserializer {
+    private static final Gson gson = new GsonBuilder()
+            .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+            .setNumberToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+            .create();
+
+    @SuppressWarnings("nullness")
+    public static @Nullable Object fromJson(String json) {
+        return gson.fromJson(json, Object.class);
+    }
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeDetector.java

@@ -0,0 +1,18 @@
+package org.openapijsonschematools.client.contenttype;
+
+import java.util.regex.Pattern;
+
+public class ContentTypeDetector {
+    private static final Pattern jsonContentTypePattern = Pattern.compile(
+            "application/[^+]*[+]?(json);?.*"
+    );
+    private static final String textPlainContentType = "text/plain";
+
+    public static boolean contentTypeIsJson(String contentType) {
+        return jsonContentTypePattern.matcher(contentType).find();
+    }
+
+    public static boolean contentTypeIsTextPlain(String contentType) {
+        return textPlainContentType.equals(contentType);
+    }
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeSerializer.java

@@ -0,0 +1,18 @@
+package org.openapijsonschematools.client.contenttype;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.ToNumberPolicy;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class ContentTypeSerializer {
+    private static final Gson gson = new GsonBuilder()
+            .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+            .setNumberToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+            .create();
+
+    @SuppressWarnings("nullness")
+    public static String toJson(@Nullable Object body) {
+        return gson.toJson(body);
+    }
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/ContentHeader.java

@@ -0,0 +1,62 @@
+package org.openapijsonschematools.client.header;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.contenttype.ContentTypeDetector;
+import org.openapijsonschematools.client.contenttype.ContentTypeSerializer;
+import org.openapijsonschematools.client.contenttype.ContentTypeDeserializer;
+import org.openapijsonschematools.client.mediatype.MediaType;
+import org.openapijsonschematools.client.parameter.ParameterStyle;
+
+import java.net.http.HttpHeaders;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiPredicate;
+
+public class ContentHeader extends HeaderBase implements Header {
+    public final Map<String, MediaType<?, ?>> content;
+
+    public ContentHeader(boolean required, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map<String, MediaType<?, ?>> content) {
+        super(required, ParameterStyle.SIMPLE, explode, allowReserved);
+        this.content = content;
+    }
+
+    private static HttpHeaders toHeaders(String name, String value) {
+        Map<String, List<String>> map = Map.of(name, List.of(value));
+        BiPredicate<String, String> headerFilter = (key, val) -> true;
+        return HttpHeaders.of(map, headerFilter);
+    }
+
+    @Override
+    public HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration) {
+        for (Map.Entry<String, MediaType<?, ?>> entry: content.entrySet()) {
+            var castInData = validate ? entry.getValue().schema().validate(inData, configuration) : inData ;
+            String contentType = entry.getKey();
+            if (ContentTypeDetector.contentTypeIsJson(contentType)) {
+                var value = ContentTypeSerializer.toJson(castInData);
+                return toHeaders(name, value);
+            } else {
+                throw new RuntimeException("Serialization of "+contentType+" has not yet been implemented");
+            }
+        }
+        throw new RuntimeException("Invalid value for content, it was empty and must have 1 key value pair");
+    }
+
+    @Override
+    public @Nullable Object deserialize(List<String> inData, boolean validate, SchemaConfiguration configuration) {
+        String inDataJoined = String.join(",", inData); // unsure if this is needed
+        @Nullable Object deserializedJson = ContentTypeDeserializer.fromJson(inDataJoined);
+        if (validate) {
+            for (Map.Entry<String, MediaType<?, ?>> entry: content.entrySet()) {
+                String contentType = entry.getKey();
+                if (ContentTypeDetector.contentTypeIsJson(contentType)) {
+                    return entry.getValue().schema().validate(deserializedJson, configuration);
+                } else {
+                    throw new RuntimeException("Header deserialization of "+contentType+" has not yet been implemented");
+                }
+            }
+            throw new RuntimeException("Invalid value for content, it was empty and must have 1 key value pair");
+        }
+        return deserializedJson;
+    }
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/Header.java

@@ -0,0 +1,12 @@
+package org.openapijsonschematools.client.header;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+
+import java.net.http.HttpHeaders;
+import java.util.List;
+
+public interface Header {
+    HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration);
+    @Nullable Object deserialize(List<String> inData, boolean validate, SchemaConfiguration configuration);
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/HeaderBase.java

@@ -0,0 +1,18 @@
+package org.openapijsonschematools.client.header;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.parameter.ParameterStyle;
+
+public class HeaderBase {
+    public final boolean required;
+    public final @Nullable ParameterStyle style;
+    public final @Nullable Boolean explode;
+    public final @Nullable Boolean allowReserved;
+
+    public HeaderBase(boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved) {
+        this.required = required;
+        this.style = style;
+        this.explode = explode;
+        this.allowReserved = allowReserved;
+    }
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/PrefixSeparatorIterator.java

@@ -0,0 +1,27 @@
+package org.openapijsonschematools.client.header;
+
+import java.util.Set;
+
+public class PrefixSeparatorIterator {
+    // A class to store prefixes and separators for rfc6570 expansions
+    public final String prefix;
+    public final String separator;
+    private boolean first;
+    public final String itemSeparator;
+    private static final Set<String> reusedSeparators = Set.of(".", "|", "%20");
+
+    public PrefixSeparatorIterator(String prefix, String separator) {
+        this.prefix = prefix;
+        this.separator = separator;
+        itemSeparator = reusedSeparators.contains(separator) ? separator : ",";
+        first = true;
+    }
+
+    public String next() {
+        if (first) {
+            first = false;
+            return prefix;
+        }
+        return separator;
+    }
+}