From e0fdf7036d9bdca7bb2f5e8c3201a18e802ab537 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 3 Mar 2024 12:29:50 -0800 Subject: [PATCH 01/12] Adds parameter base classes --- .../petstore/java/.openapi-generator/FILES | 6 +- .../client/header/SchemaHeader.java | 2 +- .../client/header/StyleSerializer.java | 104 ++++++++++++++++++ .../client/parameter/ContentParameter.java | 38 +++++++ .../client/parameter/NonQueryParameter.java | 8 ++ .../client/parameter/QueryParameter.java | 9 ++ .../client/parameter/SchemaParameter.java | 81 ++++++++++++++ .../generators/JavaClientGenerator.java | 24 +++- .../java/packagename/header/SchemaHeader.hbs | 2 +- .../packagename/header/StyleSerializer.hbs | 104 ++++++++++++++++++ .../header/StyleSimpleSerializer.hbs | 21 ---- .../parameter/ContentParameter.hbs | 38 +++++++ .../parameter/NonQueryParameter.hbs | 8 ++ .../packagename/parameter/QueryParameter.hbs | 9 ++ .../packagename/parameter/SchemaParameter.hbs | 81 ++++++++++++++ 15 files changed, 507 insertions(+), 28 deletions(-) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java create mode 100644 src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs delete mode 100644 src/main/resources/java/src/main/java/packagename/header/StyleSimpleSerializer.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index a99a6b47061..cd7f832a3e2 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -546,11 +546,15 @@ 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/header/StyleSerializer.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/ContentParameter.java +src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.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/parameter/QueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/Responses.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/responses/Code200Response.java diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java index c1ac0bfba37..e4fcfd99924 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java @@ -33,7 +33,7 @@ private static HttpHeaders toHeaders(String name, String value) { public HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration) { var castInData = validate ? schema.validate(inData, configuration) : inData; boolean usedExplode = explode != null && explode; - var value = StyleSimpleSerializer.serializeSimple(castInData, name, usedExplode, false); + var value = StyleSerializer.serializeSimple(castInData, name, usedExplode, false); return toHeaders(name, value); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java new file mode 100644 index 00000000000..e0beac85c7f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java @@ -0,0 +1,104 @@ +package org.openapijsonschematools.client.header; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public class StyleSerializer extends Rfc6570Serializer { + public static String serializeSimple( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode + ) { + var prefixSeparatorIterator = new PrefixSeparatorIterator("", ","); + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + prefixSeparatorIterator + ); + } + + public static String serializeForm( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode, + @Nullable PrefixSeparatorIterator iterator, + boolean isCookie + ) { + // todo check that the prefix and suffix matches this one + String prefix = isCookie ? "" : "?"; + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(isCookie, "&") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + percentEncode, + usedIterator + ) + } + + public static String serializeMatrix( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(";", ";"); + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeLabel( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(".", "."); + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeSpaceDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ) + } + + public static String serializePipeDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ) + } + +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java new file mode 100644 index 00000000000..cb783b5dbfd --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java @@ -0,0 +1,38 @@ +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 java.util.Map; + +public class ContentParameter extends HeaderBase implements Parameter { + public final String name; + public final ParameterInType inType; + public final Map> content; + + public ContentHeader(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + this.content = content; + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + for (Map.Entry> 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 Map.of(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"); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java new file mode 100644 index 00000000000..5155c7d9ee1 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java @@ -0,0 +1,8 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; + +public interface NonQueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java new file mode 100644 index 00000000000..145c057735f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java @@ -0,0 +1,9 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; + +public interface QueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); + PrefixSeparatorIterator iterator getPrefixSeparatorIterator(); +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java new file mode 100644 index 00000000000..3d77a4201b0 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.contenttype.ContentTypeDeserializer; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; +import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory; +import org.openapijsonschematools.client.schemas.validation.UnsetAnyTypeJsonSchema; + +import java.util.Map; + +public class SchemaParameter extends HeaderBase { + public final String name; + public final ParameterInType inType; + public final JsonSchema schema; + + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, JsonSchema schema) { + super(required, ParameterStyle.SIMPLE, explode, allowReserved); + this.name = name; + this.inType = inType; + this.schema = schema; + } + + private ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator iterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle is ParameterStyle.FORM) { + return PrefixSeparatorIterator('?', '&') + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return PrefixSeparatorIterator('', '%20') + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return PrefixSeparatorIterator('', '|') + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + var castInData = validate ? schema.validate(inData, configuration) : inData; + ParameterStyle usedStyle = getStyle(); + boolean percentEncode = (inType == ParameterInType.QUERY || inType == ParameterInType.PATH) ? true : false; + String value; + if (usedStyle == ParameterStyle.SIMPLE) { + // header OR path + boolean usedExplode = explode == null ? false : explode; + value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); + } else if (usedStyle == ParameterStyle.FORM) { + // query OR cookie + boolean usedExplode = explode == null ? true : explode; + boolean isCookie = inType == ParameterInType.COOKIE; + value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); + } else if (usedStyle == ParameterStyle.LABEL) { + // path + value = StyleSerializer.serializeLabel(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.MATRIX) { + // path + value = StyleSerializer.serializeMatrix(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + // query + value = StyleSerializer.serializeSpaceDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + // query + value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.DEEP_OBJECT) { + // query + throw new RuntimeException("Style deep object serialization has not yet been implemented."); + } + return Map.of(name, value); + } +} \ No newline at end of file diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index b2db2b73472..cabbef9aabf 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -806,9 +806,9 @@ public void processOpts() { packagePath() + File.separatorChar + "header", "ContentHeader.java")); supportingFiles.add(new SupportingFile( - "src/main/java/packagename/header/StyleSimpleSerializer.hbs", + "src/main/java/packagename/header/StyleSerializer.hbs", packagePath() + File.separatorChar + "header", - "StyleSimpleSerializer.java")); + "StyleSerializer.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/header/Rfc6570Serializer.hbs", packagePath() + File.separatorChar + "header", @@ -828,13 +828,29 @@ public void processOpts() { // parameter supportingFiles.add(new SupportingFile( - "src/main/java/packagename/parameter/ParameterStyle.hbs", + "src/main/java/packagename/parameter/ContentParameter.hbs", packagePath() + File.separatorChar + "parameter", - "ParameterStyle.java")); + "ContentParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/NonQueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "NonQueryParameter.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/parameter/ParameterInType.hbs", packagePath() + File.separatorChar + "parameter", "ParameterInType.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/ParameterStyle.hbs", + packagePath() + File.separatorChar + "parameter", + "ParameterStyle.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/QueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "QueryParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/SchemaParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "SchemaParameter.java")); // response supportingFiles.add(new SupportingFile( diff --git a/src/main/resources/java/src/main/java/packagename/header/SchemaHeader.hbs b/src/main/resources/java/src/main/java/packagename/header/SchemaHeader.hbs index c3be42398e3..d09a12e8388 100644 --- a/src/main/resources/java/src/main/java/packagename/header/SchemaHeader.hbs +++ b/src/main/resources/java/src/main/java/packagename/header/SchemaHeader.hbs @@ -33,7 +33,7 @@ public class SchemaHeader extends HeaderBase implements Header { public HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration) { var castInData = validate ? schema.validate(inData, configuration) : inData; boolean usedExplode = explode != null && explode; - var value = StyleSimpleSerializer.serializeSimple(castInData, name, usedExplode, false); + var value = StyleSerializer.serializeSimple(castInData, name, usedExplode, false); return toHeaders(name, value); } diff --git a/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs b/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs new file mode 100644 index 00000000000..e37b977df6e --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs @@ -0,0 +1,104 @@ +package {{{packageName}}}.header; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public class StyleSerializer extends Rfc6570Serializer { + public static String serializeSimple( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode + ) { + var prefixSeparatorIterator = new PrefixSeparatorIterator("", ","); + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + prefixSeparatorIterator + ); + } + + public static String serializeForm( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode, + @Nullable PrefixSeparatorIterator iterator, + boolean isCookie + ) { + // todo check that the prefix and suffix matches this one + String prefix = isCookie ? "" : "?"; + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(isCookie, "&") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + percentEncode, + usedIterator + ) + } + + public static String serializeMatrix( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(";", ";"); + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeLabel( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(".", "."); + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeSpaceDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ) + } + + public static String serializePipeDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; + return cls.rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ) + } + +} diff --git a/src/main/resources/java/src/main/java/packagename/header/StyleSimpleSerializer.hbs b/src/main/resources/java/src/main/java/packagename/header/StyleSimpleSerializer.hbs deleted file mode 100644 index d4a1b2173fe..00000000000 --- a/src/main/resources/java/src/main/java/packagename/header/StyleSimpleSerializer.hbs +++ /dev/null @@ -1,21 +0,0 @@ -package {{{packageName}}}.header; - -import org.checkerframework.checker.nullness.qual.Nullable; - -public class StyleSimpleSerializer extends Rfc6570Serializer { - public static String serializeSimple( - @Nullable Object inData, - String name, - boolean explode, - boolean percentEncode - ) { - var prefixSeparatorIterator = new PrefixSeparatorIterator("", ","); - return rfc6570Expansion( - name, - inData, - explode, - percentEncode, - prefixSeparatorIterator - ); - } -} diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs new file mode 100644 index 00000000000..3f2ea3fce37 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs @@ -0,0 +1,38 @@ +package {{{packageName}}}.header; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.contenttype.ContentTypeDetector; +import {{{packageName}}}.contenttype.ContentTypeSerializer; +import {{{packageName}}}.contenttype.ContentTypeDeserializer; +import {{{packageName}}}.mediatype.MediaType; + +import java.util.Map; + +public class ContentParameter extends HeaderBase implements Parameter { + public final String name; + public final ParameterInType inType; + public final Map> content; + + public ContentHeader(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + this.content = content; + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + for (Map.Entry> 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 Map.of(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"); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs new file mode 100644 index 00000000000..8f5defd3155 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs @@ -0,0 +1,8 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; + +public interface NonQueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs new file mode 100644 index 00000000000..fc03113a76a --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs @@ -0,0 +1,9 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; + +public interface QueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); + PrefixSeparatorIterator iterator getPrefixSeparatorIterator(); +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs new file mode 100644 index 00000000000..624cfa0f384 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs @@ -0,0 +1,81 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.contenttype.ContentTypeDeserializer; +import {{{packageName}}}.header.StyleSerializer; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.JsonSchemaFactory; +import {{{packageName}}}.schemas.validation.UnsetAnyTypeJsonSchema; + +import java.util.Map; + +public class SchemaParameter extends HeaderBase { + public final String name; + public final ParameterInType inType; + public final JsonSchema schema; + + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, JsonSchema schema) { + super(required, ParameterStyle.SIMPLE, explode, allowReserved); + this.name = name; + this.inType = inType; + this.schema = schema; + } + + private ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator iterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle is ParameterStyle.FORM) { + return PrefixSeparatorIterator('?', '&') + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return PrefixSeparatorIterator('', '%20') + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return PrefixSeparatorIterator('', '|') + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + var castInData = validate ? schema.validate(inData, configuration) : inData; + ParameterStyle usedStyle = getStyle(); + boolean percentEncode = (inType == ParameterInType.QUERY || inType == ParameterInType.PATH) ? true : false; + String value; + if (usedStyle == ParameterStyle.SIMPLE) { + // header OR path + boolean usedExplode = explode == null ? false : explode; + value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); + } else if (usedStyle == ParameterStyle.FORM) { + // query OR cookie + boolean usedExplode = explode == null ? true : explode; + boolean isCookie = inType == ParameterInType.COOKIE; + value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); + } else if (usedStyle == ParameterStyle.LABEL) { + // path + value = StyleSerializer.serializeLabel(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.MATRIX) { + // path + value = StyleSerializer.serializeMatrix(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + // query + value = StyleSerializer.serializeSpaceDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + // query + value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.DEEP_OBJECT) { + // query + throw new RuntimeException("Style deep object serialization has not yet been implemented."); + } + return Map.of(name, value); + } +} \ No newline at end of file From 186ae97bff06c26290bd5d5d40e194da491c87a6 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 3 Mar 2024 13:22:30 -0800 Subject: [PATCH 02/12] Generates parameter classes --- .../petstore/java/.openapi-generator/FILES | 71 ++++++++++++++++ ...omponentrefschemastringwithvalidation.java | 39 +++++++++ .../components/parameters/pathusername.java | 23 +++++ .../parameters/refpathusername.java | 6 ++ .../refschemastringwithvalidation.java | 23 +++++ .../delete/parameters/parameter0.java | 23 +++++ .../delete/parameters/parameter1.java | 23 +++++ .../get/parameters/parameter0.java | 23 +++++ .../parameters/parameter0.java | 23 +++++ .../post/parameters/parameter0.java | 23 +++++ .../fake/delete/parameters/parameter0.java | 23 +++++ .../fake/delete/parameters/parameter1.java | 23 +++++ .../fake/delete/parameters/parameter2.java | 23 +++++ .../fake/delete/parameters/parameter3.java | 23 +++++ .../fake/delete/parameters/parameter4.java | 23 +++++ .../fake/delete/parameters/parameter5.java | 23 +++++ .../paths/fake/get/parameters/parameter0.java | 23 +++++ .../paths/fake/get/parameters/parameter1.java | 23 +++++ .../paths/fake/get/parameters/parameter2.java | 23 +++++ .../paths/fake/get/parameters/parameter3.java | 23 +++++ .../paths/fake/get/parameters/parameter4.java | 23 +++++ .../paths/fake/get/parameters/parameter5.java | 23 +++++ .../put/parameters/parameter0.java | 23 +++++ .../put/parameters/parameter0.java | 23 +++++ .../put/parameters/parameter1.java | 23 +++++ .../put/parameters/parameter2.java | 23 +++++ .../delete/parameters/parameter0.java | 23 +++++ .../post/parameters/parameter0.java | 23 +++++ .../post/parameters/parameter1.java | 23 +++++ .../get/parameters/parameter0.java | 23 +++++ .../post/parameters/parameter0.java | 23 +++++ .../post/parameters/parameter1.java | 23 +++++ .../post/parameters/parameter10.java | 23 +++++ .../post/parameters/parameter11.java | 23 +++++ .../post/parameters/parameter12.java | 23 +++++ .../post/parameters/parameter13.java | 23 +++++ .../post/parameters/parameter14.java | 23 +++++ .../post/parameters/parameter15.java | 23 +++++ .../post/parameters/parameter16.java | 23 +++++ .../post/parameters/parameter17.java | 23 +++++ .../post/parameters/parameter18.java | 23 +++++ .../post/parameters/parameter2.java | 23 +++++ .../post/parameters/parameter3.java | 23 +++++ .../post/parameters/parameter4.java | 23 +++++ .../post/parameters/parameter5.java | 23 +++++ .../post/parameters/parameter6.java | 23 +++++ .../post/parameters/parameter7.java | 23 +++++ .../post/parameters/parameter8.java | 23 +++++ .../post/parameters/parameter9.java | 23 +++++ .../post/parameters/parameter0.java | 23 +++++ .../get/parameters/parameter0.java | 39 +++++++++ .../get/parameters/parameter0.java | 23 +++++ .../put/parameters/parameter0.java | 23 +++++ .../put/parameters/parameter1.java | 23 +++++ .../put/parameters/parameter2.java | 23 +++++ .../put/parameters/parameter3.java | 23 +++++ .../put/parameters/parameter4.java | 23 +++++ .../put/parameters/parameter5.java | 23 +++++ .../get/parameters/parameter0.java | 23 +++++ .../get/parameters/parameter0.java | 23 +++++ .../delete/parameters/parameter0.java | 23 +++++ .../delete/parameters/parameter1.java | 23 +++++ .../petpetid/get/parameters/parameter0.java | 23 +++++ .../petpetid/post/parameters/parameter0.java | 23 +++++ .../post/parameters/parameter0.java | 23 +++++ .../delete/parameters/parameter0.java | 23 +++++ .../get/parameters/parameter0.java | 23 +++++ .../userlogin/get/parameters/parameter0.java | 23 +++++ .../userlogin/get/parameters/parameter1.java | 23 +++++ .../delete/parameters/parameter0.java | 7 ++ .../get/parameters/parameter0.java | 7 ++ .../put/parameters/parameter0.java | 7 ++ .../codegen/generators/DefaultGenerator.java | 3 +- .../generators/JavaClientGenerator.java | 7 ++ .../openapimodels/CodegenParameter.java | 4 +- .../packagename/components/headers/Header.hbs | 2 +- .../components/parameter/Parameter.hbs | 84 +++++++++++++++++++ 77 files changed, 1768 insertions(+), 3 deletions(-) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java create mode 100644 src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index cd7f832a3e2..d5f271a7b20 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -345,8 +345,12 @@ src/main/java/org/openapijsonschematools/client/components/headers/numberheader/ src/main/java/org/openapijsonschematools/client/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java src/main/java/org/openapijsonschematools/client/components/headers/refschemaheader/RefSchemaHeaderSchema.java src/main/java/org/openapijsonschematools/client/components/headers/stringheader/StringHeaderSchema.java +src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/ApplicationjsonSchema.java +src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java src/main/java/org/openapijsonschematools/client/components/parameters/pathusername/Schema.java +src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java +src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation/Schema.java src/main/java/org/openapijsonschematools/client/components/requestbodies/Client.java src/main/java/org/openapijsonschematools/client/components/requestbodies/Pet.java @@ -562,29 +566,40 @@ src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/res src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/responses/Code200Response.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2/Schema2.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3/Schema3.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4/Schema4.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java @@ -592,11 +607,17 @@ src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters. src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/get/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fake/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2/Schema2.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4/Schema4.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java src/main/java/org/openapijsonschematools/client/paths/fake/get/responses/Code200Response.java @@ -625,13 +646,17 @@ src/main/java/org/openapijsonschematools/client/paths/fakebodywithfileschema/put src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -642,6 +667,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/re src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/responses/CodedefaultResponse.java @@ -655,7 +681,9 @@ src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproper src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/MultipartformdataSchema.java @@ -695,6 +723,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java @@ -703,24 +732,43 @@ src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ab src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/responses/Code200Response.java @@ -734,6 +782,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithre src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/MultipartformdataSchema.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/responses/Code200Response.java @@ -741,6 +790,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithre src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/responses/code200response/content/applicationjson/ApplicationjsonSchema.java @@ -749,6 +799,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakeredirection/get/respon src/main/java/org/openapijsonschematools/client/paths/fakeredirection/get/responses/Code3XXResponse.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakerefsarraymodel/post/RequestBody.java @@ -800,11 +851,17 @@ src/main/java/org/openapijsonschematools/client/paths/fakeresponsewithoutschema/ src/main/java/org/openapijsonschematools/client/paths/fakeresponsewithoutschema/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/Responses.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeuploaddownloadfile/post/RequestBody.java @@ -862,6 +919,7 @@ src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Petfindbys src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/responses/Code400Response.java @@ -874,6 +932,7 @@ src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/se src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/responses/Code400Response.java @@ -883,7 +942,9 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderPara src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java @@ -891,6 +952,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/P src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/Code400Response.java @@ -902,6 +964,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParamete src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/responses/Code405Response.java @@ -911,6 +974,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/P src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/Responses.java +src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/MultipartformdataSchema.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/responses/Code200Response.java @@ -930,11 +994,13 @@ src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/ src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/code200response/content/applicationxml/ApplicationxmlSchema.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/responses/Code404Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/responses/Code400Response.java @@ -953,7 +1019,9 @@ src/main/java/org/openapijsonschematools/client/paths/usercreatewithlist/post/Re src/main/java/org/openapijsonschematools/client/paths/usercreatewithlist/post/responses/CodedefaultResponse.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/Code400Response.java @@ -972,10 +1040,12 @@ src/main/java/org/openapijsonschematools/client/paths/userlogout/get/Responses.j src/main/java/org/openapijsonschematools/client/paths/userlogout/get/responses/CodedefaultResponse.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/Responses.java +src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/responses/Code404Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/Responses.java +src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code404Response.java @@ -984,6 +1054,7 @@ src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/Responses.java +src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/responses/Code404Response.java diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java new file mode 100644 index 00000000000..0139b520c94 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java @@ -0,0 +1,39 @@ +package org.openapijsonschematools.client.components.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.ContentParameter; +import org.openapijsonschematools.client.mediatype.MediaType; +import org.openapijsonschematools.client.components.parameters.componentrefschemastringwithvalidation.content.applicationjson.ApplicationjsonSchema; + +import java.util.AbstractMap; +import java.util.Map; + +public class ComponentRefSchemaStringWithValidation { + + public record ApplicationjsonMediaType(ApplicationjsonSchema.ApplicationjsonSchema1 schema) implements MediaType { + public ApplicationjsonMediaType() { + this(ApplicationjsonSchema.ApplicationjsonSchema1.getInstance()); + } + @Override + public Void encoding() { + return null; + } + } + + public static class ComponentRefSchemaStringWithValidation1 extends ContentParameter implements NonQueryQueryParameter { + public ComponentRefSchemaStringWithValidation1() { + super( + "CRSstringWithValidation", + ParameterInType.path, + true, + null, + null, + Map.ofEntries( + new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) + ) + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java new file mode 100644 index 00000000000..b549311b782 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.components.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.components.parameters.pathusername.Schema; + +public class PathUserName { + + public static class PathUserName1 extends SchemaParameter implements NonQueryQueryParameter { + public PathUserName1() { + super( + "username", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema.Schema1.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java new file mode 100644 index 00000000000..97c00319c77 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java @@ -0,0 +1,6 @@ +package org.openapijsonschematools.client.components.parameters; + + +public class RefPathUserName extends pathusername { + public static class RefPathUserName1 extends pathusername1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java new file mode 100644 index 00000000000..7192cda0f4a --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.components.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.components.parameters.refschemastringwithvalidation.Schema; + +public class RefSchemaStringWithValidation { + + public static class RefSchemaStringWithValidation1 extends SchemaParameter implements NonQueryQueryParameter { + public RefSchemaStringWithValidation1() { + super( + "RSstringWithValidation", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema.Schema1.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java new file mode 100644 index 00000000000..8e258e49207 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "someHeader", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java new file mode 100644 index 00000000000..49c02c31658 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { + public Model11() { + super( + "subDir", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java new file mode 100644 index 00000000000..c87e12b2d2a --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "searchStr", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java new file mode 100644 index 00000000000..1cab1aff430 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.commonparamsubdir.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "subDir", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + PathParamSchema0.PathParamSchema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java new file mode 100644 index 00000000000..1996023af55 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "someHeader", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java new file mode 100644 index 00000000000..a66df4fba1f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "required_string_group", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java new file mode 100644 index 00000000000..430323d4c14 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { + public Model11() { + super( + "required_boolean_group", + ParameterInType.header, + true, + ParameterStyle.simple, + false, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java new file mode 100644 index 00000000000..3015c12fcb1 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter2.Schema2; + +public class Model2 { + + public static class Model21 extends SchemaParameter implements QueryParameter { + public Model21() { + super( + "required_int64_group", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema2.Schema21.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java new file mode 100644 index 00000000000..de27622a227 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter3.Schema3; + +public class Model3 { + + public static class Model31 extends SchemaParameter implements QueryParameter { + public Model31() { + super( + "string_group", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema3.Schema31.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java new file mode 100644 index 00000000000..04f81ab81fd --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter4.Schema4; + +public class Model4 { + + public static class Model41 extends SchemaParameter implements NonQueryQueryParameter { + public Model41() { + super( + "boolean_group", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema4.Schema41.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java new file mode 100644 index 00000000000..914d56f394c --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter5.Schema5; + +public class Model5 { + + public static class Model51 extends SchemaParameter implements QueryParameter { + public Model51() { + super( + "int64_group", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema5.Schema51.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java new file mode 100644 index 00000000000..69a084bea52 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "enum_header_string_array", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java new file mode 100644 index 00000000000..bee222f121c --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { + public Model11() { + super( + "enum_header_string", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java new file mode 100644 index 00000000000..9aa452f2c1b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter2.Schema2; + +public class Model2 { + + public static class Model21 extends SchemaParameter implements QueryParameter { + public Model21() { + super( + "enum_query_string_array", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema2.Schema21.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java new file mode 100644 index 00000000000..4554371322e --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter3.Schema3; + +public class Model3 { + + public static class Model31 extends SchemaParameter implements QueryParameter { + public Model31() { + super( + "enum_query_string", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema3.Schema31.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java new file mode 100644 index 00000000000..252949f5785 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter4.Schema4; + +public class Model4 { + + public static class Model41 extends SchemaParameter implements QueryParameter { + public Model41() { + super( + "enum_query_integer", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema4.Schema41.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java new file mode 100644 index 00000000000..879177dcf85 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fake.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fake.get.parameters.parameter5.Schema5; + +public class Model5 { + + public static class Model51 extends SchemaParameter implements QueryParameter { + public Model51() { + super( + "enum_query_double", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema5.Schema51.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java new file mode 100644 index 00000000000..ee93ce8f746 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "query", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java new file mode 100644 index 00000000000..258c6d1ef3b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "someVar", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java new file mode 100644 index 00000000000..35d1be66e30 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements QueryParameter { + public Model11() { + super( + "SomeVar", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java new file mode 100644 index 00000000000..0c2bca93e65 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter2.Schema2; + +public class Model2 { + + public static class Model21 extends SchemaParameter implements QueryParameter { + public Model21() { + super( + "some_var", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema2.Schema21.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java new file mode 100644 index 00000000000..6e53eb31942 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "id", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java new file mode 100644 index 00000000000..970e82ca8e3 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "compositionAtRoot", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java new file mode 100644 index 00000000000..6fada6122ea --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements QueryParameter { + public Model11() { + super( + "compositionInProperty", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java new file mode 100644 index 00000000000..ff0807a1177 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "mapBean", + ParameterInType.query, + false, + ParameterStyle.deepObject, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java new file mode 100644 index 00000000000..bce0a1940b5 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "1", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java new file mode 100644 index 00000000000..5161cfbe68f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements QueryParameter { + public Model11() { + super( + "aB", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java new file mode 100644 index 00000000000..7b0bef94d91 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter10.Schema10; + +public class Model10 { + + public static class Model101 extends SchemaParameter implements NonQueryQueryParameter { + public Model101() { + super( + "aB", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema10.Schema101.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java new file mode 100644 index 00000000000..e8abb5230e4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter11.Schema11; + +public class Model11 { + + public static class Model111 extends SchemaParameter implements NonQueryQueryParameter { + public Model111() { + super( + "Ab", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema11.Schema111.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java new file mode 100644 index 00000000000..304d374ac7e --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter12.Schema12; + +public class Model12 { + + public static class Model121 extends SchemaParameter implements NonQueryQueryParameter { + public Model121() { + super( + "self", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema12.Schema121.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java new file mode 100644 index 00000000000..8496fdb72b4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13.Schema13; + +public class Model13 { + + public static class Model131 extends SchemaParameter implements NonQueryQueryParameter { + public Model131() { + super( + "A-B", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema13.Schema131.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java new file mode 100644 index 00000000000..3dd44e03173 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter14.Schema14; + +public class Model14 { + + public static class Model141 extends SchemaParameter implements NonQueryQueryParameter { + public Model141() { + super( + "1", + ParameterInType.cookie, + false, + ParameterStyle.form, + true, + Schema14.Schema141.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java new file mode 100644 index 00000000000..a5544422a30 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter15.Schema15; + +public class Model15 { + + public static class Model151 extends SchemaParameter implements NonQueryQueryParameter { + public Model151() { + super( + "aB", + ParameterInType.cookie, + false, + ParameterStyle.form, + true, + Schema15.Schema151.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java new file mode 100644 index 00000000000..d76cf1f80c4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter16.Schema16; + +public class Model16 { + + public static class Model161 extends SchemaParameter implements NonQueryQueryParameter { + public Model161() { + super( + "Ab", + ParameterInType.cookie, + false, + ParameterStyle.form, + true, + Schema16.Schema161.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java new file mode 100644 index 00000000000..b5b5bd9f1a1 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17.Schema17; + +public class Model17 { + + public static class Model171 extends SchemaParameter implements NonQueryQueryParameter { + public Model171() { + super( + "self", + ParameterInType.cookie, + false, + ParameterStyle.form, + true, + Schema17.Schema171.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java new file mode 100644 index 00000000000..db449ef7523 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18.Schema18; + +public class Model18 { + + public static class Model181 extends SchemaParameter implements NonQueryQueryParameter { + public Model181() { + super( + "A-B", + ParameterInType.cookie, + false, + ParameterStyle.form, + true, + Schema18.Schema181.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java new file mode 100644 index 00000000000..fd6f37837e7 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter2.Schema2; + +public class Model2 { + + public static class Model21 extends SchemaParameter implements QueryParameter { + public Model21() { + super( + "Ab", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema2.Schema21.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java new file mode 100644 index 00000000000..586840841e8 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3.Schema3; + +public class Model3 { + + public static class Model31 extends SchemaParameter implements QueryParameter { + public Model31() { + super( + "self", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema3.Schema31.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java new file mode 100644 index 00000000000..8416b3b8a28 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4.Schema4; + +public class Model4 { + + public static class Model41 extends SchemaParameter implements QueryParameter { + public Model41() { + super( + "A-B", + ParameterInType.query, + false, + ParameterStyle.form, + true, + Schema4.Schema41.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java new file mode 100644 index 00000000000..d2215c3db01 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter5.Schema5; + +public class Model5 { + + public static class Model51 extends SchemaParameter implements NonQueryQueryParameter { + public Model51() { + super( + "1", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema5.Schema51.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java new file mode 100644 index 00000000000..fae7ac2a842 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter6.Schema6; + +public class Model6 { + + public static class Model61 extends SchemaParameter implements NonQueryQueryParameter { + public Model61() { + super( + "aB", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema6.Schema61.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java new file mode 100644 index 00000000000..9400089f8b8 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7.Schema7; + +public class Model7 { + + public static class Model71 extends SchemaParameter implements NonQueryQueryParameter { + public Model71() { + super( + "self", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema7.Schema71.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java new file mode 100644 index 00000000000..8bcf755d9ef --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8.Schema8; + +public class Model8 { + + public static class Model81 extends SchemaParameter implements NonQueryQueryParameter { + public Model81() { + super( + "A-B", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema8.Schema81.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java new file mode 100644 index 00000000000..bfbbe6410ad --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9.Schema9; + +public class Model9 { + + public static class Model91 extends SchemaParameter implements NonQueryQueryParameter { + public Model91() { + super( + "1", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema9.Schema91.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java new file mode 100644 index 00000000000..86857d5fbb4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "petId", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java new file mode 100644 index 00000000000..5a0016e4f20 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java @@ -0,0 +1,39 @@ +package org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.ContentParameter; +import org.openapijsonschematools.client.mediatype.MediaType; +import org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters.parameter0.content.applicationjson.Schema0; + +import java.util.AbstractMap; +import java.util.Map; + +public class Model0 { + + public record ApplicationjsonMediaType(Schema0.Schema01 schema) implements MediaType { + public ApplicationjsonMediaType() { + this(Schema0.Schema01.getInstance()); + } + @Override + public Void encoding() { + return null; + } + } + + public static class Model01 extends ContentParameter implements QueryParameter { + public Model01() { + super( + "someParam", + ParameterInType.query, + true, + null, + null, + Map.ofEntries( + new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) + ) + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java new file mode 100644 index 00000000000..deeba7dc9a8 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.fakerefobjinquery.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.fakerefobjinquery.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "mapBean", + ParameterInType.query, + false, + ParameterStyle.deepObject, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java new file mode 100644 index 00000000000..9116c5aebfe --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "pipe", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java new file mode 100644 index 00000000000..5ae950ba5b3 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements QueryParameter { + public Model11() { + super( + "ioutil", + ParameterInType.query, + true, + ParameterStyle.form, + false, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java new file mode 100644 index 00000000000..66b86c6f212 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter2.Schema2; + +public class Model2 { + + public static class Model21 extends SchemaParameter implements QueryParameter { + public Model21() { + super( + "http", + ParameterInType.query, + true, + ParameterStyle.spaceDelimited, + false, + Schema2.Schema21.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java new file mode 100644 index 00000000000..b0a8d63f838 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter3.Schema3; + +public class Model3 { + + public static class Model31 extends SchemaParameter implements QueryParameter { + public Model31() { + super( + "url", + ParameterInType.query, + true, + ParameterStyle.form, + false, + Schema3.Schema31.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java new file mode 100644 index 00000000000..b9cefa478b4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter4.Schema4; + +public class Model4 { + + public static class Model41 extends SchemaParameter implements QueryParameter { + public Model41() { + super( + "context", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema4.Schema41.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java new file mode 100644 index 00000000000..c513b7e0137 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter5.Schema5; + +public class Model5 { + + public static class Model51 extends SchemaParameter implements QueryParameter { + public Model51() { + super( + "refParam", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema5.Schema51.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java new file mode 100644 index 00000000000..81a37ee2e66 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petfindbystatus.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petfindbystatus.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "status", + ParameterInType.query, + true, + ParameterStyle.form, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java new file mode 100644 index 00000000000..91b48cb4076 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petfindbytags.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petfindbytags.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "tags", + ParameterInType.query, + true, + ParameterStyle.form, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java new file mode 100644 index 00000000000..4aa363940c0 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petpetid.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "api_key", + ParameterInType.header, + false, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java new file mode 100644 index 00000000000..b3404310c65 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petpetid.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { + public Model11() { + super( + "petId", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java new file mode 100644 index 00000000000..a637918c467 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petpetid.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petpetid.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "petId", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java new file mode 100644 index 00000000000..fc0d20b2b34 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petpetid.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petpetid.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "petId", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java new file mode 100644 index 00000000000..00487088448 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "petId", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java new file mode 100644 index 00000000000..9de15e39349 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "order_id", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java new file mode 100644 index 00000000000..d5d475c0b9b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.storeorderorderid.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.storeorderorderid.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { + public Model01() { + super( + "order_id", + ParameterInType.path, + true, + ParameterStyle.simple, + false, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java new file mode 100644 index 00000000000..b072e362e3e --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.userlogin.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter0.Schema0; + +public class Model0 { + + public static class Model01 extends SchemaParameter implements QueryParameter { + public Model01() { + super( + "username", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema0.Schema01.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java new file mode 100644 index 00000000000..588955ae235 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.paths.userlogin.get.parameters; + +import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterInType; +import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter1.Schema1; + +public class Model1 { + + public static class Model11 extends SchemaParameter implements QueryParameter { + public Model11() { + super( + "password", + ParameterInType.query, + true, + ParameterStyle.form, + true, + Schema1.Schema11.getInstance() + ); + } + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java new file mode 100644 index 00000000000..db85c9ed3e7 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.delete.parameters; + +import org.openapijsonschematools.client.components.parameters.refpathusername; + +public class Model0 extends refpathusername { + public static class Model01 extends refpathusername1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java new file mode 100644 index 00000000000..7f8ab3c6bdd --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.get.parameters; + +import org.openapijsonschematools.client.components.parameters.pathusername; + +public class Model0 extends pathusername { + public static class Model01 extends pathusername1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java new file mode 100644 index 00000000000..6a24b2ad243 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.put.parameters; + +import org.openapijsonschematools.client.components.parameters.pathusername; + +public class Model0 extends pathusername { + public static class Model01 extends pathusername1 {} +} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 36892dbc45f..7acd18c2b7d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -3293,7 +3293,8 @@ public CodegenParameter fromParameter(Parameter parameter, String sourceJsonPath LinkedHashMap finalContent = content; CodegenSchema finalSchema = schema; Boolean allowReserved = parameter.getAllowReserved(); - codegenParameter = new CodegenParameter(description, example, finalVendorExtensions, required, finalContent, finalImports, componentModule, jsonPathPiece, explode, finalStyle, deprecated, finalSchema, in, allowEmptyValue, baseName, refInfo, allowReserved); + String subpackage = getSubpackage(sourceJsonPath); + codegenParameter = new CodegenParameter(description, example, finalVendorExtensions, required, finalContent, finalImports, componentModule, jsonPathPiece, explode, finalStyle, deprecated, finalSchema, in, allowEmptyValue, baseName, refInfo, allowReserved, subpackage); codegenParameterCache.put(sourceJsonPath, codegenParameter); LOGGER.debug("debugging codegenParameter return: {}", codegenParameter); return codegenParameter; diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index cabbef9aabf..31f52eb9f34 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -905,6 +905,13 @@ public void processOpts() { put("src/main/java/packagename/components/headers/HeaderDoc.hbs", ".md"); }} ); + // parameter + jsonPathTemplateFiles.put( + CodegenConstants.JSON_PATH_LOCATION_TYPE.PARAMETER, + new HashMap<>() {{ + put("src/main/java/packagename/components/parameter/Parameter.hbs", ".java"); + }} + ); // responses jsonPathTemplateFiles.put( CodegenConstants.JSON_PATH_LOCATION_TYPE.RESPONSE, diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java index 84c6deeb313..7fa12958957 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java @@ -45,6 +45,7 @@ public class CodegenParameter { public final String name; public final CodegenRefInfo refInfo; public final Boolean allowReserved; + public final String subpackage; public CodegenParameter getSelfOrDeepestRef() { CodegenParameter selfOrRefParam = this; @@ -71,7 +72,7 @@ public String getSchemaJsonPath() { return schema.jsonPath; } - public CodegenParameter(CodegenText description, String example, Map vendorExtensions, Boolean required, LinkedHashMap content, Set imports, boolean componentModule, CodegenKey jsonPathPiece, Boolean explode, String style, Boolean deprecated, CodegenSchema schema, String in, Boolean allowEmptyValue, String name, CodegenRefInfo refInfo, Boolean allowReserved) { + public CodegenParameter(CodegenText description, String example, Map vendorExtensions, Boolean required, LinkedHashMap content, Set imports, boolean componentModule, CodegenKey jsonPathPiece, Boolean explode, String style, Boolean deprecated, CodegenSchema schema, String in, Boolean allowEmptyValue, String name, CodegenRefInfo refInfo, Boolean allowReserved, String subpackage) { this.description = description; this.example = example; this.vendorExtensions = vendorExtensions; @@ -89,6 +90,7 @@ public CodegenParameter(CodegenText description, String example, Map { + public {{@key.pascalCase}}MediaType() { + this({{#with this}}{{#with schema}}{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}.getInstance(){{/with}}{{/with}}); + } + @Override + public Void encoding() { + return null; + } + } + {{/each}} + + public static class {{jsonPathPiece.pascalCase}}1 extends {{#if schema}}SchemaParameter{{else}}ContentParameter{{/if}} implements {{#eq in "query"}}QueryParameter{{else}}NonQueryQueryParameter{{/eq}} { + public {{jsonPathPiece.pascalCase}}1() { + super( + "{{{name}}}", + ParameterInType.{{in}}, + {{#eq required null}}false{{else}}{{required}}{{/eq}}, + {{#eq style null}}null{{else}}ParameterStyle.{{style}}{{/eq}}, + {{#eq explode null}}null{{else}}{{explode}}{{/eq}}, + {{#if schema}} + {{#with schema}}{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}.getInstance(){{/with}} + ); + {{else}} + Map.ofEntries( + {{#each content}} + new AbstractMap.SimpleEntry<>("{{{@key.original}}}", new {{@key.pascalCase}}MediaType()){{#unless @last}},{{/unless}} + {{/each}} + ) + ); + {{/if}} + } + } +} +{{/if}} +{{/with}} \ No newline at end of file From 5db8d4972405164976dd65593cd83f79decc71ba Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 13:29:05 -0800 Subject: [PATCH 03/12] Fixes java parameter filenames, fixes java errors --- .../petstore/java/.openapi-generator/FILES | 142 +++++++++--------- ...mponentRefSchemaStringWithValidation.java} | 1 - .../{pathusername.java => PathUserName.java} | 2 +- .../parameters/RefPathUserName.java | 6 + ...ava => RefSchemaStringWithValidation.java} | 2 +- .../parameters/refpathusername.java | 6 - .../client/header/StyleSerializer.java | 25 ++- .../client/parameter/ContentParameter.java | 9 +- .../client/parameter/QueryParameter.java | 5 +- .../client/parameter/SchemaParameter.java | 24 ++- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter2.java => Parameter2.java} | 8 +- .../{parameter3.java => Parameter3.java} | 8 +- .../{parameter4.java => Parameter4.java} | 8 +- .../{parameter5.java => Parameter5.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter2.java => Parameter2.java} | 8 +- .../{parameter3.java => Parameter3.java} | 8 +- .../{parameter4.java => Parameter4.java} | 8 +- .../{parameter5.java => Parameter5.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter2.java => Parameter2.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter10.java => Parameter10.java} | 8 +- .../{parameter11.java => Parameter11.java} | 8 +- .../{parameter12.java => Parameter12.java} | 8 +- .../{parameter13.java => Parameter13.java} | 8 +- .../{parameter14.java => Parameter14.java} | 8 +- .../{parameter15.java => Parameter15.java} | 8 +- .../{parameter16.java => Parameter16.java} | 8 +- .../{parameter17.java => Parameter17.java} | 8 +- .../{parameter18.java => Parameter18.java} | 8 +- .../{parameter2.java => Parameter2.java} | 8 +- .../{parameter3.java => Parameter3.java} | 8 +- .../{parameter4.java => Parameter4.java} | 8 +- .../{parameter5.java => Parameter5.java} | 8 +- .../{parameter6.java => Parameter6.java} | 8 +- .../{parameter7.java => Parameter7.java} | 8 +- .../{parameter8.java => Parameter8.java} | 8 +- .../{parameter9.java => Parameter9.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 7 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter2.java => Parameter2.java} | 8 +- .../{parameter3.java => Parameter3.java} | 8 +- .../{parameter4.java => Parameter4.java} | 8 +- .../{parameter5.java => Parameter5.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter0.java => Parameter0.java} | 8 +- .../{parameter1.java => Parameter1.java} | 8 +- .../delete/parameters/Parameter0.java | 7 + .../delete/parameters/parameter0.java | 7 - .../get/parameters/Parameter0.java | 7 + .../get/parameters/parameter0.java | 7 - .../put/parameters/Parameter0.java | 7 + .../put/parameters/parameter0.java | 7 - .../codegen/generators/DefaultGenerator.java | 10 +- .../generators/JavaClientGenerator.java | 51 ++++++- .../generators/PythonClientGenerator.java | 2 +- .../components/parameter/Parameter.hbs | 4 +- .../packagename/header/StyleSerializer.hbs | 25 ++- .../parameter/ContentParameter.hbs | 9 +- .../packagename/parameter/QueryParameter.hbs | 5 +- .../packagename/parameter/SchemaParameter.hbs | 24 ++- 88 files changed, 470 insertions(+), 435 deletions(-) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/{componentrefschemastringwithvalidation.java => ComponentRefSchemaStringWithValidation.java} (95%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/{pathusername.java => PathUserName.java} (91%) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefPathUserName.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/{refschemastringwithvalidation.java => RefSchemaStringWithValidation.java} (92%) delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/{parameter1.java => Parameter1.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter1.java => Parameter1.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter2.java => Parameter2.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter3.java => Parameter3.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter4.java => Parameter4.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/{parameter5.java => Parameter5.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter1.java => Parameter1.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter2.java => Parameter2.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter3.java => Parameter3.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter4.java => Parameter4.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/{parameter5.java => Parameter5.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/{parameter1.java => Parameter1.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/{parameter2.java => Parameter2.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/{parameter1.java => Parameter1.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter1.java => Parameter1.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter10.java => Parameter10.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter11.java => Parameter11.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter12.java => Parameter12.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter13.java => Parameter13.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter14.java => Parameter14.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter15.java => Parameter15.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter16.java => Parameter16.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter17.java => Parameter17.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter18.java => Parameter18.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter2.java => Parameter2.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter3.java => Parameter3.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter4.java => Parameter4.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter5.java => Parameter5.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter6.java => Parameter6.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter7.java => Parameter7.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter8.java => Parameter8.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/{parameter9.java => Parameter9.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/{parameter0.java => Parameter0.java} (85%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter0.java => Parameter0.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter1.java => Parameter1.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter2.java => Parameter2.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter3.java => Parameter3.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter4.java => Parameter4.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/{parameter5.java => Parameter5.java} (75%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/{parameter1.java => Parameter1.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/{parameter0.java => Parameter0.java} (73%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/{parameter0.java => Parameter0.java} (73%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/{parameter0.java => Parameter0.java} (74%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/{parameter1.java => Parameter1.java} (74%) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/Parameter0.java delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/Parameter0.java delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/Parameter0.java delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index d5f271a7b20..0664e894589 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -345,12 +345,12 @@ src/main/java/org/openapijsonschematools/client/components/headers/numberheader/ src/main/java/org/openapijsonschematools/client/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java src/main/java/org/openapijsonschematools/client/components/headers/refschemaheader/RefSchemaHeaderSchema.java src/main/java/org/openapijsonschematools/client/components/headers/stringheader/StringHeaderSchema.java -src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java +src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java +src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java +src/main/java/org/openapijsonschematools/client/components/parameters/RefPathUserName.java +src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/ApplicationjsonSchema.java -src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java src/main/java/org/openapijsonschematools/client/components/parameters/pathusername/Schema.java -src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java -src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation/Schema.java src/main/java/org/openapijsonschematools/client/components/requestbodies/Client.java src/main/java/org/openapijsonschematools/client/components/requestbodies/Pet.java @@ -566,40 +566,40 @@ src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/res src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/responses/Code200Response.java -src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1/Schema1.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2/Schema2.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3/Schema3.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4/Schema4.java -src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java @@ -607,17 +607,17 @@ src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters. src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/get/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fake/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java +src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2/Schema2.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4/Schema4.java -src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java src/main/java/org/openapijsonschematools/client/paths/fake/get/responses/Code200Response.java @@ -646,17 +646,17 @@ src/main/java/org/openapijsonschematools/client/paths/fakebodywithfileschema/put src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java +src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java -src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -667,7 +667,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/re src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/responses/CodedefaultResponse.java @@ -681,9 +681,9 @@ src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproper src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/MultipartformdataSchema.java @@ -723,7 +723,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java @@ -732,43 +732,43 @@ src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ab src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java +src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java -src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/responses/Code200Response.java @@ -782,7 +782,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithre src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/MultipartformdataSchema.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/responses/Code200Response.java @@ -790,7 +790,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithre src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/responses/code200response/content/applicationjson/ApplicationjsonSchema.java @@ -799,7 +799,7 @@ src/main/java/org/openapijsonschematools/client/paths/fakeredirection/get/respon src/main/java/org/openapijsonschematools/client/paths/fakeredirection/get/responses/Code3XXResponse.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakerefsarraymodel/post/RequestBody.java @@ -851,17 +851,17 @@ src/main/java/org/openapijsonschematools/client/paths/fakeresponsewithoutschema/ src/main/java/org/openapijsonschematools/client/paths/fakeresponsewithoutschema/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/Responses.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java +src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java -src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/fakeuploaddownloadfile/post/RequestBody.java @@ -919,7 +919,7 @@ src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Petfindbys src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/responses/Code400Response.java @@ -932,7 +932,7 @@ src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/se src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/responses/Code400Response.java @@ -942,9 +942,9 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderPara src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java @@ -952,7 +952,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/P src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/Code400Response.java @@ -964,7 +964,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParamete src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/responses/Code405Response.java @@ -974,7 +974,7 @@ src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/P src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/Responses.java -src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/MultipartformdataSchema.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/responses/Code200Response.java @@ -994,13 +994,13 @@ src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/ src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/code200response/content/applicationxml/ApplicationxmlSchema.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/responses/Code404Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/responses/Code400Response.java @@ -1019,9 +1019,9 @@ src/main/java/org/openapijsonschematools/client/paths/usercreatewithlist/post/Re src/main/java/org/openapijsonschematools/client/paths/usercreatewithlist/post/responses/CodedefaultResponse.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java +src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0/Schema0.java -src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/Code400Response.java @@ -1040,12 +1040,12 @@ src/main/java/org/openapijsonschematools/client/paths/userlogout/get/Responses.j src/main/java/org/openapijsonschematools/client/paths/userlogout/get/responses/CodedefaultResponse.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/Responses.java -src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/delete/responses/Code404Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/Responses.java -src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code200Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses/Code404Response.java @@ -1054,7 +1054,7 @@ src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/Responses.java -src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java +src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/Parameter0.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/requestbody/content/applicationjson/ApplicationjsonSchema.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/responses/Code400Response.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/responses/Code404Response.java diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java similarity index 95% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java index 0139b520c94..05a3a1bb8f3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/componentrefschemastringwithvalidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java @@ -1,6 +1,5 @@ package org.openapijsonschematools.client.components.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.ContentParameter; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java similarity index 91% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java index b549311b782..3c51d28ecd0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/pathusername.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java @@ -1,6 +1,6 @@ package org.openapijsonschematools.client.components.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefPathUserName.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefPathUserName.java new file mode 100644 index 00000000000..b6547f8af52 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefPathUserName.java @@ -0,0 +1,6 @@ +package org.openapijsonschematools.client.components.parameters; + + +public class RefPathUserName extends PathUserName { + public static class RefPathUserName1 extends PathUserName1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java similarity index 92% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java index 7192cda0f4a..d86812ef20e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refschemastringwithvalidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java @@ -1,6 +1,6 @@ package org.openapijsonschematools.client.components.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java deleted file mode 100644 index 97c00319c77..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/refpathusername.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.openapijsonschematools.client.components.parameters; - - -public class RefPathUserName extends pathusername { - public static class RefPathUserName1 extends pathusername1 {} -} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java index e0beac85c7f..088a1daf02b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java @@ -29,14 +29,14 @@ public static String serializeForm( ) { // todo check that the prefix and suffix matches this one String prefix = isCookie ? "" : "?"; - PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(isCookie, "&") : iterator; - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(prefix, "&") : iterator; + return rfc6570Expansion( name, inData, explode, percentEncode, usedIterator - ) + ); } public static String serializeMatrix( @@ -44,8 +44,8 @@ public static String serializeMatrix( String name, boolean explode ) { - PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(";", ";"); - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(";", ";"); + return rfc6570Expansion( name, inData, explode, @@ -59,8 +59,8 @@ public static String serializeLabel( String name, boolean explode ) { - PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(".", "."); - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(".", "."); + return rfc6570Expansion( name, inData, explode, @@ -76,13 +76,13 @@ public static String serializeSpaceDelimited( @Nullable PrefixSeparatorIterator iterator ) { PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; - return cls.rfc6570Expansion( + return rfc6570Expansion( name, inData, explode, true, usedIterator - ) + ); } public static String serializePipeDelimited( @@ -92,13 +92,12 @@ public static String serializePipeDelimited( @Nullable PrefixSeparatorIterator iterator ) { PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; - return cls.rfc6570Expansion( + return rfc6570Expansion( name, inData, explode, true, usedIterator - ) + ); } - -} +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java index cb783b5dbfd..62b0174a1e9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java @@ -1,27 +1,26 @@ -package org.openapijsonschematools.client.header; +package org.openapijsonschematools.client.parameter; 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.header.HeaderBase; import org.openapijsonschematools.client.mediatype.MediaType; import java.util.Map; -public class ContentParameter extends HeaderBase implements Parameter { +public class ContentParameter extends HeaderBase { public final String name; public final ParameterInType inType; public final Map> content; - public ContentHeader(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { super(required, style, explode, allowReserved); this.name = name; this.inType = inType; this.content = content; } - @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { for (Map.Entry> entry: content.entrySet()) { var castInData = validate ? entry.getValue().schema().validate(inData, configuration) : inData ; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java index 145c057735f..0dbced20599 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java @@ -2,8 +2,11 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +import java.util.Map; public interface QueryParameter { Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); - PrefixSeparatorIterator iterator getPrefixSeparatorIterator(); + PrefixSeparatorIterator getPrefixSeparatorIterator(); } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java index 3d77a4201b0..a1129eadcf4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -2,11 +2,10 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.contenttype.ContentTypeDeserializer; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; import org.openapijsonschematools.client.header.StyleSerializer; import org.openapijsonschematools.client.schemas.validation.JsonSchema; -import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory; -import org.openapijsonschematools.client.schemas.validation.UnsetAnyTypeJsonSchema; import java.util.Map; @@ -33,31 +32,29 @@ private ParameterStyle getStyle() { return ParameterStyle.SIMPLE; } - public PrefixSeparatorIterator iterator getPrefixSeparatorIterator() { + public PrefixSeparatorIterator getPrefixSeparatorIterator() { ParameterStyle usedStyle = getStyle(); - if (usedStyle is ParameterStyle.FORM) { - return PrefixSeparatorIterator('?', '&') + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { - return PrefixSeparatorIterator('', '%20') + return new PrefixSeparatorIterator("", "%20"); } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { - return PrefixSeparatorIterator('', '|') + return new PrefixSeparatorIterator("", "|"); } throw new RuntimeException("No iterator possible for style="+usedStyle); } - @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { var castInData = validate ? schema.validate(inData, configuration) : inData; ParameterStyle usedStyle = getStyle(); - boolean percentEncode = (inType == ParameterInType.QUERY || inType == ParameterInType.PATH) ? true : false; + boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; String value; + boolean usedExplode = explode == null || explode; if (usedStyle == ParameterStyle.SIMPLE) { // header OR path - boolean usedExplode = explode == null ? false : explode; value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); } else if (usedStyle == ParameterStyle.FORM) { // query OR cookie - boolean usedExplode = explode == null ? true : explode; boolean isCookie = inType == ParameterInType.COOKIE; value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); } else if (usedStyle == ParameterStyle.LABEL) { @@ -72,7 +69,8 @@ public Map serialize(@Nullable Object inData, boolean validate, } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { // query value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); - } else if (usedStyle == ParameterStyle.DEEP_OBJECT) { + } else { + // usedStyle == ParameterStyle.DEEP_OBJECT // query throw new RuntimeException("Style deep object serialization has not yet been implemented."); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java index 8e258e49207..fa2e55e7d56 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "someHeader", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java index 49c02c31658..80104442a30 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter11() { super( "subDir", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java index c87e12b2d2a..f7ea9d4f881 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "searchStr", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java index 1cab1aff430..fdfbf4f5c46 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.commonparamsubdir.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "subDir", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java index 1996023af55..59b8d6508f1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "someHeader", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java index a66df4fba1f..d9755fa48ec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "required_string_group", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java index 430323d4c14..38ef42b5993 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter11() { super( "required_boolean_group", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java index 3015c12fcb1..4fdf2aa60f7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter2.Schema2; -public class Model2 { +public class Parameter2 { - public static class Model21 extends SchemaParameter implements QueryParameter { - public Model21() { + public static class Parameter21 extends SchemaParameter implements QueryParameter { + public Parameter21() { super( "required_int64_group", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java index de27622a227..313ca5e3367 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter3.Schema3; -public class Model3 { +public class Parameter3 { - public static class Model31 extends SchemaParameter implements QueryParameter { - public Model31() { + public static class Parameter31 extends SchemaParameter implements QueryParameter { + public Parameter31() { super( "string_group", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java index 04f81ab81fd..7f48e1296a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter4.Schema4; -public class Model4 { +public class Parameter4 { - public static class Model41 extends SchemaParameter implements NonQueryQueryParameter { - public Model41() { + public static class Parameter41 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter41() { super( "boolean_group", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java index 914d56f394c..5beebad6ef0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter5.Schema5; -public class Model5 { +public class Parameter5 { - public static class Model51 extends SchemaParameter implements QueryParameter { - public Model51() { + public static class Parameter51 extends SchemaParameter implements QueryParameter { + public Parameter51() { super( "int64_group", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java index 69a084bea52..372668d24fe 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "enum_header_string_array", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java index bee222f121c..9909d3b31f5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter11() { super( "enum_header_string", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java index 9aa452f2c1b..0509ca49901 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter2.Schema2; -public class Model2 { +public class Parameter2 { - public static class Model21 extends SchemaParameter implements QueryParameter { - public Model21() { + public static class Parameter21 extends SchemaParameter implements QueryParameter { + public Parameter21() { super( "enum_query_string_array", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java index 4554371322e..1a5bfd7fe60 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter3.Schema3; -public class Model3 { +public class Parameter3 { - public static class Model31 extends SchemaParameter implements QueryParameter { - public Model31() { + public static class Parameter31 extends SchemaParameter implements QueryParameter { + public Parameter31() { super( "enum_query_string", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java index 252949f5785..3f1b9e47ca2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter4.Schema4; -public class Model4 { +public class Parameter4 { - public static class Model41 extends SchemaParameter implements QueryParameter { - public Model41() { + public static class Parameter41 extends SchemaParameter implements QueryParameter { + public Parameter41() { super( "enum_query_integer", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java index 879177dcf85..ebd9b219130 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fake.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter5.Schema5; -public class Model5 { +public class Parameter5 { - public static class Model51 extends SchemaParameter implements QueryParameter { - public Model51() { + public static class Parameter51 extends SchemaParameter implements QueryParameter { + public Parameter51() { super( "enum_query_double", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java index ee93ce8f746..41b8d29d0ea 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "query", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java index 258c6d1ef3b..d9a09e3da58 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "someVar", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java index 35d1be66e30..2f0d0a9f2c3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements QueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements QueryParameter { + public Parameter11() { super( "SomeVar", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java index 0c2bca93e65..b6984a612d9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter2.Schema2; -public class Model2 { +public class Parameter2 { - public static class Model21 extends SchemaParameter implements QueryParameter { - public Model21() { + public static class Parameter21 extends SchemaParameter implements QueryParameter { + public Parameter21() { super( "some_var", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java index 6e53eb31942..ad364b797ed 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "id", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java index 970e82ca8e3..223db154399 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "compositionAtRoot", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java index 6fada6122ea..a08e2c6bf59 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements QueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements QueryParameter { + public Parameter11() { super( "compositionInProperty", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java index ff0807a1177..caf2800450e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "mapBean", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java index bce0a1940b5..4e934054491 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "1", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java index 5161cfbe68f..7c186aace52 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements QueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements QueryParameter { + public Parameter11() { super( "aB", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java index 7b0bef94d91..1a737cf72bf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter10.Schema10; -public class Model10 { +public class Parameter10 { - public static class Model101 extends SchemaParameter implements NonQueryQueryParameter { - public Model101() { + public static class Parameter101 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter101() { super( "aB", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java index e8abb5230e4..23647676400 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter11.Schema11; -public class Model11 { +public class Parameter11 { - public static class Model111 extends SchemaParameter implements NonQueryQueryParameter { - public Model111() { + public static class Parameter111 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter111() { super( "Ab", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java index 304d374ac7e..a765c88d056 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter12.Schema12; -public class Model12 { +public class Parameter12 { - public static class Model121 extends SchemaParameter implements NonQueryQueryParameter { - public Model121() { + public static class Parameter121 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter121() { super( "self", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java index 8496fdb72b4..c4b00fbbef7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13.Schema13; -public class Model13 { +public class Parameter13 { - public static class Model131 extends SchemaParameter implements NonQueryQueryParameter { - public Model131() { + public static class Parameter131 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter131() { super( "A-B", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java index 3dd44e03173..b850e1781ab 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter14.Schema14; -public class Model14 { +public class Parameter14 { - public static class Model141 extends SchemaParameter implements NonQueryQueryParameter { - public Model141() { + public static class Parameter141 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter141() { super( "1", ParameterInType.cookie, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java index a5544422a30..c8047817643 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter15.Schema15; -public class Model15 { +public class Parameter15 { - public static class Model151 extends SchemaParameter implements NonQueryQueryParameter { - public Model151() { + public static class Parameter151 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter151() { super( "aB", ParameterInType.cookie, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java index d76cf1f80c4..a552adc03d0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter16.Schema16; -public class Model16 { +public class Parameter16 { - public static class Model161 extends SchemaParameter implements NonQueryQueryParameter { - public Model161() { + public static class Parameter161 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter161() { super( "Ab", ParameterInType.cookie, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java index b5b5bd9f1a1..69f402391c5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17.Schema17; -public class Model17 { +public class Parameter17 { - public static class Model171 extends SchemaParameter implements NonQueryQueryParameter { - public Model171() { + public static class Parameter171 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter171() { super( "self", ParameterInType.cookie, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java index db449ef7523..fd49d06b229 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18.Schema18; -public class Model18 { +public class Parameter18 { - public static class Model181 extends SchemaParameter implements NonQueryQueryParameter { - public Model181() { + public static class Parameter181 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter181() { super( "A-B", ParameterInType.cookie, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java index fd6f37837e7..3680b3941e8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter2.Schema2; -public class Model2 { +public class Parameter2 { - public static class Model21 extends SchemaParameter implements QueryParameter { - public Model21() { + public static class Parameter21 extends SchemaParameter implements QueryParameter { + public Parameter21() { super( "Ab", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java index 586840841e8..bed65389abd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3.Schema3; -public class Model3 { +public class Parameter3 { - public static class Model31 extends SchemaParameter implements QueryParameter { - public Model31() { + public static class Parameter31 extends SchemaParameter implements QueryParameter { + public Parameter31() { super( "self", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java index 8416b3b8a28..cf5627c20c5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4.Schema4; -public class Model4 { +public class Parameter4 { - public static class Model41 extends SchemaParameter implements QueryParameter { - public Model41() { + public static class Parameter41 extends SchemaParameter implements QueryParameter { + public Parameter41() { super( "A-B", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java index d2215c3db01..608b52b847a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter5.Schema5; -public class Model5 { +public class Parameter5 { - public static class Model51 extends SchemaParameter implements NonQueryQueryParameter { - public Model51() { + public static class Parameter51 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter51() { super( "1", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java index fae7ac2a842..7d382488707 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter6.Schema6; -public class Model6 { +public class Parameter6 { - public static class Model61 extends SchemaParameter implements NonQueryQueryParameter { - public Model61() { + public static class Parameter61 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter61() { super( "aB", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java index 9400089f8b8..0909b305ad6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7.Schema7; -public class Model7 { +public class Parameter7 { - public static class Model71 extends SchemaParameter implements NonQueryQueryParameter { - public Model71() { + public static class Parameter71 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter71() { super( "self", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java index 8bcf755d9ef..2fcd093801a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8.Schema8; -public class Model8 { +public class Parameter8 { - public static class Model81 extends SchemaParameter implements NonQueryQueryParameter { - public Model81() { + public static class Parameter81 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter81() { super( "A-B", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java index bfbbe6410ad..6ea973f46e8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9.Schema9; -public class Model9 { +public class Parameter9 { - public static class Model91 extends SchemaParameter implements NonQueryQueryParameter { - public Model91() { + public static class Parameter91 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter91() { super( "1", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java index 86857d5fbb4..eb987e34949 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "petId", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java similarity index 85% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java index 5a0016e4f20..72d97fb9f36 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java @@ -1,6 +1,5 @@ package org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.ContentParameter; @@ -10,7 +9,7 @@ import java.util.AbstractMap; import java.util.Map; -public class Model0 { +public class Parameter0 { public record ApplicationjsonMediaType(Schema0.Schema01 schema) implements MediaType { public ApplicationjsonMediaType() { @@ -22,8 +21,8 @@ public Void encoding() { } } - public static class Model01 extends ContentParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends ContentParameter implements QueryParameter { + public Parameter01() { super( "someParam", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java index deeba7dc9a8..ff74dbf19e3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.fakerefobjinquery.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.fakerefobjinquery.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "mapBean", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java index 9116c5aebfe..2801f5a97a4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "pipe", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java index 5ae950ba5b3..4913dd5a6ac 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements QueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements QueryParameter { + public Parameter11() { super( "ioutil", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java index 66b86c6f212..d1be9798f32 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter2.Schema2; -public class Model2 { +public class Parameter2 { - public static class Model21 extends SchemaParameter implements QueryParameter { - public Model21() { + public static class Parameter21 extends SchemaParameter implements QueryParameter { + public Parameter21() { super( "http", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java index b0a8d63f838..805e99cb46d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter3.Schema3; -public class Model3 { +public class Parameter3 { - public static class Model31 extends SchemaParameter implements QueryParameter { - public Model31() { + public static class Parameter31 extends SchemaParameter implements QueryParameter { + public Parameter31() { super( "url", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java index b9cefa478b4..9eddce875da 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter4.Schema4; -public class Model4 { +public class Parameter4 { - public static class Model41 extends SchemaParameter implements QueryParameter { - public Model41() { + public static class Parameter41 extends SchemaParameter implements QueryParameter { + public Parameter41() { super( "context", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java similarity index 75% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java index c513b7e0137..156ddc512fc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter5.Schema5; -public class Model5 { +public class Parameter5 { - public static class Model51 extends SchemaParameter implements QueryParameter { - public Model51() { + public static class Parameter51 extends SchemaParameter implements QueryParameter { + public Parameter51() { super( "refParam", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java index 81a37ee2e66..f158e25d944 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petfindbystatus.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petfindbystatus.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "status", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java index 91b48cb4076..5c92b84849f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petfindbytags.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petfindbytags.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "tags", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java index 4aa363940c0..6d40ef7148a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petpetid.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "api_key", ParameterInType.header, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java index b3404310c65..8fa9dda58cf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petpetid.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements NonQueryQueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter11() { super( "petId", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java similarity index 73% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java index a637918c467..d38bed04be1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petpetid.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petpetid.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "petId", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java similarity index 73% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java index fc0d20b2b34..d51f544add0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petpetid.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petpetid.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "petId", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java index 00487088448..61f447233db 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "petId", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java index 9de15e39349..6c0e2a7597f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "order_id", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java index d5d475c0b9b..3ecd0d7edb1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.storeorderorderid.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.storeorderorderid.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements NonQueryQueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public Parameter01() { super( "order_id", ParameterInType.path, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java index b072e362e3e..54560a392bd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.userlogin.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter0.Schema0; -public class Model0 { +public class Parameter0 { - public static class Model01 extends SchemaParameter implements QueryParameter { - public Model01() { + public static class Parameter01 extends SchemaParameter implements QueryParameter { + public Parameter01() { super( "username", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java similarity index 74% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java index 588955ae235..8fdefdba78c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java @@ -1,15 +1,15 @@ package org.openapijsonschematools.client.paths.userlogin.get.parameters; -import org.openapijsonschematools.client.header.ParameterStyle; +import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; import org.openapijsonschematools.client.parameter.QueryParameter; import org.openapijsonschematools.client.parameter.SchemaParameter; import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter1.Schema1; -public class Model1 { +public class Parameter1 { - public static class Model11 extends SchemaParameter implements QueryParameter { - public Model11() { + public static class Parameter11 extends SchemaParameter implements QueryParameter { + public Parameter11() { super( "password", ParameterInType.query, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/Parameter0.java new file mode 100644 index 00000000000..e95aee523c4 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/Parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.delete.parameters; + +import org.openapijsonschematools.client.components.parameters.RefPathUserName; + +public class Parameter0 extends RefPathUserName { + public static class Parameter01 extends RefPathUserName1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java deleted file mode 100644 index db85c9ed3e7..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/parameters/parameter0.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.openapijsonschematools.client.paths.userusername.delete.parameters; - -import org.openapijsonschematools.client.components.parameters.refpathusername; - -public class Model0 extends refpathusername { - public static class Model01 extends refpathusername1 {} -} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/Parameter0.java new file mode 100644 index 00000000000..d100ccf2d2b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/Parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.get.parameters; + +import org.openapijsonschematools.client.components.parameters.PathUserName; + +public class Parameter0 extends PathUserName { + public static class Parameter01 extends PathUserName1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java deleted file mode 100644 index 7f8ab3c6bdd..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/parameters/parameter0.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.openapijsonschematools.client.paths.userusername.get.parameters; - -import org.openapijsonschematools.client.components.parameters.pathusername; - -public class Model0 extends pathusername { - public static class Model01 extends pathusername1 {} -} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/Parameter0.java new file mode 100644 index 00000000000..cf1add59f0d --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/Parameter0.java @@ -0,0 +1,7 @@ +package org.openapijsonschematools.client.paths.userusername.put.parameters; + +import org.openapijsonschematools.client.components.parameters.PathUserName; + +public class Parameter0 extends PathUserName { + public static class Parameter01 extends PathUserName1 {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java deleted file mode 100644 index 6a24b2ad243..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/parameters/parameter0.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.openapijsonschematools.client.paths.userusername.put.parameters; - -import org.openapijsonschematools.client.components.parameters.pathusername; - -public class Model0 extends pathusername { - public static class Model01 extends pathusername1 {} -} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 7acd18c2b7d..5af15d7239b 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -951,7 +951,7 @@ public String getPascalCaseServer(String basename, String jsonPath) { return "Server" + basename; } - public String getPascalCaseParameter(String basename) { + public String getPascalCaseParameter(String basename, String jsonPath) { return toModelName(basename, null); } @@ -3770,7 +3770,7 @@ protected void updateComponentsFilepath(String[] pathPieces) { } } } else if (pathPieces[2].equals("parameters")) { - pathPieces[3] = toParameterFilename(pathPieces[3], null); + pathPieces[3] = toParameterFilename(pathPieces[3], jsonPath); if (pathPieces.length == 5 && pathPieces[4].equals("schema")) { pathPieces[4] = getSchemaFilename(jsonPath); } else if (pathPieces.length >= 6 && pathPieces[4].equals("content")) { @@ -3879,7 +3879,7 @@ private void updatePathsFilepath(String[] pathPieces) { return; } // #/paths/somePath/parameters/0 - pathPieces[4] = toParameterFilename(pathPieces[4], null); + pathPieces[4] = toParameterFilename(pathPieces[4], jsonPath); if (pathPieces.length >= 7 && pathPieces[5].equals("content")) { // #/paths/somePath/parameters/0/content/application-json -> length 7 String contentType = ModelUtils.decodeSlashes(pathPieces[6]); @@ -3978,7 +3978,7 @@ private void updatePathsFilepath(String[] pathPieces) { return; } // #/paths/somePath/get/parameters/0 -> length 6 - pathPieces[5] = toParameterFilename(pathPieces[5], null); + pathPieces[5] = toParameterFilename(pathPieces[5], jsonPath); if (pathPieces.length >= 8 && pathPieces[6].equals("content")) { // #/paths/somePath/get/parameters/1/content/application-json -> length 8 @@ -4914,7 +4914,7 @@ public CodegenKey getKey(String key, String keyType, String sourceJsonPath) { usedKey = escapeUnsafeCharacters(key); isValid = isValid(usedKey); snakeCaseName = toParameterFilename(usedKey, sourceJsonPath); - pascalCaseName = getPascalCaseParameter(usedKey); + pascalCaseName = getPascalCaseParameter(usedKey, sourceJsonPath); break; case "requestBodies": usedKey = escapeUnsafeCharacters(key); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 31f52eb9f34..799aa61843d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -1261,17 +1261,54 @@ protected CodegenKey getContainerJsonPathPiece(String expectedComponentType, Str return getJsonPathPiece(expectedComponentType, currentJsonPath, sourceJsonPath); } + private static boolean isInteger(String str) { + if (str == null) { + return false; + } + int length = str.length(); + if (length == 0) { + return false; + } + int i = 0; + if (str.charAt(0) == '-') { + if (length == 1) { + return false; + } + i = 1; + } + for (; i < length; i++) { + char c = str.charAt(i); + if (c < '0' || c > '9') { + return false; + } + } + return true; + } + + @Override + public String getPascalCaseParameter(String basename, String jsonPath) { + + return toParameterFilename(basename, jsonPath); + + } + @Override public String toParameterFilename(String name, String jsonPath) { // adds prefix parameter_ onto the result so modules do not start with _ - try { - Integer.parseInt(name); - // for parameters in path, or an endpoint - return "parameter" + name; - } catch (NumberFormatException nfe) { - // for header parameters in responses - return toModuleFilename(name, null); + String[] pathPieces = jsonPath.split("/"); + if (jsonPath.startsWith("#/components/parameters/")) { + if (pathPieces.length == 4) { + // #/components/parameters/SomeParameter + return toModelName(name, null); + } + return toModuleFilename(name, jsonPath); + } + if (pathPieces[pathPieces.length-2].equals("parameters") && isInteger(name) && (pathPieces.length == 5 || pathPieces.length == 6)) { + // #/paths/somePath/parameters/0 + // #/paths/somePath/verb/parameters/0 + return "Parameter" + name; } + return "parameter" + name; } private String toSchemaRefClass(String ref, String sourceJsonPath) { diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 6d99be9685e..675ecfe8832 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -1887,7 +1887,7 @@ public String toSecurityFilename(String basename, String jsonPath) { } @Override - public String getPascalCaseParameter(String name) { + public String getPascalCaseParameter(String name, String jsonPath) { try { Integer.parseInt(name); // for parameters in path, or an endpoint diff --git a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs index 13e0c2fad60..e934d392e53 100644 --- a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs @@ -18,7 +18,9 @@ public class {{jsonPathPiece.pascalCase}} extends {{refInfo.refModule}} { public class {{jsonPathPiece.pascalCase}} extends {{packageName}}.{{refInfo.ref.subpackage}}.{{refInfo.refModule}} {} {{/neq}} {{else}} -import {{packageName}}.header.ParameterStyle; + {{#neq style null}} +import {{packageName}}.parameter.ParameterStyle; + {{/neq}} import {{packageName}}.parameter.ParameterInType; {{#eq in "query"}} import {{packageName}}.parameter.QueryParameter; diff --git a/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs b/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs index e37b977df6e..dab4f9ff968 100644 --- a/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs +++ b/src/main/resources/java/src/main/java/packagename/header/StyleSerializer.hbs @@ -29,14 +29,14 @@ public class StyleSerializer extends Rfc6570Serializer { ) { // todo check that the prefix and suffix matches this one String prefix = isCookie ? "" : "?"; - PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(isCookie, "&") : iterator; - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(prefix, "&") : iterator; + return rfc6570Expansion( name, inData, explode, percentEncode, usedIterator - ) + ); } public static String serializeMatrix( @@ -44,8 +44,8 @@ public class StyleSerializer extends Rfc6570Serializer { String name, boolean explode ) { - PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(";", ";"); - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(";", ";"); + return rfc6570Expansion( name, inData, explode, @@ -59,8 +59,8 @@ public class StyleSerializer extends Rfc6570Serializer { String name, boolean explode ) { - PrefixSeparatorIterator usedIterator = PrefixSeparatorIterator(".", "."); - return cls.rfc6570Expansion( + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(".", "."); + return rfc6570Expansion( name, inData, explode, @@ -76,13 +76,13 @@ public class StyleSerializer extends Rfc6570Serializer { @Nullable PrefixSeparatorIterator iterator ) { PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; - return cls.rfc6570Expansion( + return rfc6570Expansion( name, inData, explode, true, usedIterator - ) + ); } public static String serializePipeDelimited( @@ -92,13 +92,12 @@ public class StyleSerializer extends Rfc6570Serializer { @Nullable PrefixSeparatorIterator iterator ) { PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; - return cls.rfc6570Expansion( + return rfc6570Expansion( name, inData, explode, true, usedIterator - ) + ); } - -} +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs index 3f2ea3fce37..acedc1f5dd2 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs @@ -1,27 +1,26 @@ -package {{{packageName}}}.header; +package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.contenttype.ContentTypeDetector; import {{{packageName}}}.contenttype.ContentTypeSerializer; -import {{{packageName}}}.contenttype.ContentTypeDeserializer; +import {{{packageName}}}.header.HeaderBase; import {{{packageName}}}.mediatype.MediaType; import java.util.Map; -public class ContentParameter extends HeaderBase implements Parameter { +public class ContentParameter extends HeaderBase { public final String name; public final ParameterInType inType; public final Map> content; - public ContentHeader(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { super(required, style, explode, allowReserved); this.name = name; this.inType = inType; this.content = content; } - @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { for (Map.Entry> entry: content.entrySet()) { var castInData = validate ? entry.getValue().schema().validate(inData, configuration) : inData ; diff --git a/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs index fc03113a76a..18489466d31 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/QueryParameter.hbs @@ -2,8 +2,11 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.header.PrefixSeparatorIterator; + +import java.util.Map; public interface QueryParameter { Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); - PrefixSeparatorIterator iterator getPrefixSeparatorIterator(); + PrefixSeparatorIterator getPrefixSeparatorIterator(); } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs index 624cfa0f384..84602ee9e8a 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs @@ -2,11 +2,10 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.contenttype.ContentTypeDeserializer; +import {{{packageName}}}.header.HeaderBase; +import {{{packageName}}}.header.PrefixSeparatorIterator; import {{{packageName}}}.header.StyleSerializer; import {{{packageName}}}.schemas.validation.JsonSchema; -import {{{packageName}}}.schemas.validation.JsonSchemaFactory; -import {{{packageName}}}.schemas.validation.UnsetAnyTypeJsonSchema; import java.util.Map; @@ -33,31 +32,29 @@ public class SchemaParameter extends HeaderBase { return ParameterStyle.SIMPLE; } - public PrefixSeparatorIterator iterator getPrefixSeparatorIterator() { + public PrefixSeparatorIterator getPrefixSeparatorIterator() { ParameterStyle usedStyle = getStyle(); - if (usedStyle is ParameterStyle.FORM) { - return PrefixSeparatorIterator('?', '&') + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { - return PrefixSeparatorIterator('', '%20') + return new PrefixSeparatorIterator("", "%20"); } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { - return PrefixSeparatorIterator('', '|') + return new PrefixSeparatorIterator("", "|"); } throw new RuntimeException("No iterator possible for style="+usedStyle); } - @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { var castInData = validate ? schema.validate(inData, configuration) : inData; ParameterStyle usedStyle = getStyle(); - boolean percentEncode = (inType == ParameterInType.QUERY || inType == ParameterInType.PATH) ? true : false; + boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; String value; + boolean usedExplode = explode == null || explode; if (usedStyle == ParameterStyle.SIMPLE) { // header OR path - boolean usedExplode = explode == null ? false : explode; value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); } else if (usedStyle == ParameterStyle.FORM) { // query OR cookie - boolean usedExplode = explode == null ? true : explode; boolean isCookie = inType == ParameterInType.COOKIE; value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); } else if (usedStyle == ParameterStyle.LABEL) { @@ -72,7 +69,8 @@ public class SchemaParameter extends HeaderBase { } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { // query value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); - } else if (usedStyle == ParameterStyle.DEEP_OBJECT) { + } else { + // usedStyle == ParameterStyle.DEEP_OBJECT // query throw new RuntimeException("Style deep object serialization has not yet been implemented."); } From 250778c02e194a1a82fda73efa7fcf8c043730a0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 13:52:50 -0800 Subject: [PATCH 04/12] Fixes in + style value for parameters --- .../ComponentRefSchemaStringWithValidation.java | 3 ++- .../client/components/parameters/PathUserName.java | 5 +++-- .../parameters/RefSchemaStringWithValidation.java | 5 +++-- .../commonparamsubdir/delete/parameters/Parameter0.java | 5 +++-- .../commonparamsubdir/delete/parameters/Parameter1.java | 5 +++-- .../commonparamsubdir/get/parameters/Parameter0.java | 5 +++-- .../paths/commonparamsubdir/parameters/Parameter0.java | 5 +++-- .../commonparamsubdir/post/parameters/Parameter0.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter0.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter1.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter2.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter3.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter4.java | 5 +++-- .../client/paths/fake/delete/parameters/Parameter5.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter0.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter1.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter2.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter3.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter4.java | 5 +++-- .../client/paths/fake/get/parameters/Parameter5.java | 5 +++-- .../put/parameters/Parameter0.java | 5 +++-- .../put/parameters/Parameter0.java | 5 +++-- .../put/parameters/Parameter1.java | 5 +++-- .../put/parameters/Parameter2.java | 5 +++-- .../fakedeletecoffeeid/delete/parameters/Parameter0.java | 5 +++-- .../fakeinlinecomposition/post/parameters/Parameter0.java | 5 +++-- .../fakeinlinecomposition/post/parameters/Parameter1.java | 5 +++-- .../paths/fakeobjinquery/get/parameters/Parameter0.java | 5 +++-- .../post/parameters/Parameter0.java | 5 +++-- .../post/parameters/Parameter1.java | 5 +++-- .../post/parameters/Parameter10.java | 5 +++-- .../post/parameters/Parameter11.java | 5 +++-- .../post/parameters/Parameter12.java | 5 +++-- .../post/parameters/Parameter13.java | 5 +++-- .../post/parameters/Parameter14.java | 5 +++-- .../post/parameters/Parameter15.java | 5 +++-- .../post/parameters/Parameter16.java | 5 +++-- .../post/parameters/Parameter17.java | 5 +++-- .../post/parameters/Parameter18.java | 5 +++-- .../post/parameters/Parameter2.java | 5 +++-- .../post/parameters/Parameter3.java | 5 +++-- .../post/parameters/Parameter4.java | 5 +++-- .../post/parameters/Parameter5.java | 5 +++-- .../post/parameters/Parameter6.java | 5 +++-- .../post/parameters/Parameter7.java | 5 +++-- .../post/parameters/Parameter8.java | 5 +++-- .../post/parameters/Parameter9.java | 5 +++-- .../post/parameters/Parameter0.java | 5 +++-- .../get/parameters/Parameter0.java | 3 ++- .../fakerefobjinquery/get/parameters/Parameter0.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter0.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter1.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter2.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter3.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter4.java | 5 +++-- .../faketestqueryparamters/put/parameters/Parameter5.java | 5 +++-- .../paths/petfindbystatus/get/parameters/Parameter0.java | 5 +++-- .../paths/petfindbytags/get/parameters/Parameter0.java | 5 +++-- .../paths/petpetid/delete/parameters/Parameter0.java | 5 +++-- .../paths/petpetid/delete/parameters/Parameter1.java | 5 +++-- .../client/paths/petpetid/get/parameters/Parameter0.java | 5 +++-- .../client/paths/petpetid/post/parameters/Parameter0.java | 5 +++-- .../petpetiduploadimage/post/parameters/Parameter0.java | 5 +++-- .../storeorderorderid/delete/parameters/Parameter0.java | 5 +++-- .../storeorderorderid/get/parameters/Parameter0.java | 5 +++-- .../client/paths/userlogin/get/parameters/Parameter0.java | 5 +++-- .../client/paths/userlogin/get/parameters/Parameter1.java | 5 +++-- .../java/packagename/components/parameter/Parameter.hbs | 8 ++++---- 68 files changed, 203 insertions(+), 136 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java index 05a3a1bb8f3..7a22546432c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java @@ -25,9 +25,10 @@ public static class ComponentRefSchemaStringWithValidation1 extends ContentParam public ComponentRefSchemaStringWithValidation1() { super( "CRSstringWithValidation", - ParameterInType.path, + ParameterInType.PATH, true, null, + false, null, Map.ofEntries( new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java index 3c51d28ecd0..d02f9a25956 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java @@ -12,9 +12,10 @@ public static class PathUserName1 extends SchemaParameter implements NonQueryQue public PathUserName1() { super( "username", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema.Schema1.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java index d86812ef20e..0e8c73c5d0f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java @@ -12,9 +12,10 @@ public static class RefSchemaStringWithValidation1 extends SchemaParameter imple public RefSchemaStringWithValidation1() { super( "RSstringWithValidation", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema.Schema1.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java index fa2e55e7d56..30b4f9ffee6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "someHeader", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java index 80104442a30..3959e77b3eb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements NonQueryQuery public Parameter11() { super( "subDir", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java index f7ea9d4f881..0250eb5bac3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "searchStr", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java index fdfbf4f5c46..87fe2a59efc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "subDir", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, PathParamSchema0.PathParamSchema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java index 59b8d6508f1..ced6fd18139 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "someHeader", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java index d9755fa48ec..fbf757705aa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "required_string_group", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java index 38ef42b5993..81755c7583a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements NonQueryQuery public Parameter11() { super( "required_boolean_group", - ParameterInType.header, + ParameterInType.HEADER, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java index 4fdf2aa60f7..8697d6b3056 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java @@ -12,9 +12,10 @@ public static class Parameter21 extends SchemaParameter implements QueryParamete public Parameter21() { super( "required_int64_group", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema2.Schema21.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java index 313ca5e3367..99d63c86f83 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java @@ -12,9 +12,10 @@ public static class Parameter31 extends SchemaParameter implements QueryParamete public Parameter31() { super( "string_group", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema3.Schema31.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java index 7f48e1296a5..86dd18ebbde 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java @@ -12,9 +12,10 @@ public static class Parameter41 extends SchemaParameter implements NonQueryQuery public Parameter41() { super( "boolean_group", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema4.Schema41.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java index 5beebad6ef0..1cd709e650d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java @@ -12,9 +12,10 @@ public static class Parameter51 extends SchemaParameter implements QueryParamete public Parameter51() { super( "int64_group", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema5.Schema51.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java index 372668d24fe..ebab511f85a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "enum_header_string_array", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java index 9909d3b31f5..3fbed42efd7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements NonQueryQuery public Parameter11() { super( "enum_header_string", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java index 0509ca49901..b6cf9ea6579 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java @@ -12,9 +12,10 @@ public static class Parameter21 extends SchemaParameter implements QueryParamete public Parameter21() { super( "enum_query_string_array", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema2.Schema21.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java index 1a5bfd7fe60..0767c1800d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java @@ -12,9 +12,10 @@ public static class Parameter31 extends SchemaParameter implements QueryParamete public Parameter31() { super( "enum_query_string", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema3.Schema31.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java index 3f1b9e47ca2..dd30eecd570 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java @@ -12,9 +12,10 @@ public static class Parameter41 extends SchemaParameter implements QueryParamete public Parameter41() { super( "enum_query_integer", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema4.Schema41.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java index ebd9b219130..f5d483cd742 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java @@ -12,9 +12,10 @@ public static class Parameter51 extends SchemaParameter implements QueryParamete public Parameter51() { super( "enum_query_double", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema5.Schema51.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java index 41b8d29d0ea..b010ba776bc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "query", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java index d9a09e3da58..fe357148f47 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "someVar", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java index 2f0d0a9f2c3..9fdbc34182f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements QueryParamete public Parameter11() { super( "SomeVar", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java index b6984a612d9..df2b41254c0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java @@ -12,9 +12,10 @@ public static class Parameter21 extends SchemaParameter implements QueryParamete public Parameter21() { super( "some_var", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema2.Schema21.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java index ad364b797ed..9aa8ac4fbbb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "id", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java index 223db154399..433745bc7a4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "compositionAtRoot", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java index a08e2c6bf59..9dcf547f2cb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements QueryParamete public Parameter11() { super( "compositionInProperty", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java index caf2800450e..0d7a8d77cac 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "mapBean", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.DEEP_OBJECT, false, - ParameterStyle.deepObject, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java index 4e934054491..ea2c3f0add6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "1", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java index 7c186aace52..009d487a32c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements QueryParamete public Parameter11() { super( "aB", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java index 1a737cf72bf..a4453baeaf6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java @@ -12,9 +12,10 @@ public static class Parameter101 extends SchemaParameter implements NonQueryQuer public Parameter101() { super( "aB", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema10.Schema101.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java index 23647676400..fe54772e8f8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java @@ -12,9 +12,10 @@ public static class Parameter111 extends SchemaParameter implements NonQueryQuer public Parameter111() { super( "Ab", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema11.Schema111.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java index a765c88d056..43442d37250 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java @@ -12,9 +12,10 @@ public static class Parameter121 extends SchemaParameter implements NonQueryQuer public Parameter121() { super( "self", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema12.Schema121.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java index c4b00fbbef7..cd685ffe78f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java @@ -12,9 +12,10 @@ public static class Parameter131 extends SchemaParameter implements NonQueryQuer public Parameter131() { super( "A-B", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema13.Schema131.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java index b850e1781ab..8573a8fde16 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java @@ -12,9 +12,10 @@ public static class Parameter141 extends SchemaParameter implements NonQueryQuer public Parameter141() { super( "1", - ParameterInType.cookie, + ParameterInType.COOKIE, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema14.Schema141.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java index c8047817643..41a628a9813 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java @@ -12,9 +12,10 @@ public static class Parameter151 extends SchemaParameter implements NonQueryQuer public Parameter151() { super( "aB", - ParameterInType.cookie, + ParameterInType.COOKIE, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema15.Schema151.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java index a552adc03d0..8754b7a973c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java @@ -12,9 +12,10 @@ public static class Parameter161 extends SchemaParameter implements NonQueryQuer public Parameter161() { super( "Ab", - ParameterInType.cookie, + ParameterInType.COOKIE, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema16.Schema161.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java index 69f402391c5..a68a6e4c888 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java @@ -12,9 +12,10 @@ public static class Parameter171 extends SchemaParameter implements NonQueryQuer public Parameter171() { super( "self", - ParameterInType.cookie, + ParameterInType.COOKIE, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema17.Schema171.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java index fd49d06b229..7e7c02ee860 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java @@ -12,9 +12,10 @@ public static class Parameter181 extends SchemaParameter implements NonQueryQuer public Parameter181() { super( "A-B", - ParameterInType.cookie, + ParameterInType.COOKIE, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema18.Schema181.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java index 3680b3941e8..95da30967d6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java @@ -12,9 +12,10 @@ public static class Parameter21 extends SchemaParameter implements QueryParamete public Parameter21() { super( "Ab", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema2.Schema21.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java index bed65389abd..94d80c2e3d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java @@ -12,9 +12,10 @@ public static class Parameter31 extends SchemaParameter implements QueryParamete public Parameter31() { super( "self", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema3.Schema31.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java index cf5627c20c5..433b8bdfa9a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java @@ -12,9 +12,10 @@ public static class Parameter41 extends SchemaParameter implements QueryParamete public Parameter41() { super( "A-B", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.FORM, false, - ParameterStyle.form, true, Schema4.Schema41.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java index 608b52b847a..f7672c8f236 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java @@ -12,9 +12,10 @@ public static class Parameter51 extends SchemaParameter implements NonQueryQuery public Parameter51() { super( "1", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema5.Schema51.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java index 7d382488707..35266f8b718 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java @@ -12,9 +12,10 @@ public static class Parameter61 extends SchemaParameter implements NonQueryQuery public Parameter61() { super( "aB", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema6.Schema61.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java index 0909b305ad6..7e3cd6dd7d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java @@ -12,9 +12,10 @@ public static class Parameter71 extends SchemaParameter implements NonQueryQuery public Parameter71() { super( "self", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema7.Schema71.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java index 2fcd093801a..c7012cbbcfc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java @@ -12,9 +12,10 @@ public static class Parameter81 extends SchemaParameter implements NonQueryQuery public Parameter81() { super( "A-B", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema8.Schema81.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java index 6ea973f46e8..f4906862720 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java @@ -12,9 +12,10 @@ public static class Parameter91 extends SchemaParameter implements NonQueryQuery public Parameter91() { super( "1", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema9.Schema91.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java index eb987e34949..4bf8468d82b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "petId", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java index 72d97fb9f36..35250aac301 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java @@ -25,9 +25,10 @@ public static class Parameter01 extends ContentParameter implements QueryParamet public Parameter01() { super( "someParam", - ParameterInType.query, + ParameterInType.QUERY, true, null, + false, null, Map.ofEntries( new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java index ff74dbf19e3..017dcc84578 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "mapBean", - ParameterInType.query, + ParameterInType.QUERY, + false, + ParameterStyle.DEEP_OBJECT, false, - ParameterStyle.deepObject, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java index 2801f5a97a4..4a4e505bf65 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "pipe", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java index 4913dd5a6ac..204f11068ba 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements QueryParamete public Parameter11() { super( "ioutil", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, false, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java index d1be9798f32..154d51ccd36 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java @@ -12,9 +12,10 @@ public static class Parameter21 extends SchemaParameter implements QueryParamete public Parameter21() { super( "http", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.spaceDelimited, + ParameterStyle.SPACE_DELIMITED, + false, false, Schema2.Schema21.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java index 805e99cb46d..0b43f3d7562 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java @@ -12,9 +12,10 @@ public static class Parameter31 extends SchemaParameter implements QueryParamete public Parameter31() { super( "url", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, false, Schema3.Schema31.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java index 9eddce875da..e9e15f14d0c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java @@ -12,9 +12,10 @@ public static class Parameter41 extends SchemaParameter implements QueryParamete public Parameter41() { super( "context", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema4.Schema41.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java index 156ddc512fc..33b4714c207 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java @@ -12,9 +12,10 @@ public static class Parameter51 extends SchemaParameter implements QueryParamete public Parameter51() { super( "refParam", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema5.Schema51.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java index f158e25d944..1c5370afa74 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "status", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java index 5c92b84849f..77a34adfa6d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "tags", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java index 6d40ef7148a..b98366f562d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "api_key", - ParameterInType.header, + ParameterInType.HEADER, + false, + ParameterStyle.SIMPLE, false, - ParameterStyle.simple, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java index 8fa9dda58cf..eb8d7423c21 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements NonQueryQuery public Parameter11() { super( "petId", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema1.Schema11.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java index d38bed04be1..20e6fb43fc3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "petId", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java index d51f544add0..0355f0badf5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "petId", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java index 61f447233db..60a2b9034d6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "petId", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java index 6c0e2a7597f..2c439e3ed31 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "order_id", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java index 3ecd0d7edb1..d903d2faed4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements NonQueryQuery public Parameter01() { super( "order_id", - ParameterInType.path, + ParameterInType.PATH, true, - ParameterStyle.simple, + ParameterStyle.SIMPLE, + false, false, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java index 54560a392bd..5fca16a5816 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java @@ -12,9 +12,10 @@ public static class Parameter01 extends SchemaParameter implements QueryParamete public Parameter01() { super( "username", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema0.Schema01.getInstance() ); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java index 8fdefdba78c..125ee2f14a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java @@ -12,9 +12,10 @@ public static class Parameter11 extends SchemaParameter implements QueryParamete public Parameter11() { super( "password", - ParameterInType.query, + ParameterInType.QUERY, true, - ParameterStyle.form, + ParameterStyle.FORM, + false, true, Schema1.Schema11.getInstance() ); diff --git a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs index e934d392e53..cdd62d9321c 100644 --- a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs @@ -64,21 +64,21 @@ public class {{jsonPathPiece.pascalCase}} { public {{jsonPathPiece.pascalCase}}1() { super( "{{{name}}}", - ParameterInType.{{in}}, + ParameterInType.{{#eq in "query"}}QUERY{{else}}{{#eq in "path"}}PATH{{else}}{{#eq in "header"}}HEADER{{else}}{{#eq in "cookie"}}COOKIE{{/eq}}{{/eq}}{{/eq}}{{/eq}}, {{#eq required null}}false{{else}}{{required}}{{/eq}}, - {{#eq style null}}null{{else}}ParameterStyle.{{style}}{{/eq}}, + {{#eq style null}}null{{else}}ParameterStyle.{{#eq style "matrix"}}MATRIX{{else}}{{#eq style "label"}}LABEL{{else}}{{#eq style "form"}}FORM{{else}}{{#eq style "simple"}}SIMPLE{{else}}{{#eq style "spaceDelimited"}}SPACE_DELIMITED{{else}}{{#eq style "pipeDelimited"}}PIPE_DELIMITED{{else}}{{#eq style "deepObject"}}DEEP_OBJECT{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}, + {{#eq allowReserved null}}false{{else}}{{allowReserved}}{{/eq}}, {{#eq explode null}}null{{else}}{{explode}}{{/eq}}, {{#if schema}} {{#with schema}}{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}.getInstance(){{/with}} - ); {{else}} Map.ofEntries( {{#each content}} new AbstractMap.SimpleEntry<>("{{{@key.original}}}", new {{@key.pascalCase}}MediaType()){{#unless @last}},{{/unless}} {{/each}} ) - ); {{/if}} + ); } } } From 4b7cd3ba34da88a66ee6786f88f8dac82969c0f5 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 15:24:07 -0800 Subject: [PATCH 05/12] Adds 4 separate base classes for parameters --- .../petstore/java/.openapi-generator/FILES | 5 +++ ...omponentRefSchemaStringWithValidation.java | 6 +-- .../components/parameters/PathUserName.java | 5 +-- .../RefSchemaStringWithValidation.java | 5 +-- .../parameter/ContentNonQueryParameter.java | 19 +++++++++ .../client/parameter/ContentParameter.java | 13 ++----- .../parameter/ContentQueryParameter.java | 20 ++++++++++ .../client/parameter/NonQueryParameter.java | 2 + .../client/parameter/ParameterBase.java | 39 +++++++++++++++++++ .../parameter/SchemaNonQueryParameter.java | 20 ++++++++++ .../client/parameter/SchemaParameter.java | 36 ++--------------- .../parameter/SchemaQueryParameter.java | 19 +++++++++ .../delete/parameters/Parameter0.java | 5 +-- .../delete/parameters/Parameter1.java | 5 +-- .../get/parameters/Parameter0.java | 7 ++-- .../parameters/Parameter0.java | 5 +-- .../post/parameters/Parameter0.java | 5 +-- .../fake/delete/parameters/Parameter0.java | 7 ++-- .../fake/delete/parameters/Parameter1.java | 5 +-- .../fake/delete/parameters/Parameter2.java | 7 ++-- .../fake/delete/parameters/Parameter3.java | 7 ++-- .../fake/delete/parameters/Parameter4.java | 5 +-- .../fake/delete/parameters/Parameter5.java | 7 ++-- .../paths/fake/get/parameters/Parameter0.java | 5 +-- .../paths/fake/get/parameters/Parameter1.java | 5 +-- .../paths/fake/get/parameters/Parameter2.java | 7 ++-- .../paths/fake/get/parameters/Parameter3.java | 7 ++-- .../paths/fake/get/parameters/Parameter4.java | 7 ++-- .../paths/fake/get/parameters/Parameter5.java | 7 ++-- .../put/parameters/Parameter0.java | 7 ++-- .../put/parameters/Parameter0.java | 7 ++-- .../put/parameters/Parameter1.java | 7 ++-- .../put/parameters/Parameter2.java | 7 ++-- .../delete/parameters/Parameter0.java | 5 +-- .../post/parameters/Parameter0.java | 7 ++-- .../post/parameters/Parameter1.java | 7 ++-- .../get/parameters/Parameter0.java | 7 ++-- .../post/parameters/Parameter0.java | 7 ++-- .../post/parameters/Parameter1.java | 7 ++-- .../post/parameters/Parameter10.java | 5 +-- .../post/parameters/Parameter11.java | 5 +-- .../post/parameters/Parameter12.java | 5 +-- .../post/parameters/Parameter13.java | 5 +-- .../post/parameters/Parameter14.java | 7 ++-- .../post/parameters/Parameter15.java | 7 ++-- .../post/parameters/Parameter16.java | 7 ++-- .../post/parameters/Parameter17.java | 7 ++-- .../post/parameters/Parameter18.java | 7 ++-- .../post/parameters/Parameter2.java | 7 ++-- .../post/parameters/Parameter3.java | 7 ++-- .../post/parameters/Parameter4.java | 7 ++-- .../post/parameters/Parameter5.java | 5 +-- .../post/parameters/Parameter6.java | 5 +-- .../post/parameters/Parameter7.java | 5 +-- .../post/parameters/Parameter8.java | 5 +-- .../post/parameters/Parameter9.java | 5 +-- .../post/parameters/Parameter0.java | 5 +-- .../get/parameters/Parameter0.java | 6 +-- .../get/parameters/Parameter0.java | 7 ++-- .../put/parameters/Parameter0.java | 7 ++-- .../put/parameters/Parameter1.java | 5 +-- .../put/parameters/Parameter2.java | 5 +-- .../put/parameters/Parameter3.java | 5 +-- .../put/parameters/Parameter4.java | 7 ++-- .../put/parameters/Parameter5.java | 7 ++-- .../get/parameters/Parameter0.java | 5 +-- .../get/parameters/Parameter0.java | 5 +-- .../delete/parameters/Parameter0.java | 5 +-- .../delete/parameters/Parameter1.java | 5 +-- .../petpetid/get/parameters/Parameter0.java | 5 +-- .../petpetid/post/parameters/Parameter0.java | 5 +-- .../post/parameters/Parameter0.java | 5 +-- .../delete/parameters/Parameter0.java | 5 +-- .../get/parameters/Parameter0.java | 5 +-- .../userlogin/get/parameters/Parameter0.java | 7 ++-- .../userlogin/get/parameters/Parameter1.java | 7 ++-- .../generators/JavaClientGenerator.java | 20 ++++++++++ .../components/parameter/Parameter.hbs | 20 ++++++---- .../parameter/ContentNonQueryParameter.hbs | 19 +++++++++ .../parameter/ContentParameter.hbs | 13 ++----- .../parameter/ContentQueryParameter.hbs | 19 +++++++++ .../parameter/NonQueryParameter.hbs | 2 + .../packagename/parameter/ParameterBase.hbs | 39 +++++++++++++++++++ .../parameter/SchemaNonQueryParameter.hbs | 20 ++++++++++ .../packagename/parameter/SchemaParameter.hbs | 36 ++--------------- .../parameter/SchemaQueryParameter.hbs | 19 +++++++++ 86 files changed, 458 insertions(+), 323 deletions(-) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/ContentNonQueryParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/ParameterBase.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs create mode 100644 src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 0664e894589..360fdf6b592 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -553,12 +553,17 @@ src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java src/main/java/org/openapijsonschematools/client/header/StyleSerializer.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/ContentNonQueryParameter.java src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.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/parameter/QueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/RequestBody.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/Responses.java src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/responses/Code200Response.java diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java index 7a22546432c..0b6048ce0f5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/ComponentRefSchemaStringWithValidation.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.client.components.parameters; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; +import org.openapijsonschematools.client.parameter.ContentNonQueryParameter; import org.openapijsonschematools.client.parameter.ContentParameter; import org.openapijsonschematools.client.mediatype.MediaType; import org.openapijsonschematools.client.components.parameters.componentrefschemastringwithvalidation.content.applicationjson.ApplicationjsonSchema; @@ -21,15 +21,15 @@ public Void encoding() { } } - public static class ComponentRefSchemaStringWithValidation1 extends ContentParameter implements NonQueryQueryParameter { + public static class ComponentRefSchemaStringWithValidation1 extends ContentNonQueryParameter { public ComponentRefSchemaStringWithValidation1() { super( "CRSstringWithValidation", ParameterInType.PATH, true, null, - false, null, + false, Map.ofEntries( new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java index d02f9a25956..554c6794532 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/PathUserName.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.components.parameters.pathusername.Schema; public class PathUserName { - public static class PathUserName1 extends SchemaParameter implements NonQueryQueryParameter { + public static class PathUserName1 extends SchemaNonQueryParameter { public PathUserName1() { super( "username", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java index 0e8c73c5d0f..61897e2d3d2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/parameters/RefSchemaStringWithValidation.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.components.parameters.refschemastringwithvalidation.Schema; public class RefSchemaStringWithValidation { - public static class RefSchemaStringWithValidation1 extends SchemaParameter implements NonQueryQueryParameter { + public static class RefSchemaStringWithValidation1 extends SchemaNonQueryParameter { public RefSchemaStringWithValidation1() { super( "RSstringWithValidation", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java new file mode 100644 index 00000000000..e3cecc7753f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java @@ -0,0 +1,19 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentNonQueryParameter extends ContentParameter implements NonQueryParameter { + + public ContentNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java index 62b0174a1e9..c9da00c8ad7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java @@ -4,24 +4,19 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.contenttype.ContentTypeDetector; import org.openapijsonschematools.client.contenttype.ContentTypeSerializer; -import org.openapijsonschematools.client.header.HeaderBase; import org.openapijsonschematools.client.mediatype.MediaType; import java.util.Map; -public class ContentParameter extends HeaderBase { - public final String name; - public final ParameterInType inType; +public class ContentParameter extends ParameterBase { public final Map> content; - public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { - super(required, style, explode, allowReserved); - this.name = name; - this.inType = inType; + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved); this.content = content; } - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { for (Map.Entry> entry: content.entrySet()) { var castInData = validate ? entry.getValue().schema().validate(inData, configuration) : inData ; String contentType = entry.getKey(); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java new file mode 100644 index 00000000000..b4e88e66112 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentQueryParameter extends ContentParameter implements QueryParameter { + + public ContentQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java index 5155c7d9ee1..de5d7451c57 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java @@ -3,6 +3,8 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import java.util.Map; + public interface NonQueryParameter { Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java new file mode 100644 index 00000000000..742792cdb40 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java @@ -0,0 +1,39 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +public class ParameterBase extends HeaderBase { + public final String name; + public final ParameterInType inType; + + public ParameterBase(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + } + + protected ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return new PrefixSeparatorIterator("", "%20"); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return new PrefixSeparatorIterator("", "|"); + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java new file mode 100644 index 00000000000..954879483e8 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaNonQueryParameter extends SchemaParameter implements QueryParameter { + + public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inType, validate, configuration, iterator); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java index a1129eadcf4..363800f1437 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -2,49 +2,21 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.header.HeaderBase; import org.openapijsonschematools.client.header.PrefixSeparatorIterator; import org.openapijsonschematools.client.header.StyleSerializer; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import java.util.Map; -public class SchemaParameter extends HeaderBase { - public final String name; - public final ParameterInType inType; +public class SchemaParameter extends ParameterBase { public final JsonSchema schema; - public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, JsonSchema schema) { - super(required, ParameterStyle.SIMPLE, explode, allowReserved); - this.name = name; - this.inType = inType; + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved); this.schema = schema; } - private ParameterStyle getStyle() { - if (style != null) { - return style; - } - if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { - return ParameterStyle.FORM; - } - // ParameterInType.HEADER || ParameterInType.PATH - return ParameterStyle.SIMPLE; - } - - public PrefixSeparatorIterator getPrefixSeparatorIterator() { - ParameterStyle usedStyle = getStyle(); - if (usedStyle == ParameterStyle.FORM) { - return new PrefixSeparatorIterator("?", "&"); - } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { - return new PrefixSeparatorIterator("", "%20"); - } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { - return new PrefixSeparatorIterator("", "|"); - } - throw new RuntimeException("No iterator possible for style="+usedStyle); - } - - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { var castInData = validate ? schema.validate(inData, configuration) : inData; ParameterStyle usedStyle = getStyle(); boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java new file mode 100644 index 00000000000..e496ad55b31 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java @@ -0,0 +1,19 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaQueryParameter extends SchemaParameter implements NonQueryParameter { + + public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return serialize(inType, validate, configuration, null); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java index 30b4f9ffee6..ee8b94ae4af 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "someHeader", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java index 3959e77b3eb..28dca4167dd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/parameters/Parameter1.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter11 extends SchemaNonQueryParameter { public Parameter11() { super( "subDir", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java index 0250eb5bac3..399bde0b7b0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "searchStr", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java index 87fe2a59efc..4ae8ad7e2b6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "subDir", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java index ced6fd18139..6d7a44bd5a9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "someHeader", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java index fbf757705aa..6a9aa1e00e6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "required_string_group", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java index 81755c7583a..91f20954e40 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter1.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter11 extends SchemaNonQueryParameter { public Parameter11() { super( "required_boolean_group", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java index 8697d6b3056..fa2154af675 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter2.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter2.Schema2; public class Parameter2 { - public static class Parameter21 extends SchemaParameter implements QueryParameter { + public static class Parameter21 extends SchemaQueryParameter { public Parameter21() { super( "required_int64_group", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema2.Schema21.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java index 99d63c86f83..4a2d6796943 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter3.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter3.Schema3; public class Parameter3 { - public static class Parameter31 extends SchemaParameter implements QueryParameter { + public static class Parameter31 extends SchemaQueryParameter { public Parameter31() { super( "string_group", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema3.Schema31.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java index 86dd18ebbde..3743568bf2b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter4.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter4.Schema4; public class Parameter4 { - public static class Parameter41 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter41 extends SchemaNonQueryParameter { public Parameter41() { super( "boolean_group", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java index 1cd709e650d..1ee3113cd6d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/Parameter5.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter5.Schema5; public class Parameter5 { - public static class Parameter51 extends SchemaParameter implements QueryParameter { + public static class Parameter51 extends SchemaQueryParameter { public Parameter51() { super( "int64_group", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema5.Schema51.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java index ebab511f85a..f4564390d60 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "enum_header_string_array", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java index 3fbed42efd7..3a4605d5fff 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter1.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter11 extends SchemaNonQueryParameter { public Parameter11() { super( "enum_header_string", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java index b6cf9ea6579..4c9365345a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter2.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter2.Schema2; public class Parameter2 { - public static class Parameter21 extends SchemaParameter implements QueryParameter { + public static class Parameter21 extends SchemaQueryParameter { public Parameter21() { super( "enum_query_string_array", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema2.Schema21.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java index 0767c1800d5..4e2da7a8b0e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter3.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter3.Schema3; public class Parameter3 { - public static class Parameter31 extends SchemaParameter implements QueryParameter { + public static class Parameter31 extends SchemaQueryParameter { public Parameter31() { super( "enum_query_string", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema3.Schema31.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java index dd30eecd570..e8ce1faa153 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter4.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter4.Schema4; public class Parameter4 { - public static class Parameter41 extends SchemaParameter implements QueryParameter { + public static class Parameter41 extends SchemaQueryParameter { public Parameter41() { super( "enum_query_integer", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema4.Schema41.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java index f5d483cd742..773b7862b8e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/Parameter5.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter5.Schema5; public class Parameter5 { - public static class Parameter51 extends SchemaParameter implements QueryParameter { + public static class Parameter51 extends SchemaQueryParameter { public Parameter51() { super( "enum_query_double", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema5.Schema51.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java index b010ba776bc..a0df32ee830 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "query", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java index fe357148f47..d3bd6dc5c0c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "someVar", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java index 9fdbc34182f..5850f710ad2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter1.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements QueryParameter { + public static class Parameter11 extends SchemaQueryParameter { public Parameter11() { super( "SomeVar", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema1.Schema11.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java index df2b41254c0..8491c847601 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/Parameter2.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter2.Schema2; public class Parameter2 { - public static class Parameter21 extends SchemaParameter implements QueryParameter { + public static class Parameter21 extends SchemaQueryParameter { public Parameter21() { super( "some_var", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema2.Schema21.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java index 9aa8ac4fbbb..6e1e10fe734 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java index 433745bc7a4..0e0d1f550ac 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "compositionAtRoot", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java index 9dcf547f2cb..719e3b4cda9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/Parameter1.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements QueryParameter { + public static class Parameter11 extends SchemaQueryParameter { public Parameter11() { super( "compositionInProperty", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema1.Schema11.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java index 0d7a8d77cac..2a7c0372825 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "mapBean", ParameterInType.QUERY, false, ParameterStyle.DEEP_OBJECT, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java index ea2c3f0add6..ec3b1616bfd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "1", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java index 009d487a32c..e7583fd338e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter1.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements QueryParameter { + public static class Parameter11 extends SchemaQueryParameter { public Parameter11() { super( "aB", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema1.Schema11.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java index a4453baeaf6..4405261b5d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter10.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter10.Schema10; public class Parameter10 { - public static class Parameter101 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter101 extends SchemaNonQueryParameter { public Parameter101() { super( "aB", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java index fe54772e8f8..43a773c6c0f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter11.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter11.Schema11; public class Parameter11 { - public static class Parameter111 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter111 extends SchemaNonQueryParameter { public Parameter111() { super( "Ab", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java index 43442d37250..b66687e315b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter12.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter12.Schema12; public class Parameter12 { - public static class Parameter121 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter121 extends SchemaNonQueryParameter { public Parameter121() { super( "self", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java index cd685ffe78f..de1c809185e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter13.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13.Schema13; public class Parameter13 { - public static class Parameter131 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter131 extends SchemaNonQueryParameter { public Parameter131() { super( "A-B", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java index 8573a8fde16..46b670b9b77 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter14.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter14.Schema14; public class Parameter14 { - public static class Parameter141 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter141 extends SchemaNonQueryParameter { public Parameter141() { super( "1", ParameterInType.COOKIE, false, ParameterStyle.FORM, - false, true, + false, Schema14.Schema141.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java index 41a628a9813..ab6f4391312 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter15.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter15.Schema15; public class Parameter15 { - public static class Parameter151 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter151 extends SchemaNonQueryParameter { public Parameter151() { super( "aB", ParameterInType.COOKIE, false, ParameterStyle.FORM, - false, true, + false, Schema15.Schema151.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java index 8754b7a973c..24fa8a1983a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter16.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter16.Schema16; public class Parameter16 { - public static class Parameter161 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter161 extends SchemaNonQueryParameter { public Parameter161() { super( "Ab", ParameterInType.COOKIE, false, ParameterStyle.FORM, - false, true, + false, Schema16.Schema161.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java index a68a6e4c888..017bcd23ca3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter17.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17.Schema17; public class Parameter17 { - public static class Parameter171 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter171 extends SchemaNonQueryParameter { public Parameter171() { super( "self", ParameterInType.COOKIE, false, ParameterStyle.FORM, - false, true, + false, Schema17.Schema171.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java index 7e7c02ee860..96e183a2cf7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter18.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18.Schema18; public class Parameter18 { - public static class Parameter181 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter181 extends SchemaNonQueryParameter { public Parameter181() { super( "A-B", ParameterInType.COOKIE, false, ParameterStyle.FORM, - false, true, + false, Schema18.Schema181.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java index 95da30967d6..01bd1b51dd7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter2.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter2.Schema2; public class Parameter2 { - public static class Parameter21 extends SchemaParameter implements QueryParameter { + public static class Parameter21 extends SchemaQueryParameter { public Parameter21() { super( "Ab", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema2.Schema21.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java index 94d80c2e3d5..518a6987279 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter3.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3.Schema3; public class Parameter3 { - public static class Parameter31 extends SchemaParameter implements QueryParameter { + public static class Parameter31 extends SchemaQueryParameter { public Parameter31() { super( "self", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema3.Schema31.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java index 433b8bdfa9a..edc22a057be 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter4.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4.Schema4; public class Parameter4 { - public static class Parameter41 extends SchemaParameter implements QueryParameter { + public static class Parameter41 extends SchemaQueryParameter { public Parameter41() { super( "A-B", ParameterInType.QUERY, false, ParameterStyle.FORM, - false, true, + false, Schema4.Schema41.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java index f7672c8f236..a8e1130fe2d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter5.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter5.Schema5; public class Parameter5 { - public static class Parameter51 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter51 extends SchemaNonQueryParameter { public Parameter51() { super( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java index 35266f8b718..f8f23bab143 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter6.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter6.Schema6; public class Parameter6 { - public static class Parameter61 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter61 extends SchemaNonQueryParameter { public Parameter61() { super( "aB", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java index 7e3cd6dd7d5..85a7151b2b5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter7.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7.Schema7; public class Parameter7 { - public static class Parameter71 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter71 extends SchemaNonQueryParameter { public Parameter71() { super( "self", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java index c7012cbbcfc..5b821bbfdef 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter8.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8.Schema8; public class Parameter8 { - public static class Parameter81 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter81 extends SchemaNonQueryParameter { public Parameter81() { super( "A-B", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java index f4906862720..ac94eeea56c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/parameters/Parameter9.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9.Schema9; public class Parameter9 { - public static class Parameter91 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter91 extends SchemaNonQueryParameter { public Parameter91() { super( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java index 4bf8468d82b..ad83df56670 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "petId", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java index 35250aac301..18aacc0289c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/Parameter0.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; +import org.openapijsonschematools.client.parameter.ContentQueryParameter; import org.openapijsonschematools.client.parameter.ContentParameter; import org.openapijsonschematools.client.mediatype.MediaType; import org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters.parameter0.content.applicationjson.Schema0; @@ -21,15 +21,15 @@ public Void encoding() { } } - public static class Parameter01 extends ContentParameter implements QueryParameter { + public static class Parameter01 extends ContentQueryParameter { public Parameter01() { super( "someParam", ParameterInType.QUERY, true, null, - false, null, + false, Map.ofEntries( new AbstractMap.SimpleEntry<>("application/json", new ApplicationjsonMediaType()) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java index 017dcc84578..137bc74b804 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.fakerefobjinquery.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "mapBean", ParameterInType.QUERY, false, ParameterStyle.DEEP_OBJECT, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java index 4a4e505bf65..c989c5983cb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "pipe", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java index 204f11068ba..c16f6d6de28 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter1.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements QueryParameter { + public static class Parameter11 extends SchemaQueryParameter { public Parameter11() { super( "ioutil", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java index 154d51ccd36..2fd143bb906 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter2.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter2.Schema2; public class Parameter2 { - public static class Parameter21 extends SchemaParameter implements QueryParameter { + public static class Parameter21 extends SchemaQueryParameter { public Parameter21() { super( "http", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java index 0b43f3d7562..480e2c48f81 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter3.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter3.Schema3; public class Parameter3 { - public static class Parameter31 extends SchemaParameter implements QueryParameter { + public static class Parameter31 extends SchemaQueryParameter { public Parameter31() { super( "url", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java index e9e15f14d0c..eeb191446a1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter4.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter4.Schema4; public class Parameter4 { - public static class Parameter41 extends SchemaParameter implements QueryParameter { + public static class Parameter41 extends SchemaQueryParameter { public Parameter41() { super( "context", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema4.Schema41.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java index 33b4714c207..02b20731da4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/parameters/Parameter5.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter5.Schema5; public class Parameter5 { - public static class Parameter51 extends SchemaParameter implements QueryParameter { + public static class Parameter51 extends SchemaQueryParameter { public Parameter51() { super( "refParam", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema5.Schema51.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java index 1c5370afa74..da19a087ca9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.petfindbystatus.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "status", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java index 77a34adfa6d..edc13c725ae 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.petfindbytags.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "tags", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java index b98366f562d..b43b8e975fa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "api_key", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java index eb8d7423c21..b3a4da99d38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/Parameter1.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter11 extends SchemaNonQueryParameter { public Parameter11() { super( "petId", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java index 20e6fb43fc3..5adf6297dd5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.petpetid.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "petId", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java index 0355f0badf5..ec696571f52 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.petpetid.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "petId", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java index 60a2b9034d6..eedbc3c3a58 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "petId", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java index 2c439e3ed31..12f5b4ad5b6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "order_id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java index d903d2faed4..3736b803d37 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/parameters/Parameter0.java @@ -2,13 +2,12 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.NonQueryQueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaNonQueryParameter; import org.openapijsonschematools.client.paths.storeorderorderid.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements NonQueryQueryParameter { + public static class Parameter01 extends SchemaNonQueryParameter { public Parameter01() { super( "order_id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java index 5fca16a5816..77fc0b28bc5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter0.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter0.Schema0; public class Parameter0 { - public static class Parameter01 extends SchemaParameter implements QueryParameter { + public static class Parameter01 extends SchemaQueryParameter { public Parameter01() { super( "username", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema0.Schema01.getInstance() ); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java index 125ee2f14a5..69baecf02a7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/parameters/Parameter1.java @@ -2,21 +2,20 @@ import org.openapijsonschematools.client.parameter.ParameterStyle; import org.openapijsonschematools.client.parameter.ParameterInType; -import org.openapijsonschematools.client.parameter.QueryParameter; -import org.openapijsonschematools.client.parameter.SchemaParameter; +import org.openapijsonschematools.client.parameter.SchemaQueryParameter; import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter1.Schema1; public class Parameter1 { - public static class Parameter11 extends SchemaParameter implements QueryParameter { + public static class Parameter11 extends SchemaQueryParameter { public Parameter11() { super( "password", ParameterInType.QUERY, true, ParameterStyle.FORM, - false, true, + false, Schema1.Schema11.getInstance() ); } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 799aa61843d..2f5cf353c06 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -827,10 +827,22 @@ public void processOpts() { "ContentHeaderTest.java")); // parameter + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/ContentNonQueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "ContentNonQueryParameter.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/parameter/ContentParameter.hbs", packagePath() + File.separatorChar + "parameter", "ContentParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/ContentQueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "ContentQueryParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/ParameterBase.hbs", + packagePath() + File.separatorChar + "parameter", + "ParameterBase.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/parameter/NonQueryParameter.hbs", packagePath() + File.separatorChar + "parameter", @@ -847,10 +859,18 @@ public void processOpts() { "src/main/java/packagename/parameter/QueryParameter.hbs", packagePath() + File.separatorChar + "parameter", "QueryParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "SchemaNonQueryParameter.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/parameter/SchemaParameter.hbs", packagePath() + File.separatorChar + "parameter", "SchemaParameter.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/parameter/SchemaQueryParameter.hbs", + packagePath() + File.separatorChar + "parameter", + "SchemaQueryParameter.java")); // response supportingFiles.add(new SupportingFile( diff --git a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs index cdd62d9321c..36ebf766afb 100644 --- a/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/parameter/Parameter.hbs @@ -22,18 +22,22 @@ public class {{jsonPathPiece.pascalCase}} extends {{packageName}}.{{refInfo.ref. import {{packageName}}.parameter.ParameterStyle; {{/neq}} import {{packageName}}.parameter.ParameterInType; - {{#eq in "query"}} -import {{packageName}}.parameter.QueryParameter; - {{else}} -import {{packageName}}.parameter.NonQueryQueryParameter; - {{/eq}} {{#if schema}} -import {{packageName}}.parameter.SchemaParameter; + {{#eq in "query"}} +import {{packageName}}.parameter.SchemaQueryParameter; + {{else}} +import {{packageName}}.parameter.SchemaNonQueryParameter; + {{/eq}} {{#with schema}} import {{{packageName}}}.{{subpackage}}.{{containerJsonPathPiece.pascalCase}}; {{/with}} {{/if}} {{#if content}} + {{#eq in "query"}} +import {{packageName}}.parameter.ContentQueryParameter; + {{else}} +import {{packageName}}.parameter.ContentNonQueryParameter; + {{/eq}} import {{packageName}}.parameter.ContentParameter; import {{packageName}}.mediatype.MediaType; {{#each content}} @@ -60,15 +64,15 @@ public class {{jsonPathPiece.pascalCase}} { } {{/each}} - public static class {{jsonPathPiece.pascalCase}}1 extends {{#if schema}}SchemaParameter{{else}}ContentParameter{{/if}} implements {{#eq in "query"}}QueryParameter{{else}}NonQueryQueryParameter{{/eq}} { + public static class {{jsonPathPiece.pascalCase}}1 extends {{#if schema}}Schema{{else}}Content{{/if}}{{#eq in "query"}}QueryParameter{{else}}NonQueryParameter{{/eq}} { public {{jsonPathPiece.pascalCase}}1() { super( "{{{name}}}", ParameterInType.{{#eq in "query"}}QUERY{{else}}{{#eq in "path"}}PATH{{else}}{{#eq in "header"}}HEADER{{else}}{{#eq in "cookie"}}COOKIE{{/eq}}{{/eq}}{{/eq}}{{/eq}}, {{#eq required null}}false{{else}}{{required}}{{/eq}}, {{#eq style null}}null{{else}}ParameterStyle.{{#eq style "matrix"}}MATRIX{{else}}{{#eq style "label"}}LABEL{{else}}{{#eq style "form"}}FORM{{else}}{{#eq style "simple"}}SIMPLE{{else}}{{#eq style "spaceDelimited"}}SPACE_DELIMITED{{else}}{{#eq style "pipeDelimited"}}PIPE_DELIMITED{{else}}{{#eq style "deepObject"}}DEEP_OBJECT{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}, - {{#eq allowReserved null}}false{{else}}{{allowReserved}}{{/eq}}, {{#eq explode null}}null{{else}}{{explode}}{{/eq}}, + {{#eq allowReserved null}}false{{else}}{{allowReserved}}{{/eq}}, {{#if schema}} {{#with schema}}{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}.getInstance(){{/with}} {{else}} diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentNonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentNonQueryParameter.hbs new file mode 100644 index 00000000000..4a826a93f23 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentNonQueryParameter.hbs @@ -0,0 +1,19 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.mediatype.MediaType; + +import java.util.Map; + +public class ContentNonQueryParameter extends ContentParameter implements NonQueryParameter { + + public ContentNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs index acedc1f5dd2..27176db6fae 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentParameter.hbs @@ -4,24 +4,19 @@ import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.contenttype.ContentTypeDetector; import {{{packageName}}}.contenttype.ContentTypeSerializer; -import {{{packageName}}}.header.HeaderBase; import {{{packageName}}}.mediatype.MediaType; import java.util.Map; -public class ContentParameter extends HeaderBase { - public final String name; - public final ParameterInType inType; +public class ContentParameter extends ParameterBase { public final Map> content; - public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, Map> content) { - super(required, style, explode, allowReserved); - this.name = name; - this.inType = inType; + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved); this.content = content; } - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { for (Map.Entry> entry: content.entrySet()) { var castInData = validate ? entry.getValue().schema().validate(inData, configuration) : inData ; String contentType = entry.getKey(); diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs new file mode 100644 index 00000000000..ca1d14781a6 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs @@ -0,0 +1,19 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.mediatype.MediaType; + +import java.util.Map; + +public class ContentQueryParameter extends ContentParameter implements QueryParameter { + + public ContentQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs index 8f5defd3155..666ee87ce77 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/NonQueryParameter.hbs @@ -3,6 +3,8 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; +import java.util.Map; + public interface NonQueryParameter { Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ParameterBase.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ParameterBase.hbs new file mode 100644 index 00000000000..95e55de49af --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/ParameterBase.hbs @@ -0,0 +1,39 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.header.HeaderBase; +import {{{packageName}}}.header.PrefixSeparatorIterator; + +public class ParameterBase extends HeaderBase { + public final String name; + public final ParameterInType inType; + + public ParameterBase(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + } + + protected ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return new PrefixSeparatorIterator("", "%20"); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return new PrefixSeparatorIterator("", "|"); + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs new file mode 100644 index 00000000000..29d3e6146f0 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs @@ -0,0 +1,20 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.header.PrefixSeparatorIterator; +import {{{packageName}}}.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaNonQueryParameter extends SchemaParameter implements QueryParameter { + + public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inType, validate, configuration, iterator); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs index 84602ee9e8a..917f6ecc6f2 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs @@ -2,49 +2,21 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.header.HeaderBase; import {{{packageName}}}.header.PrefixSeparatorIterator; import {{{packageName}}}.header.StyleSerializer; import {{{packageName}}}.schemas.validation.JsonSchema; import java.util.Map; -public class SchemaParameter extends HeaderBase { - public final String name; - public final ParameterInType inType; +public class SchemaParameter extends ParameterBase { public final JsonSchema schema; - public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean allowReserved, @Nullable Boolean explode, JsonSchema schema) { - super(required, ParameterStyle.SIMPLE, explode, allowReserved); - this.name = name; - this.inType = inType; + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved); this.schema = schema; } - private ParameterStyle getStyle() { - if (style != null) { - return style; - } - if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { - return ParameterStyle.FORM; - } - // ParameterInType.HEADER || ParameterInType.PATH - return ParameterStyle.SIMPLE; - } - - public PrefixSeparatorIterator getPrefixSeparatorIterator() { - ParameterStyle usedStyle = getStyle(); - if (usedStyle == ParameterStyle.FORM) { - return new PrefixSeparatorIterator("?", "&"); - } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { - return new PrefixSeparatorIterator("", "%20"); - } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { - return new PrefixSeparatorIterator("", "|"); - } - throw new RuntimeException("No iterator possible for style="+usedStyle); - } - - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { var castInData = validate ? schema.validate(inData, configuration) : inData; ParameterStyle usedStyle = getStyle(); boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs new file mode 100644 index 00000000000..c2daa8013e2 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs @@ -0,0 +1,19 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaQueryParameter extends SchemaParameter implements NonQueryParameter { + + public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return serialize(inType, validate, configuration, null); + } +} \ No newline at end of file From 40ef5e06a4d6c24cea5f40a0a66a0e5ec19c0f0f Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 16:04:42 -0800 Subject: [PATCH 06/12] Fixes mvn test run --- .../client/parameter/SchemaNonQueryParameter.java | 2 +- .../openapijsonschematools/client/header/SchemaHeaderTest.java | 2 +- .../main/java/packagename/parameter/SchemaNonQueryParameter.hbs | 2 +- .../java/src/test/java/packagename/header/SchemaHeaderTest.hbs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java index 954879483e8..6512956a153 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java @@ -15,6 +15,6 @@ public SchemaNonQueryParameter(String name, ParameterInType inType, boolean requ @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inType, validate, configuration, iterator); + return super.serialize(inType, validate, configuration, iterator); } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java index 7b5795bcc14..b0eaf780b2e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java @@ -130,7 +130,7 @@ public void testDeserialization() { SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); SchemaHeader header = getHeader(NullJsonSchema.NullJsonSchema1.getInstance()); - var deserialized = header.deserialize(List.of(""), false, configuration); + @Nullable Object deserialized = header.deserialize(List.of(""), false, configuration); assertNull(deserialized); header = getHeader(NumberJsonSchema.NumberJsonSchema1.getInstance()); diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs index 29d3e6146f0..d28adf4ea8f 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs @@ -15,6 +15,6 @@ public class SchemaNonQueryParameter extends SchemaParameter implements QueryPar @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inType, validate, configuration, iterator); + return super.serialize(inType, validate, configuration, iterator); } } \ No newline at end of file diff --git a/src/main/resources/java/src/test/java/packagename/header/SchemaHeaderTest.hbs b/src/main/resources/java/src/test/java/packagename/header/SchemaHeaderTest.hbs index b93c64802c1..4af17ac9158 100644 --- a/src/main/resources/java/src/test/java/packagename/header/SchemaHeaderTest.hbs +++ b/src/main/resources/java/src/test/java/packagename/header/SchemaHeaderTest.hbs @@ -130,7 +130,7 @@ public class SchemaHeaderTest { SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); SchemaHeader header = getHeader(NullJsonSchema.NullJsonSchema1.getInstance()); - var deserialized = header.deserialize(List.of(""), false, configuration); + @Nullable Object deserialized = header.deserialize(List.of(""), false, configuration); assertNull(deserialized); header = getHeader(NumberJsonSchema.NumberJsonSchema1.getInstance()); From 9122afc8ce31813e0cffa180b63b50ea459e05db Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 17:11:07 -0800 Subject: [PATCH 07/12] Fixes build and test errors --- .../petstore/java/.openapi-generator/FILES | 1 + .../parameter/ContentQueryParameter.java | 2 +- .../parameter/SchemaNonQueryParameter.java | 8 +- .../client/parameter/SchemaParameter.java | 9 +- .../parameter/SchemaQueryParameter.java | 9 +- .../SchemaNonQueryParameterTest.java | 259 ++++++++++++++++++ .../generators/JavaClientGenerator.java | 4 + .../parameter/ContentQueryParameter.hbs | 3 +- .../parameter/SchemaNonQueryParameter.hbs | 8 +- .../packagename/parameter/SchemaParameter.hbs | 9 +- .../parameter/SchemaQueryParameter.hbs | 9 +- .../parameter/SchemaNonQueryParameterTest.hbs | 259 ++++++++++++++++++ 12 files changed, 556 insertions(+), 24 deletions(-) create mode 100644 samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java create mode 100644 src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 360fdf6b592..ed3e9f4ec4a 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -1192,6 +1192,7 @@ src/main/java/org/openapijsonschematools/client/servers/server1/Variables.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/parameter/SchemaNonQueryParameterTest.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 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java index b4e88e66112..5d8239dc356 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java @@ -15,6 +15,6 @@ public ContentQueryParameter(String name, ParameterInType inType, boolean requir @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inData, validate, configuration); + return super.serialize(inData, validate, configuration); } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java index 6512956a153..80976ec5d85 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java @@ -7,14 +7,14 @@ import java.util.Map; -public class SchemaNonQueryParameter extends SchemaParameter implements QueryParameter { +public class SchemaNonQueryParameter extends SchemaParameter implements NonQueryParameter { public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + super(name, inType, required, style, explode, allowReserved, schema); } @Override - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return super.serialize(inType, validate, configuration, iterator); + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration, null); } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java index 363800f1437..597916bbdfc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -5,14 +5,17 @@ import org.openapijsonschematools.client.header.PrefixSeparatorIterator; import org.openapijsonschematools.client.header.StyleSerializer; import org.openapijsonschematools.client.schemas.validation.JsonSchema; - +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; import java.util.Map; public class SchemaParameter extends ParameterBase { public final JsonSchema schema; public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved); + super(name, inType, required, style, explode, allowReserved); this.schema = schema; } @@ -21,7 +24,7 @@ protected Map serialize(@Nullable Object inData, boolean validat ParameterStyle usedStyle = getStyle(); boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; String value; - boolean usedExplode = explode == null || explode; + boolean usedExplode = explode == null ? usedStyle == ParameterStyle.FORM : explode; if (usedStyle == ParameterStyle.SIMPLE) { // header OR path value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java index e496ad55b31..5332addfc36 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java @@ -2,18 +2,19 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import java.util.Map; -public class SchemaQueryParameter extends SchemaParameter implements NonQueryParameter { +public class SchemaQueryParameter extends SchemaParameter implements QueryParameter { public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + super(name, inType, required, style, explode, allowReserved, schema); } @Override - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { - return serialize(inType, validate, configuration, null); + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inType, validate, configuration, iterator); } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java new file mode 100644 index 00000000000..92525592dce --- /dev/null +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java @@ -0,0 +1,259 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaNonQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class HeaderParameter extends SchemaNonQueryParameter { + public HeaderParameter(@Nullable Boolean explode) { + super("color", ParameterInType.HEADER, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testHeaderSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var header = new HeaderParameter(testCase.explode); + var serialization = header.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var boolHeader = new HeaderParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> boolHeader.serialize(value, false, configuration) + ); + } + } + + public static class PathParameter extends SchemaNonQueryParameter { + public PathParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var pathParameter = new PathParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> pathParameter.serialize(value, false, configuration) + ); + } + } + + public static class CookieParameter extends SchemaNonQueryParameter { + public CookieParameter(@Nullable Boolean explode) { + super("color", ParameterInType.COOKIE, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testCookieSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "color=hello world") + ), + new ParamTestCase( + "", + Map.of("color", "color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var cookieParameter = new CookieParameter(testCase.explode); + var serialization = cookieParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var cookieParameter = new CookieParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> cookieParameter.serialize(value, false, configuration) + ); + } + } +} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 2f5cf353c06..02969ae9e65 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -871,6 +871,10 @@ public void processOpts() { "src/main/java/packagename/parameter/SchemaQueryParameter.hbs", packagePath() + File.separatorChar + "parameter", "SchemaQueryParameter.java")); + supportingFiles.add(new SupportingFile( + "src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs", + testPackagePath() + File.separatorChar + "parameter", + "SchemaNonQueryParameterTest.java")); // response supportingFiles.add(new SupportingFile( diff --git a/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs index ca1d14781a6..0f86f1de06a 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/ContentQueryParameter.hbs @@ -2,6 +2,7 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.header.PrefixSeparatorIterator; import {{{packageName}}}.mediatype.MediaType; import java.util.Map; @@ -14,6 +15,6 @@ public class ContentQueryParameter extends ContentParameter implements QueryPara @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inData, validate, configuration); + return super.serialize(inData, validate, configuration); } } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs index d28adf4ea8f..b124a2d69ea 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaNonQueryParameter.hbs @@ -7,14 +7,14 @@ import {{{packageName}}}.schemas.validation.JsonSchema; import java.util.Map; -public class SchemaNonQueryParameter extends SchemaParameter implements QueryParameter { +public class SchemaNonQueryParameter extends SchemaParameter implements NonQueryParameter { public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + super(name, inType, required, style, explode, allowReserved, schema); } @Override - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return super.serialize(inType, validate, configuration, iterator); + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration, null); } } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs index 917f6ecc6f2..8df79fdba08 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaParameter.hbs @@ -5,14 +5,17 @@ import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.header.PrefixSeparatorIterator; import {{{packageName}}}.header.StyleSerializer; import {{{packageName}}}.schemas.validation.JsonSchema; - +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; import java.util.Map; public class SchemaParameter extends ParameterBase { public final JsonSchema schema; public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved); + super(name, inType, required, style, explode, allowReserved); this.schema = schema; } @@ -21,7 +24,7 @@ public class SchemaParameter extends ParameterBase { ParameterStyle usedStyle = getStyle(); boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; String value; - boolean usedExplode = explode == null || explode; + boolean usedExplode = explode == null ? usedStyle == ParameterStyle.FORM : explode; if (usedStyle == ParameterStyle.SIMPLE) { // header OR path value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs index c2daa8013e2..58f173f33cc 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs @@ -2,18 +2,19 @@ package {{{packageName}}}.parameter; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.header.PrefixSeparatorIterator; import {{{packageName}}}.schemas.validation.JsonSchema; import java.util.Map; -public class SchemaQueryParameter extends SchemaParameter implements NonQueryParameter { +public class SchemaQueryParameter extends SchemaParameter implements QueryParameter { public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { - super(name, inType, required, ParameterStyle.SIMPLE, explode, allowReserved, schema); + super(name, inType, required, style, explode, allowReserved, schema); } @Override - public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { - return serialize(inType, validate, configuration, null); + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return serialize(inType, validate, configuration, iterator); } } \ No newline at end of file diff --git a/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs b/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs new file mode 100644 index 00000000000..4c9a817d06f --- /dev/null +++ b/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs @@ -0,0 +1,259 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.exceptions.InvalidTypeException; +import {{{packageName}}}.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaNonQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class HeaderParameter extends SchemaNonQueryParameter { + public HeaderParameter(@Nullable Boolean explode) { + super("color", ParameterInType.HEADER, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testHeaderSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var header = new HeaderParameter(testCase.explode); + var serialization = header.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var boolHeader = new HeaderParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> boolHeader.serialize(value, false, configuration) + ); + } + } + + public static class PathParameter extends SchemaNonQueryParameter { + public PathParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var pathParameter = new PathParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> pathParameter.serialize(value, false, configuration) + ); + } + } + + public static class CookieParameter extends SchemaNonQueryParameter { + public CookieParameter(@Nullable Boolean explode) { + super("color", ParameterInType.COOKIE, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testCookieSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "color=hello world") + ), + new ParamTestCase( + "", + Map.of("color", "color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var cookieParameter = new CookieParameter(testCase.explode); + var serialization = cookieParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var cookieParameter = new CookieParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> cookieParameter.serialize(value, false, configuration) + ); + } + } +} From 6a14c63f981cba33d748ac218d6049240473482f Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 18:12:16 -0800 Subject: [PATCH 08/12] Adds parameter tests --- .../petstore/java/.openapi-generator/FILES | 1 + .../parameter/SchemaQueryParameter.java | 2 +- .../SchemaNonQueryParameterTest.java | 146 ++++++++++++- .../parameter/SchemaQueryParameterTest.java | 201 ++++++++++++++++++ .../generators/JavaClientGenerator.java | 4 + .../parameter/SchemaQueryParameter.hbs | 2 +- .../parameter/SchemaNonQueryParameterTest.hbs | 146 ++++++++++++- .../parameter/SchemaQueryParameterTest.hbs | 201 ++++++++++++++++++ 8 files changed, 699 insertions(+), 4 deletions(-) create mode 100644 samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java create mode 100644 src/main/resources/java/src/test/java/packagename/parameter/SchemaQueryParameterTest.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index ed3e9f4ec4a..5e87e846a38 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -1193,6 +1193,7 @@ src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeyword src/test/java/org/openapijsonschematools/client/header/ContentHeaderTest.java src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java +src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.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 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java index 5332addfc36..e85794b4a6d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java @@ -15,6 +15,6 @@ public SchemaQueryParameter(String name, ParameterInType inType, boolean require @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inType, validate, configuration, iterator); + return super.serialize(inData, validate, configuration, iterator); } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java index 92525592dce..cc681934e5e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java @@ -256,4 +256,148 @@ public void testCookieSerialization() { ); } } -} + + public static class PathMatrixParameter extends SchemaNonQueryParameter { + public PathMatrixParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.MATRIX, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathMatrixSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ";color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color",";color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ";color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ";color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ";color") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue;color=black;color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";color=R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";R=100;G=200;B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathMatrixParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class PathLabelParameter extends SchemaNonQueryParameter { + public PathLabelParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.LABEL, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathLabelSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ".1") + ), + new ParamTestCase( + 3.14, + Map.of("color",".3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ".blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ".hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ".") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R.100.G.200.B.150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R=100.G=200.B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathLabelParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java new file mode 100644 index 00000000000..b36fc740804 --- /dev/null +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java @@ -0,0 +1,201 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class QueryParameterNoStyle extends SchemaQueryParameter { + public QueryParameterNoStyle(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterNoStyleSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "?color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","?color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "?color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "?color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "?color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterNoStyle(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var parameter = new QueryParameterNoStyle(false); + var iterator = parameter.getPrefixSeparatorIterator(); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> parameter.serialize(value, false, configuration, iterator) + ); + } + } + + public static class QueryParameterSpaceDelimited extends SchemaQueryParameter { + public QueryParameterSpaceDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.SPACE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterSpaceDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R%20100%20G%20200%20B%20150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100%20G=200%20B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterSpaceDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class QueryParameterPipeDelimited extends SchemaQueryParameter { + public QueryParameterPipeDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.PIPE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterPipeDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R|100|G|200|B|150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100|G=200|B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterPipeDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 02969ae9e65..8d6b69644f2 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -875,6 +875,10 @@ public void processOpts() { "src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs", testPackagePath() + File.separatorChar + "parameter", "SchemaNonQueryParameterTest.java")); + supportingFiles.add(new SupportingFile( + "src/test/java/packagename/parameter/SchemaQueryParameterTest.hbs", + testPackagePath() + File.separatorChar + "parameter", + "SchemaQueryParameterTest.java")); // response supportingFiles.add(new SupportingFile( diff --git a/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs index 58f173f33cc..ed7fde8c022 100644 --- a/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs +++ b/src/main/resources/java/src/main/java/packagename/parameter/SchemaQueryParameter.hbs @@ -15,6 +15,6 @@ public class SchemaQueryParameter extends SchemaParameter implements QueryParame @Override public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { - return serialize(inType, validate, configuration, iterator); + return super.serialize(inData, validate, configuration, iterator); } } \ No newline at end of file diff --git a/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs b/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs index 4c9a817d06f..585e2e2e73d 100644 --- a/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs +++ b/src/main/resources/java/src/test/java/packagename/parameter/SchemaNonQueryParameterTest.hbs @@ -256,4 +256,148 @@ public class SchemaNonQueryParameterTest { ); } } -} + + public static class PathMatrixParameter extends SchemaNonQueryParameter { + public PathMatrixParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.MATRIX, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathMatrixSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ";color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color",";color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ";color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ";color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ";color") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue;color=black;color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";color=R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";R=100;G=200;B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathMatrixParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class PathLabelParameter extends SchemaNonQueryParameter { + public PathLabelParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.LABEL, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathLabelSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ".1") + ), + new ParamTestCase( + 3.14, + Map.of("color",".3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ".blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ".hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ".") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R.100.G.200.B.150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R=100.G=200.B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathLabelParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/test/java/packagename/parameter/SchemaQueryParameterTest.hbs b/src/main/resources/java/src/test/java/packagename/parameter/SchemaQueryParameterTest.hbs new file mode 100644 index 00000000000..35c1410b28f --- /dev/null +++ b/src/main/resources/java/src/test/java/packagename/parameter/SchemaQueryParameterTest.hbs @@ -0,0 +1,201 @@ +package {{{packageName}}}.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; +import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.exceptions.InvalidTypeException; +import {{{packageName}}}.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class QueryParameterNoStyle extends SchemaQueryParameter { + public QueryParameterNoStyle(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterNoStyleSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "?color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","?color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "?color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "?color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "?color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterNoStyle(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var parameter = new QueryParameterNoStyle(false); + var iterator = parameter.getPrefixSeparatorIterator(); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> parameter.serialize(value, false, configuration, iterator) + ); + } + } + + public static class QueryParameterSpaceDelimited extends SchemaQueryParameter { + public QueryParameterSpaceDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.SPACE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterSpaceDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R%20100%20G%20200%20B%20150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100%20G=200%20B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterSpaceDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class QueryParameterPipeDelimited extends SchemaQueryParameter { + public QueryParameterPipeDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.PIPE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterPipeDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R|100|G|200|B|150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100|G=200|B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterPipeDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} From 36c448b3d28ac2eaabafd9da2c555fc432eeee8a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 18:33:52 -0800 Subject: [PATCH 09/12] Adds parameter docs --- .../petstore/java/.openapi-generator/FILES | 4 + samples/client/petstore/java/README.md | 9 ++ .../headers/Int32JsonContentTypeHeader.md | 2 +- .../docs/components/headers/NumberHeader.md | 2 +- .../headers/RefContentSchemaHeader.md | 2 +- .../components/headers/RefSchemaHeader.md | 2 +- .../docs/components/headers/StringHeader.md | 2 +- .../ComponentRefSchemaStringWithValidation.md | 60 ++++++++++++ .../components/parameters/PathUserName.md | 41 ++++++++ .../components/parameters/RefPathUserName.md | 20 ++++ .../RefSchemaStringWithValidation.md | 41 ++++++++ .../generators/JavaClientGenerator.java | 6 ++ src/main/resources/java/README.hbs | 12 +++ .../components/headers/HeaderDoc.hbs | 2 +- .../components/parameter/ParameterDoc.hbs | 98 +++++++++++++++++++ 15 files changed, 297 insertions(+), 6 deletions(-) create mode 100644 samples/client/petstore/java/docs/components/parameters/ComponentRefSchemaStringWithValidation.md create mode 100644 samples/client/petstore/java/docs/components/parameters/PathUserName.md create mode 100644 samples/client/petstore/java/docs/components/parameters/RefPathUserName.md create mode 100644 samples/client/petstore/java/docs/components/parameters/RefSchemaStringWithValidation.md create mode 100644 src/main/resources/java/src/main/java/packagename/components/parameter/ParameterDoc.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 5e87e846a38..b83f4c06c88 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -10,6 +10,10 @@ docs/components/headers/numberheader/NumberHeaderSchema.md docs/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.md docs/components/headers/refschemaheader/RefSchemaHeaderSchema.md docs/components/headers/stringheader/StringHeaderSchema.md +docs/components/parameters/ComponentRefSchemaStringWithValidation.md +docs/components/parameters/PathUserName.md +docs/components/parameters/RefPathUserName.md +docs/components/parameters/RefSchemaStringWithValidation.md docs/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/ApplicationjsonSchema.md docs/components/parameters/pathusername/Schema.md docs/components/parameters/refschemastringwithvalidation/Schema.md diff --git a/samples/client/petstore/java/README.md b/samples/client/petstore/java/README.md index e2b14bbe1bb..e99b5a6a31c 100644 --- a/samples/client/petstore/java/README.md +++ b/samples/client/petstore/java/README.md @@ -331,6 +331,15 @@ Class | Description [RefStringHeader.RefStringHeader1](docs/components/headers/RefStringHeader.md#refstringheader1) | [StringHeader.StringHeader1](docs/components/headers/StringHeader.md#stringheader1) | string header description +## Component Parameters + +Class | Description +----- | ------------ +[ComponentRefSchemaStringWithValidation.ComponentRefSchemaStringWithValidation1](docs/components/headers/ComponentRefSchemaStringWithValidation.md#componentrefschemastringwithvalidation1) | a path string with validation +[PathUserName.PathUserName1](docs/components/headers/PathUserName.md#pathusername1) | the use name to use +[RefPathUserName.RefPathUserName1](docs/components/headers/RefPathUserName.md#refpathusername1) | +[RefSchemaStringWithValidation.RefSchemaStringWithValidation1](docs/components/headers/RefSchemaStringWithValidation.md#refschemastringwithvalidation1) | a path string with validation + ## Component SecuritySchemes | Class | Description | diff --git a/samples/client/petstore/java/docs/components/headers/Int32JsonContentTypeHeader.md b/samples/client/petstore/java/docs/components/headers/Int32JsonContentTypeHeader.md index d53571609c6..0719e44d623 100644 --- a/samples/client/petstore/java/docs/components/headers/Int32JsonContentTypeHeader.md +++ b/samples/client/petstore/java/docs/components/headers/Int32JsonContentTypeHeader.md @@ -45,9 +45,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = true
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | false | +| @Nullable Boolean allowReserved | null | | Map | content = Map.ofEntries(
    new AbstractMap.SimpleEntry<>("application/json", new [ApplicationjsonMediaType](#applicationjsonmediatype)())
)
the contentType to schema info | ### Method Summary diff --git a/samples/client/petstore/java/docs/components/headers/NumberHeader.md b/samples/client/petstore/java/docs/components/headers/NumberHeader.md index 17c8193c3da..256af35dc9d 100644 --- a/samples/client/petstore/java/docs/components/headers/NumberHeader.md +++ b/samples/client/petstore/java/docs/components/headers/NumberHeader.md @@ -26,9 +26,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = false
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | false | +| @Nullable Boolean allowReserved | null | | JsonSchema | schema = [NumberHeaderSchema.NumberHeaderSchema1](../../components/headers/numberheader/NumberHeaderSchema.md#numberheaderschema1)().getInstance() ### Method Summary diff --git a/samples/client/petstore/java/docs/components/headers/RefContentSchemaHeader.md b/samples/client/petstore/java/docs/components/headers/RefContentSchemaHeader.md index 965b18c4795..dbb069c6ae6 100644 --- a/samples/client/petstore/java/docs/components/headers/RefContentSchemaHeader.md +++ b/samples/client/petstore/java/docs/components/headers/RefContentSchemaHeader.md @@ -45,9 +45,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = true
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | false | +| @Nullable Boolean allowReserved | null | | Map | content = Map.ofEntries(
    new AbstractMap.SimpleEntry<>("application/json", new [ApplicationjsonMediaType](#applicationjsonmediatype)())
)
the contentType to schema info | ### Method Summary diff --git a/samples/client/petstore/java/docs/components/headers/RefSchemaHeader.md b/samples/client/petstore/java/docs/components/headers/RefSchemaHeader.md index f3bd0684b35..16ce5cb2b72 100644 --- a/samples/client/petstore/java/docs/components/headers/RefSchemaHeader.md +++ b/samples/client/petstore/java/docs/components/headers/RefSchemaHeader.md @@ -26,9 +26,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = true
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | false | +| @Nullable Boolean allowReserved | null | | JsonSchema | schema = [RefSchemaHeaderSchema.RefSchemaHeaderSchema1](../../components/headers/refschemaheader/RefSchemaHeaderSchema.md#refschemaheaderschema1)().getInstance() ### Method Summary diff --git a/samples/client/petstore/java/docs/components/headers/StringHeader.md b/samples/client/petstore/java/docs/components/headers/StringHeader.md index 509625215ca..f36d77eb648 100644 --- a/samples/client/petstore/java/docs/components/headers/StringHeader.md +++ b/samples/client/petstore/java/docs/components/headers/StringHeader.md @@ -26,9 +26,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = true
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | false | +| @Nullable Boolean allowReserved | null | | JsonSchema | schema = [StringHeaderSchema.StringHeaderSchema1](../../components/headers/stringheader/StringHeaderSchema.md#stringheaderschema1)().getInstance() ### Method Summary diff --git a/samples/client/petstore/java/docs/components/parameters/ComponentRefSchemaStringWithValidation.md b/samples/client/petstore/java/docs/components/parameters/ComponentRefSchemaStringWithValidation.md new file mode 100644 index 00000000000..328cb199cb6 --- /dev/null +++ b/samples/client/petstore/java/docs/components/parameters/ComponentRefSchemaStringWithValidation.md @@ -0,0 +1,60 @@ +# ComponentRefSchemaStringWithValidation +ComponentRefSchemaStringWithValidation.java + +public class ComponentRefSchemaStringWithValidation + +A class that contains necessary nested parameter classes +- a class that implements MediaType to store content schema info +- a class that extends SchemaHeader/ContentHeader and is used to deserialize the parameter value + +## Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +| record | [ComponentRefSchemaStringWithValidation.ApplicationjsonMediaType](#applicationjsonmediatype)
record storing schema + encoding for a specific contentType | +| static class | [ComponentRefSchemaStringWithValidation.ComponentRefSchemaStringWithValidation1](#componentrefschemastringwithvalidation1)
class that deserializes a parameter | + + +## ApplicationjsonMediaType +public record ApplicationjsonMediaType
+implements [MediaType<[ApplicationjsonSchema.ApplicationjsonSchema1](../../components/parameters/componentrefschemastringwithvalidation/content/applicationjson/ApplicationjsonSchema.md#applicationjsonschema1), Void> + +class storing schema info for a specific contentType + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| ApplicationjsonMediaType()
Creates an instance | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| [ApplicationjsonSchema.ApplicationjsonSchema1](../../components/parameters/componentrefschemastringwithvalidation/content/applicationjson/ApplicationjsonSchema.md#applicationjsonschema1) | schema()
the schema for this MediaType | +| Void | encoding()
the encoding info | + +## ComponentRefSchemaStringWithValidation1 +public static class ComponentRefSchemaStringWithValidation1 extends ContentNonQueryParameter
+ +a class that deserializes a parameter value + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| ComponentRefSchemaStringWithValidation1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| String | name = "CRSstringWithValidation"
the parameter name | +| ParameterInType | inType = ParameterInType.PATH
the parameter in value | +| boolean | required = true
whether the parameter is required | +| @Nullable Boolean explode | null | +| @Nullable ParameterStyle | null | +| @Nullable Boolean allowReserved | false | +| Map | content = Map.ofEntries(
    new AbstractMap.SimpleEntry<>("application/json", new [ApplicationjsonMediaType](#applicationjsonmediatype)())
)
the contentType to schema info | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| Map | serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration)
deserializes the parameter value | + +[[Back to top]](#top) [[Back to Component Parameters]](../../../README.md#Component-Parameters) [[Back to README]](../../../README.md) diff --git a/samples/client/petstore/java/docs/components/parameters/PathUserName.md b/samples/client/petstore/java/docs/components/parameters/PathUserName.md new file mode 100644 index 00000000000..c669211d43d --- /dev/null +++ b/samples/client/petstore/java/docs/components/parameters/PathUserName.md @@ -0,0 +1,41 @@ +# PathUserName +PathUserName.java + +public class PathUserName + +A class that contains necessary nested parameter classes +- a class that extends SchemaHeader/ContentHeader and is used to deserialize the parameter value + +## Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +| static class | [PathUserName.PathUserName1](#pathusername1)
class that deserializes a parameter | + + +## PathUserName1 +public static class PathUserName1 extends SchemaNonQueryParameter
+ +a class that deserializes a parameter value + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PathUserName1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| String | name = "username"
the parameter name | +| ParameterInType | inType = ParameterInType.PATH
the parameter in value | +| boolean | required = true
whether the parameter is required | +| @Nullable Boolean explode | false | +| @Nullable ParameterStyle | ParameterStyle.SIMPLE | +| @Nullable Boolean allowReserved | false | +| JsonSchema | schema = [Schema.Schema1](../../components/parameters/pathusername/Schema.md#schema1)().getInstance() + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| Map | serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration)
deserializes the parameter value | + +[[Back to top]](#top) [[Back to Component Parameters]](../../../README.md#Component-Parameters) [[Back to README]](../../../README.md) diff --git a/samples/client/petstore/java/docs/components/parameters/RefPathUserName.md b/samples/client/petstore/java/docs/components/parameters/RefPathUserName.md new file mode 100644 index 00000000000..03c05b8b224 --- /dev/null +++ b/samples/client/petstore/java/docs/components/parameters/RefPathUserName.md @@ -0,0 +1,20 @@ +# RefPathUserName +RefPathUserName.java + +public class RefPathUserName extends [PathUserName](../../components/parameters/PathUserName.md) + +A class (extended from the $ref class) that contains necessary nested parameter classes +- a class that extends SchemaHeader/ContentHeader and is used to deserialize parameter content + +## Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +| static class | [RefPathUserName.RefPathUserName1](#refpathusername1)
class that deserializes parameter value | + +## RefPathUserName1 +public static class RefPathUserName1 extends [PathUserName](../../components/parameters/PathUserName.md#pathusername1)
+ +a class that deserializes parameter, extended from the $ref class + + +[[Back to top]](#top) [[Back to Component Parameters]](../../../README.md#Component-Parameters) [[Back to README]](../../../README.md) diff --git a/samples/client/petstore/java/docs/components/parameters/RefSchemaStringWithValidation.md b/samples/client/petstore/java/docs/components/parameters/RefSchemaStringWithValidation.md new file mode 100644 index 00000000000..b5bbb344332 --- /dev/null +++ b/samples/client/petstore/java/docs/components/parameters/RefSchemaStringWithValidation.md @@ -0,0 +1,41 @@ +# RefSchemaStringWithValidation +RefSchemaStringWithValidation.java + +public class RefSchemaStringWithValidation + +A class that contains necessary nested parameter classes +- a class that extends SchemaHeader/ContentHeader and is used to deserialize the parameter value + +## Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +| static class | [RefSchemaStringWithValidation.RefSchemaStringWithValidation1](#refschemastringwithvalidation1)
class that deserializes a parameter | + + +## RefSchemaStringWithValidation1 +public static class RefSchemaStringWithValidation1 extends SchemaNonQueryParameter
+ +a class that deserializes a parameter value + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| RefSchemaStringWithValidation1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| String | name = "RSstringWithValidation"
the parameter name | +| ParameterInType | inType = ParameterInType.PATH
the parameter in value | +| boolean | required = true
whether the parameter is required | +| @Nullable Boolean explode | false | +| @Nullable ParameterStyle | ParameterStyle.SIMPLE | +| @Nullable Boolean allowReserved | false | +| JsonSchema | schema = [Schema.Schema1](../../components/parameters/refschemastringwithvalidation/Schema.md#schema1)().getInstance() + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| Map | serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration)
deserializes the parameter value | + +[[Back to top]](#top) [[Back to Component Parameters]](../../../README.md#Component-Parameters) [[Back to README]](../../../README.md) diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 8d6b69644f2..694c74ab1c3 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -940,6 +940,12 @@ public void processOpts() { put("src/main/java/packagename/components/parameter/Parameter.hbs", ".java"); }} ); + jsonPathDocTemplateFiles.put( + CodegenConstants.JSON_PATH_LOCATION_TYPE.PARAMETER, + new HashMap<>() {{ + put("src/main/java/packagename/components/parameter/ParameterDoc.hbs", ".md"); + }} + ); // responses jsonPathTemplateFiles.put( CodegenConstants.JSON_PATH_LOCATION_TYPE.RESPONSE, diff --git a/src/main/resources/java/README.hbs b/src/main/resources/java/README.hbs index a648deacabc..caf9d0fed95 100644 --- a/src/main/resources/java/README.hbs +++ b/src/main/resources/java/README.hbs @@ -209,6 +209,18 @@ Class | Description {{/with}} {{/each}} {{/if}} +{{#if parameters}} + +## Component Parameters + +Class | Description +----- | ------------ +{{#each parameters}} + {{#with this}} +[{{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1](docs/components/headers/{{jsonPathPiece.pascalCase}}.md#{{jsonPathPiece.kebabCase}}1) |{{#if description}} {{description.originalWithBr}}{{/if}} + {{/with}} +{{/each}} +{{/if}} {{#if securitySchemes}} ## Component SecuritySchemes diff --git a/src/main/resources/java/src/main/java/packagename/components/headers/HeaderDoc.hbs b/src/main/resources/java/src/main/java/packagename/components/headers/HeaderDoc.hbs index 314d8f7e1e7..8a1217bbacf 100644 --- a/src/main/resources/java/src/main/java/packagename/components/headers/HeaderDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/headers/HeaderDoc.hbs @@ -75,9 +75,9 @@ a class that deserializes a header value | Modifier and Type | Field and Description | | ----------------- | --------------------- | | boolean | required = {{#eq required null}}false{{else}}{{required}}{{/eq}}
whether the header is required | -| @Nullable Boolean allowReserved | null | | @Nullable ParameterStyle | ParameterStyle.SIMPLE | | @Nullable Boolean explode | {{explode}} | +| @Nullable Boolean allowReserved | null | {{#each content}} | Map | content = Map.ofEntries(
    new AbstractMap.SimpleEntry<>("{{{@key.original}}}", new [{{@key.pascalCase}}MediaType](#{{@key.kebabCase}}mediatype)())
)
the contentType to schema info | {{else}} diff --git a/src/main/resources/java/src/main/java/packagename/components/parameter/ParameterDoc.hbs b/src/main/resources/java/src/main/java/packagename/components/parameter/ParameterDoc.hbs new file mode 100644 index 00000000000..0325822a4f1 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/components/parameter/ParameterDoc.hbs @@ -0,0 +1,98 @@ +{{#with parameter}} +{{#eq identifierPieces.size 0}} +{{> src/main/java/packagename/components/_helper_header_from_identifier_pieces identifierPieces=(append identifierPieces jsonPathPiece) }} +{{else}} +{{> src/main/java/packagename/components/_helper_header_from_identifier_pieces }} +{{/eq}} +{{#if componentModule}} +{{jsonPathPiece.pascalCase}}.java +{{/if}} + +{{#if refInfo}} +public class {{jsonPathPiece.pascalCase}} extends [{{refInfo.refClass}}](../../components/parameters/{{refInfo.refClass}}.md) + +A class (extended from the $ref class) that contains necessary nested parameter classes +- a class that extends SchemaHeader/ContentHeader and is used to deserialize parameter content + +{{headerSize}}# Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +| static class | [{{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1](#{{> src/main/java/packagename/components/_helper_anchor_id identifierPieces=(append identifierPieces (join jsonPathPiece.kebabCase "1" "")) }})
class that deserializes parameter value | + +{{> src/main/java/packagename/components/_helper_header_from_identifier_pieces headerSize=(join headerSize "#" "") identifierPieces=(append identifierPieces (join jsonPathPiece.pascalCase "1" "")) }} +public static class {{jsonPathPiece.pascalCase}}1 extends [{{refInfo.refClass}}](../../components/parameters/{{refInfo.refClass}}.md#{{refInfo.ref.jsonPathPiece.kebabCase}}1)
+ +a class that deserializes parameter, extended from the $ref class + +{{else}} +public class {{jsonPathPiece.pascalCase}} + +A class that contains necessary nested parameter classes +{{#if content}} +- a class that implements MediaType to store content schema info +{{/if}} +- a class that extends SchemaHeader/ContentHeader and is used to deserialize the parameter value + +{{headerSize}}# Nested Class Summary +| Modifier and Type | Class and Description | +| ----------------- | --------------------- | +{{#each content}} +| record | [{{jsonPathPiece.pascalCase}}.{{@key.pascalCase}}MediaType](#{{@key.kebabCase}}mediatype)
record storing schema + encoding for a specific contentType | +{{/each}} +| static class | [{{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1](#{{> src/main/java/packagename/components/_helper_anchor_id identifierPieces=(append identifierPieces (join jsonPathPiece.kebabCase "1" "")) }})
class that deserializes a parameter | + +{{#each content}} + +{{> src/main/java/packagename/components/_helper_header_from_identifier_pieces headerSize=(join headerSize "#" "") identifierPieces=(append identifierPieces (join @key.pascalCase "MediaType" "")) }} +public record {{@key.pascalCase}}MediaType
+implements [MediaType<{{#with this}}{{#with schema}}[{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}]({{docRoot}}{{pathFromDocRoot}}.md#{{jsonPathPiece.kebabCase}}){{/with}}{{/with}}, Void> + +class storing schema info for a specific contentType + +{{headerSize}}## Constructor Summary +| Constructor and Description | +| --------------------------- | +| {{@key.pascalCase}}MediaType()
Creates an instance | + +{{headerSize}}## Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| {{#with this}}{{#with schema}}[{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}]({{docRoot}}{{pathFromDocRoot}}.md#{{jsonPathPiece.kebabCase}}){{/with}}{{/with}} | schema()
the schema for this MediaType | +| Void | encoding()
the encoding info | +{{/each}} + +{{> src/main/java/packagename/components/_helper_header_from_identifier_pieces headerSize=(join headerSize "#" "") identifierPieces=(append identifierPieces (join jsonPathPiece.pascalCase "1" "")) }} +public static class {{jsonPathPiece.pascalCase}}1 extends {{#if schema}}Schema{{else}}Content{{/if}}{{#eq in "query"}}QueryParameter{{else}}NonQueryParameter{{/eq}}
+ +a class that deserializes a parameter value + +{{headerSize}}## Constructor Summary +| Constructor and Description | +| --------------------------- | +| {{jsonPathPiece.pascalCase}}1()
Creates an instance | + +{{headerSize}}## Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| String | name = "{{{name}}}"
the parameter name | +| ParameterInType | inType = ParameterInType.{{#eq in "query"}}QUERY{{else}}{{#eq in "path"}}PATH{{else}}{{#eq in "header"}}HEADER{{else}}{{#eq in "cookie"}}COOKIE{{/eq}}{{/eq}}{{/eq}}{{/eq}}
the parameter in value | +| boolean | required = {{#eq required null}}false{{else}}{{required}}{{/eq}}
whether the parameter is required | +| @Nullable Boolean explode | {{#eq explode null}}null{{else}}{{explode}}{{/eq}} | +| @Nullable ParameterStyle | {{#eq style null}}null{{else}}ParameterStyle.{{#eq style "matrix"}}MATRIX{{else}}{{#eq style "label"}}LABEL{{else}}{{#eq style "form"}}FORM{{else}}{{#eq style "simple"}}SIMPLE{{else}}{{#eq style "spaceDelimited"}}SPACE_DELIMITED{{else}}{{#eq style "pipeDelimited"}}PIPE_DELIMITED{{else}}{{#eq style "deepObject"}}DEEP_OBJECT{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}}{{/eq}} | +| @Nullable Boolean allowReserved | {{#eq allowReserved null}}false{{else}}{{allowReserved}}{{/eq}} | + {{#each content}} +| Map | content = Map.ofEntries(
    new AbstractMap.SimpleEntry<>("{{{@key.original}}}", new [{{@key.pascalCase}}MediaType](#{{@key.kebabCase}}mediatype)())
)
the contentType to schema info | + {{else}} +| JsonSchema | schema = {{#with schema}}[{{containerJsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}]({{docRoot}}{{pathFromDocRoot}}.md#{{jsonPathPiece.kebabCase}})().getInstance(){{/with}} + {{/each}} + +{{headerSize}}## Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| Map | serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration{{#eq in "query"}}, PrefixSeparatorIterator iterator{{/eq}})
deserializes the parameter value | +{{/if}} +{{#if componentModule}} + +[[Back to top]](#top) {{> _helper_footer_links readmePath="../../../" parametersLink=true}} +{{/if}} +{{/with}} \ No newline at end of file From 1ea8663329cfc2199189dfb06632dc322d78fd7a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 18:41:44 -0800 Subject: [PATCH 10/12] Fixes readme links to parameter docs --- samples/client/petstore/java/README.md | 8 ++++---- src/main/resources/java/README.hbs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/client/petstore/java/README.md b/samples/client/petstore/java/README.md index e99b5a6a31c..773605816b0 100644 --- a/samples/client/petstore/java/README.md +++ b/samples/client/petstore/java/README.md @@ -335,10 +335,10 @@ Class | Description Class | Description ----- | ------------ -[ComponentRefSchemaStringWithValidation.ComponentRefSchemaStringWithValidation1](docs/components/headers/ComponentRefSchemaStringWithValidation.md#componentrefschemastringwithvalidation1) | a path string with validation -[PathUserName.PathUserName1](docs/components/headers/PathUserName.md#pathusername1) | the use name to use -[RefPathUserName.RefPathUserName1](docs/components/headers/RefPathUserName.md#refpathusername1) | -[RefSchemaStringWithValidation.RefSchemaStringWithValidation1](docs/components/headers/RefSchemaStringWithValidation.md#refschemastringwithvalidation1) | a path string with validation +[ComponentRefSchemaStringWithValidation.ComponentRefSchemaStringWithValidation1](docs/components/parameters/ComponentRefSchemaStringWithValidation.md#componentrefschemastringwithvalidation1) | a path string with validation +[PathUserName.PathUserName1](docs/components/parameters/PathUserName.md#pathusername1) | the use name to use +[RefPathUserName.RefPathUserName1](docs/components/parameters/RefPathUserName.md#refpathusername1) | +[RefSchemaStringWithValidation.RefSchemaStringWithValidation1](docs/components/parameters/RefSchemaStringWithValidation.md#refschemastringwithvalidation1) | a path string with validation ## Component SecuritySchemes diff --git a/src/main/resources/java/README.hbs b/src/main/resources/java/README.hbs index caf9d0fed95..1c659c472ef 100644 --- a/src/main/resources/java/README.hbs +++ b/src/main/resources/java/README.hbs @@ -217,7 +217,7 @@ Class | Description ----- | ------------ {{#each parameters}} {{#with this}} -[{{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1](docs/components/headers/{{jsonPathPiece.pascalCase}}.md#{{jsonPathPiece.kebabCase}}1) |{{#if description}} {{description.originalWithBr}}{{/if}} +[{{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1](docs/components/parameters/{{jsonPathPiece.pascalCase}}.md#{{jsonPathPiece.kebabCase}}1) |{{#if description}} {{description.originalWithBr}}{{/if}} {{/with}} {{/each}} {{/if}} From ef341a755388f2330ce607042c1ff36609f62d55 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 18:48:20 -0800 Subject: [PATCH 11/12] Docs regen --- docs/generators/java.md | 4 ++-- .../codegen/generators/JavaClientGenerator.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/generators/java.md b/docs/generators/java.md index 4c1dd046202..78a18338180 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -179,7 +179,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl | ---- | --------- | ---------- | |schemas|✓|OAS3 |responses|✓|OAS3 -|parameters|✗|OAS3 +|parameters|✓|OAS3 |examples|✗|OAS3 |requestBodies|✓|OAS3 |headers|✓|OAS3 @@ -221,7 +221,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |Security|✗|OAS2,OAS3 |ComponentSchemas|✓|OAS3 |ComponentResponses|✓|OAS3 -|ComponentParameters|✗|OAS3 +|ComponentParameters|✓|OAS3 |ComponentRequestBodies|✓|OAS3 |ComponentHeaders|✓|OAS3 |ComponentSecuritySchemes|✓|OAS3 diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 694c74ab1c3..6e31f15923d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -286,7 +286,8 @@ public JavaClientGenerator() { DocumentationFeature.ComponentSecuritySchemes, DocumentationFeature.ComponentRequestBodies, DocumentationFeature.ComponentResponses, - DocumentationFeature.ComponentHeaders + DocumentationFeature.ComponentHeaders, + DocumentationFeature.ComponentParameters ) .includeGlobalFeatures( GlobalFeature.Components, @@ -298,7 +299,8 @@ public JavaClientGenerator() { ComponentsFeature.securitySchemes, ComponentsFeature.requestBodies, ComponentsFeature.responses, - ComponentsFeature.headers + ComponentsFeature.headers, + ComponentsFeature.parameters ) .includeSecurityFeatures( SecurityFeature.ApiKey, From f3abfa8701944f54583f5016be3914f6c1449d56 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 4 Mar 2024 18:55:36 -0800 Subject: [PATCH 12/12] Samples regen --- .../java/.openapi-generator/FILES | 13 +- .../client/header/SchemaHeader.java | 2 +- .../client/header/StyleSerializer.java | 103 +++++ .../parameter/ContentNonQueryParameter.java | 19 + .../client/parameter/ContentParameter.java | 32 ++ .../parameter/ContentQueryParameter.java | 20 + .../client/parameter/NonQueryParameter.java | 10 + .../client/parameter/ParameterBase.java | 39 ++ .../client/parameter/QueryParameter.java | 12 + .../parameter/SchemaNonQueryParameter.java | 20 + .../client/parameter/SchemaParameter.java | 54 +++ .../parameter/SchemaQueryParameter.java | 20 + .../client/header/SchemaHeaderTest.java | 2 +- .../SchemaNonQueryParameterTest.java | 403 ++++++++++++++++++ .../parameter/SchemaQueryParameterTest.java | 201 +++++++++ .../java/.openapi-generator/FILES | 13 +- .../client/header/SchemaHeader.java | 2 +- .../client/header/StyleSerializer.java | 103 +++++ .../parameter/ContentNonQueryParameter.java | 19 + .../client/parameter/ContentParameter.java | 32 ++ .../parameter/ContentQueryParameter.java | 20 + .../client/parameter/NonQueryParameter.java | 10 + .../client/parameter/ParameterBase.java | 39 ++ .../client/parameter/QueryParameter.java | 12 + .../parameter/SchemaNonQueryParameter.java | 20 + .../client/parameter/SchemaParameter.java | 54 +++ .../parameter/SchemaQueryParameter.java | 20 + .../client/header/SchemaHeaderTest.java | 2 +- .../SchemaNonQueryParameterTest.java | 403 ++++++++++++++++++ .../parameter/SchemaQueryParameterTest.java | 201 +++++++++ 30 files changed, 1894 insertions(+), 6 deletions(-) create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java create mode 100644 samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java create mode 100644 samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java diff --git a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES index 70c0b464490..8a0f8021eb3 100644 --- a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES +++ b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES @@ -194,11 +194,20 @@ 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/header/StyleSerializer.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/ContentNonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.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/parameter/QueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.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 @@ -310,6 +319,8 @@ src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.j 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/parameter/SchemaNonQueryParameterTest.java +src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.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 diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java index c1ac0bfba37..e4fcfd99924 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java @@ -33,7 +33,7 @@ private static HttpHeaders toHeaders(String name, String value) { public HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration) { var castInData = validate ? schema.validate(inData, configuration) : inData; boolean usedExplode = explode != null && explode; - var value = StyleSimpleSerializer.serializeSimple(castInData, name, usedExplode, false); + var value = StyleSerializer.serializeSimple(castInData, name, usedExplode, false); return toHeaders(name, value); } diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java new file mode 100644 index 00000000000..088a1daf02b --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java @@ -0,0 +1,103 @@ +package org.openapijsonschematools.client.header; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public class StyleSerializer extends Rfc6570Serializer { + public static String serializeSimple( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode + ) { + var prefixSeparatorIterator = new PrefixSeparatorIterator("", ","); + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + prefixSeparatorIterator + ); + } + + public static String serializeForm( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode, + @Nullable PrefixSeparatorIterator iterator, + boolean isCookie + ) { + // todo check that the prefix and suffix matches this one + String prefix = isCookie ? "" : "?"; + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(prefix, "&") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + usedIterator + ); + } + + public static String serializeMatrix( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(";", ";"); + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeLabel( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(".", "."); + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeSpaceDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializePipeDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java new file mode 100644 index 00000000000..e3cecc7753f --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java @@ -0,0 +1,19 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentNonQueryParameter extends ContentParameter implements NonQueryParameter { + + public ContentNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java new file mode 100644 index 00000000000..c9da00c8ad7 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java @@ -0,0 +1,32 @@ +package org.openapijsonschematools.client.parameter; + +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.mediatype.MediaType; + +import java.util.Map; + +public class ContentParameter extends ParameterBase { + public final Map> content; + + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved); + this.content = content; + } + + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + for (Map.Entry> 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 Map.of(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"); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java new file mode 100644 index 00000000000..5d8239dc356 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentQueryParameter extends ContentParameter implements QueryParameter { + + public ContentQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java new file mode 100644 index 00000000000..de5d7451c57 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java @@ -0,0 +1,10 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; + +import java.util.Map; + +public interface NonQueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java new file mode 100644 index 00000000000..742792cdb40 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java @@ -0,0 +1,39 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +public class ParameterBase extends HeaderBase { + public final String name; + public final ParameterInType inType; + + public ParameterBase(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + } + + protected ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return new PrefixSeparatorIterator("", "%20"); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return new PrefixSeparatorIterator("", "|"); + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java new file mode 100644 index 00000000000..0dbced20599 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java @@ -0,0 +1,12 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +import java.util.Map; + +public interface QueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); + PrefixSeparatorIterator getPrefixSeparatorIterator(); +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java new file mode 100644 index 00000000000..80976ec5d85 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaNonQueryParameter extends SchemaParameter implements NonQueryParameter { + + public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration, null); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java new file mode 100644 index 00000000000..597916bbdfc --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -0,0 +1,54 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; +import java.util.Map; + +public class SchemaParameter extends ParameterBase { + public final JsonSchema schema; + + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved); + this.schema = schema; + } + + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + var castInData = validate ? schema.validate(inData, configuration) : inData; + ParameterStyle usedStyle = getStyle(); + boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; + String value; + boolean usedExplode = explode == null ? usedStyle == ParameterStyle.FORM : explode; + if (usedStyle == ParameterStyle.SIMPLE) { + // header OR path + value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); + } else if (usedStyle == ParameterStyle.FORM) { + // query OR cookie + boolean isCookie = inType == ParameterInType.COOKIE; + value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); + } else if (usedStyle == ParameterStyle.LABEL) { + // path + value = StyleSerializer.serializeLabel(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.MATRIX) { + // path + value = StyleSerializer.serializeMatrix(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + // query + value = StyleSerializer.serializeSpaceDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + // query + value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); + } else { + // usedStyle == ParameterStyle.DEEP_OBJECT + // query + throw new RuntimeException("Style deep object serialization has not yet been implemented."); + } + return Map.of(name, value); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java new file mode 100644 index 00000000000..e85794b4a6d --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaQueryParameter extends SchemaParameter implements QueryParameter { + + public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return super.serialize(inData, validate, configuration, iterator); + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java index 7b5795bcc14..b0eaf780b2e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java @@ -130,7 +130,7 @@ public void testDeserialization() { SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); SchemaHeader header = getHeader(NullJsonSchema.NullJsonSchema1.getInstance()); - var deserialized = header.deserialize(List.of(""), false, configuration); + @Nullable Object deserialized = header.deserialize(List.of(""), false, configuration); assertNull(deserialized); header = getHeader(NumberJsonSchema.NumberJsonSchema1.getInstance()); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java new file mode 100644 index 00000000000..cc681934e5e --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java @@ -0,0 +1,403 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaNonQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class HeaderParameter extends SchemaNonQueryParameter { + public HeaderParameter(@Nullable Boolean explode) { + super("color", ParameterInType.HEADER, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testHeaderSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var header = new HeaderParameter(testCase.explode); + var serialization = header.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var boolHeader = new HeaderParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> boolHeader.serialize(value, false, configuration) + ); + } + } + + public static class PathParameter extends SchemaNonQueryParameter { + public PathParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var pathParameter = new PathParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> pathParameter.serialize(value, false, configuration) + ); + } + } + + public static class CookieParameter extends SchemaNonQueryParameter { + public CookieParameter(@Nullable Boolean explode) { + super("color", ParameterInType.COOKIE, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testCookieSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "color=hello world") + ), + new ParamTestCase( + "", + Map.of("color", "color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var cookieParameter = new CookieParameter(testCase.explode); + var serialization = cookieParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var cookieParameter = new CookieParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> cookieParameter.serialize(value, false, configuration) + ); + } + } + + public static class PathMatrixParameter extends SchemaNonQueryParameter { + public PathMatrixParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.MATRIX, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathMatrixSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ";color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color",";color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ";color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ";color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ";color") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue;color=black;color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";color=R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";R=100;G=200;B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathMatrixParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class PathLabelParameter extends SchemaNonQueryParameter { + public PathLabelParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.LABEL, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathLabelSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ".1") + ), + new ParamTestCase( + 3.14, + Map.of("color",".3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ".blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ".hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ".") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R.100.G.200.B.150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R=100.G=200.B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathLabelParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java new file mode 100644 index 00000000000..b36fc740804 --- /dev/null +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java @@ -0,0 +1,201 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class QueryParameterNoStyle extends SchemaQueryParameter { + public QueryParameterNoStyle(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterNoStyleSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "?color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","?color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "?color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "?color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "?color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterNoStyle(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var parameter = new QueryParameterNoStyle(false); + var iterator = parameter.getPrefixSeparatorIterator(); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> parameter.serialize(value, false, configuration, iterator) + ); + } + } + + public static class QueryParameterSpaceDelimited extends SchemaQueryParameter { + public QueryParameterSpaceDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.SPACE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterSpaceDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R%20100%20G%20200%20B%20150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100%20G=200%20B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterSpaceDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class QueryParameterPipeDelimited extends SchemaQueryParameter { + public QueryParameterPipeDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.PIPE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterPipeDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R|100|G|200|B|150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100|G=200|B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterPipeDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} diff --git a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES index c6f22597bf3..63ad4391657 100644 --- a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES +++ b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES @@ -306,11 +306,20 @@ 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/header/StyleSerializer.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/ContentNonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.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/parameter/QueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java +src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.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 @@ -422,6 +431,8 @@ src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.j 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/parameter/SchemaNonQueryParameterTest.java +src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.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 diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java index c1ac0bfba37..e4fcfd99924 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/SchemaHeader.java @@ -33,7 +33,7 @@ private static HttpHeaders toHeaders(String name, String value) { public HttpHeaders serialize(@Nullable Object inData, String name, boolean validate, SchemaConfiguration configuration) { var castInData = validate ? schema.validate(inData, configuration) : inData; boolean usedExplode = explode != null && explode; - var value = StyleSimpleSerializer.serializeSimple(castInData, name, usedExplode, false); + var value = StyleSerializer.serializeSimple(castInData, name, usedExplode, false); return toHeaders(name, value); } diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java new file mode 100644 index 00000000000..088a1daf02b --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/header/StyleSerializer.java @@ -0,0 +1,103 @@ +package org.openapijsonschematools.client.header; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public class StyleSerializer extends Rfc6570Serializer { + public static String serializeSimple( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode + ) { + var prefixSeparatorIterator = new PrefixSeparatorIterator("", ","); + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + prefixSeparatorIterator + ); + } + + public static String serializeForm( + @Nullable Object inData, + String name, + boolean explode, + boolean percentEncode, + @Nullable PrefixSeparatorIterator iterator, + boolean isCookie + ) { + // todo check that the prefix and suffix matches this one + String prefix = isCookie ? "" : "?"; + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator(prefix, "&") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + percentEncode, + usedIterator + ); + } + + public static String serializeMatrix( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(";", ";"); + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeLabel( + @Nullable Object inData, + String name, + boolean explode + ) { + PrefixSeparatorIterator usedIterator = new PrefixSeparatorIterator(".", "."); + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializeSpaceDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "%20") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } + + public static String serializePipeDelimited( + @Nullable Object inData, + String name, + boolean explode, + @Nullable PrefixSeparatorIterator iterator + ) { + PrefixSeparatorIterator usedIterator = iterator == null ? new PrefixSeparatorIterator("", "|") : iterator; + return rfc6570Expansion( + name, + inData, + explode, + true, + usedIterator + ); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java new file mode 100644 index 00000000000..e3cecc7753f --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentNonQueryParameter.java @@ -0,0 +1,19 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentNonQueryParameter extends ContentParameter implements NonQueryParameter { + + public ContentNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java new file mode 100644 index 00000000000..c9da00c8ad7 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentParameter.java @@ -0,0 +1,32 @@ +package org.openapijsonschematools.client.parameter; + +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.mediatype.MediaType; + +import java.util.Map; + +public class ContentParameter extends ParameterBase { + public final Map> content; + + public ContentParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved); + this.content = content; + } + + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + for (Map.Entry> 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 Map.of(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"); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java new file mode 100644 index 00000000000..5d8239dc356 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ContentQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.mediatype.MediaType; + +import java.util.Map; + +public class ContentQueryParameter extends ContentParameter implements QueryParameter { + + public ContentQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, Map> content) { + super(name, inType, required, style, explode, allowReserved, content); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return super.serialize(inData, validate, configuration); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java new file mode 100644 index 00000000000..de5d7451c57 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/NonQueryParameter.java @@ -0,0 +1,10 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; + +import java.util.Map; + +public interface NonQueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration); +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java new file mode 100644 index 00000000000..742792cdb40 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java @@ -0,0 +1,39 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +public class ParameterBase extends HeaderBase { + public final String name; + public final ParameterInType inType; + + public ParameterBase(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved) { + super(required, style, explode, allowReserved); + this.name = name; + this.inType = inType; + } + + protected ParameterStyle getStyle() { + if (style != null) { + return style; + } + if (inType == ParameterInType.QUERY || inType == ParameterInType.COOKIE) { + return ParameterStyle.FORM; + } + // ParameterInType.HEADER || ParameterInType.PATH + return ParameterStyle.SIMPLE; + } + + public PrefixSeparatorIterator getPrefixSeparatorIterator() { + ParameterStyle usedStyle = getStyle(); + if (usedStyle == ParameterStyle.FORM) { + return new PrefixSeparatorIterator("?", "&"); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + return new PrefixSeparatorIterator("", "%20"); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + return new PrefixSeparatorIterator("", "|"); + } + throw new RuntimeException("No iterator possible for style="+usedStyle); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java new file mode 100644 index 00000000000..0dbced20599 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/QueryParameter.java @@ -0,0 +1,12 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; + +import java.util.Map; + +public interface QueryParameter { + Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator); + PrefixSeparatorIterator getPrefixSeparatorIterator(); +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java new file mode 100644 index 00000000000..80976ec5d85 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaNonQueryParameter extends SchemaParameter implements NonQueryParameter { + + public SchemaNonQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration) { + return super.serialize(inData, validate, configuration, null); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java new file mode 100644 index 00000000000..597916bbdfc --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java @@ -0,0 +1,54 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; +import org.openapijsonschematools.client.header.HeaderBase; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.header.StyleSerializer; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; +import java.util.Map; + +public class SchemaParameter extends ParameterBase { + public final JsonSchema schema; + + public SchemaParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved); + this.schema = schema; + } + + protected Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, @Nullable PrefixSeparatorIterator iterator) { + var castInData = validate ? schema.validate(inData, configuration) : inData; + ParameterStyle usedStyle = getStyle(); + boolean percentEncode = inType == ParameterInType.QUERY || inType == ParameterInType.PATH; + String value; + boolean usedExplode = explode == null ? usedStyle == ParameterStyle.FORM : explode; + if (usedStyle == ParameterStyle.SIMPLE) { + // header OR path + value = StyleSerializer.serializeSimple(castInData, name, usedExplode, percentEncode); + } else if (usedStyle == ParameterStyle.FORM) { + // query OR cookie + boolean isCookie = inType == ParameterInType.COOKIE; + value = StyleSerializer.serializeForm(castInData, name, usedExplode, percentEncode, iterator, isCookie); + } else if (usedStyle == ParameterStyle.LABEL) { + // path + value = StyleSerializer.serializeLabel(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.MATRIX) { + // path + value = StyleSerializer.serializeMatrix(castInData, name, usedExplode); + } else if (usedStyle == ParameterStyle.SPACE_DELIMITED) { + // query + value = StyleSerializer.serializeSpaceDelimited(castInData, name, usedExplode, iterator); + } else if (usedStyle == ParameterStyle.PIPE_DELIMITED) { + // query + value = StyleSerializer.serializePipeDelimited(castInData, name, usedExplode, iterator); + } else { + // usedStyle == ParameterStyle.DEEP_OBJECT + // query + throw new RuntimeException("Style deep object serialization has not yet been implemented."); + } + return Map.of(name, value); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java new file mode 100644 index 00000000000..e85794b4a6d --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/parameter/SchemaQueryParameter.java @@ -0,0 +1,20 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.header.PrefixSeparatorIterator; +import org.openapijsonschematools.client.schemas.validation.JsonSchema; + +import java.util.Map; + +public class SchemaQueryParameter extends SchemaParameter implements QueryParameter { + + public SchemaQueryParameter(String name, ParameterInType inType, boolean required, @Nullable ParameterStyle style, @Nullable Boolean explode, @Nullable Boolean allowReserved, JsonSchema schema) { + super(name, inType, required, style, explode, allowReserved, schema); + } + + @Override + public Map serialize(@Nullable Object inData, boolean validate, SchemaConfiguration configuration, PrefixSeparatorIterator iterator) { + return super.serialize(inData, validate, configuration, iterator); + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java index 7b5795bcc14..b0eaf780b2e 100644 --- a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java +++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/header/SchemaHeaderTest.java @@ -130,7 +130,7 @@ public void testDeserialization() { SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); SchemaHeader header = getHeader(NullJsonSchema.NullJsonSchema1.getInstance()); - var deserialized = header.deserialize(List.of(""), false, configuration); + @Nullable Object deserialized = header.deserialize(List.of(""), false, configuration); assertNull(deserialized); header = getHeader(NumberJsonSchema.NumberJsonSchema1.getInstance()); diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java new file mode 100644 index 00000000000..cc681934e5e --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaNonQueryParameterTest.java @@ -0,0 +1,403 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaNonQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class HeaderParameter extends SchemaNonQueryParameter { + public HeaderParameter(@Nullable Boolean explode) { + super("color", ParameterInType.HEADER, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testHeaderSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var header = new HeaderParameter(testCase.explode); + var serialization = header.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var boolHeader = new HeaderParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> boolHeader.serialize(value, false, configuration) + ); + } + } + + public static class PathParameter extends SchemaNonQueryParameter { + public PathParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "1") + ), + new ParamTestCase( + 3.14, + Map.of("color","3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue,black,brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100,G=200,B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var pathParameter = new PathParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> pathParameter.serialize(value, false, configuration) + ); + } + } + + public static class CookieParameter extends SchemaNonQueryParameter { + public CookieParameter(@Nullable Boolean explode) { + super("color", ParameterInType.COOKIE, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testCookieSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "color=hello world") + ), + new ParamTestCase( + "", + Map.of("color", "color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var cookieParameter = new CookieParameter(testCase.explode); + var serialization = cookieParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var cookieParameter = new CookieParameter(false); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> cookieParameter.serialize(value, false, configuration) + ); + } + } + + public static class PathMatrixParameter extends SchemaNonQueryParameter { + public PathMatrixParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.MATRIX, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathMatrixSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ";color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color",";color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ";color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ";color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ";color") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue,black,brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ";color=blue;color=black;color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";color=R,100,G,200,B,150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ";R=100;G=200;B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathMatrixParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class PathLabelParameter extends SchemaNonQueryParameter { + public PathLabelParameter(@Nullable Boolean explode) { + super("color", ParameterInType.PATH, true, ParameterStyle.LABEL, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testPathLabelSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", ".1") + ), + new ParamTestCase( + 3.14, + Map.of("color",".3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", ".blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", ".hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", ".") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", ".blue.black.brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R.100.G.200.B.150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", ".R=100.G=200.B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var pathParameter = new PathLabelParameter(testCase.explode); + var serialization = pathParameter.serialize(testCase.payload, false, configuration); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +} \ No newline at end of file diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java new file mode 100644 index 00000000000..b36fc740804 --- /dev/null +++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/parameter/SchemaQueryParameterTest.java @@ -0,0 +1,201 @@ +package org.openapijsonschematools.client.parameter; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.junit.Assert; +import org.junit.Test; +import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; +import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class SchemaQueryParameterTest { + public record ParamTestCase(@Nullable Object payload, Map expectedSerialization, @Nullable Boolean explode) { + public ParamTestCase(@Nullable Object payload, Map expectedSerialization) { + this(payload, expectedSerialization, null); + } + } + + public static class QueryParameterNoStyle extends SchemaQueryParameter { + public QueryParameterNoStyle(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, null, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterNoStyleSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + null, + Map.of("color", "") + ), + new ParamTestCase( + 1, + Map.of("color", "?color=1") + ), + new ParamTestCase( + 3.14, + Map.of("color","?color=3.14") + ), + new ParamTestCase( + "blue", + Map.of("color", "?color=blue") + ), + new ParamTestCase( + "hello world", + Map.of("color", "?color=hello%20world") + ), + new ParamTestCase( + "", + Map.of("color", "?color=") + ), + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "?color=blue&color=black&color=brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "?R=100&G=200&B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterNoStyle(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + var parameter = new QueryParameterNoStyle(false); + var iterator = parameter.getPrefixSeparatorIterator(); + for (boolean value: Set.of(true, false)) { + Assert.assertThrows( + InvalidTypeException.class, + () -> parameter.serialize(value, false, configuration, iterator) + ); + } + } + + public static class QueryParameterSpaceDelimited extends SchemaQueryParameter { + public QueryParameterSpaceDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.SPACE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterSpaceDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue%20black%20brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R%20100%20G%20200%20B%20150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100%20G=200%20B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterSpaceDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } + + public static class QueryParameterPipeDelimited extends SchemaQueryParameter { + public QueryParameterPipeDelimited(@Nullable Boolean explode) { + super("color", ParameterInType.QUERY, true, ParameterStyle.PIPE_DELIMITED, explode, null, AnyTypeJsonSchema.AnyTypeJsonSchema1.getInstance()); + } + } + + @Test + public void testQueryParameterPipeDelimitedSerialization() { + var mapPayload = new LinkedHashMap(); + mapPayload.put("R", 100); + mapPayload.put("G", 200); + mapPayload.put("B", 150); + var testCases = List.of( + new ParamTestCase( + List.of(), + Map.of("color", "") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown") + ), + new ParamTestCase( + List.of("blue", "black", "brown"), + Map.of("color", "blue|black|brown"), + true + ), + new ParamTestCase( + Map.of(), + Map.of("color", "") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R|100|G|200|B|150") + ), + new ParamTestCase( + mapPayload, + Map.of("color", "R=100|G=200|B=150"), + true + ) + ); + SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + for (ParamTestCase testCase: testCases) { + var parameter = new QueryParameterPipeDelimited(testCase.explode); + var iterator = parameter.getPrefixSeparatorIterator(); + var serialization = parameter.serialize(testCase.payload, false, configuration, iterator); + Assert.assertEquals(testCase.expectedSerialization, serialization); + } + } +}