loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[haskell-http-client] fix bug in test for Maybe A.Value from aa7ea8bdca (#2382)

Browse Source
This commit is contained in:
Jon Schoning 2019-03-13 07:38:14 -05:00 committed by GitHub
parent a2d6073110
commit 302b2fafff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
View File

@ -97,6 +97,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
static final String X_INLINE_ACCEPT = "x-inlineAccept"; static final String X_INLINE_ACCEPT = "x-inlineAccept";
static final String X_IS_BODY_OR_FORM_PARAM = "x-isBodyOrFormParam"; static final String X_IS_BODY_OR_FORM_PARAM = "x-isBodyOrFormParam";
static final String X_IS_BODY_PARAM = "x-isBodyParam"; static final String X_IS_BODY_PARAM = "x-isBodyParam";
static final String X_IS_MAYBE_VALUE = "x-isMaybeValue";
static final String X_MEDIA_DATA_TYPE = "x-mediaDataType"; static final String X_MEDIA_DATA_TYPE = "x-mediaDataType";
static final String X_DATA_TYPE = "x-dataType"; static final String X_DATA_TYPE = "x-dataType";
static final String X_ENUM_VALUES = "x-enumValues"; static final String X_ENUM_VALUES = "x-enumValues";
@ -1203,12 +1204,18 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
dataType = "[" + cm.arrayModelType + "]"; dataType = "[" + cm.arrayModelType + "]";
} }
cm.vendorExtensions.put(X_DATA_TYPE, dataType); cm.vendorExtensions.put(X_DATA_TYPE, dataType);
if (dataType.equals("Maybe A.Value")) {
cm.vendorExtensions.put(X_IS_MAYBE_VALUE, true);
}
} }
for (CodegenProperty var : cm.vars) { for (CodegenProperty var : cm.vars) {
String datatype = genEnums && !StringUtils.isBlank(var.datatypeWithEnum) String datatype = genEnums && !StringUtils.isBlank(var.datatypeWithEnum)
? var.datatypeWithEnum ? var.datatypeWithEnum
: var.dataType; : var.dataType;
var.vendorExtensions.put(X_DATA_TYPE, datatype); var.vendorExtensions.put(X_DATA_TYPE, datatype);
if (!var.required && datatype.equals("A.Value") || var.required && datatype.equals("Maybe A.Value")) {
var.vendorExtensions.put(X_IS_MAYBE_VALUE, true);
}
} }
} }
return postProcessModelsEnum(objs); return postProcessModelsEnum(objs);

2
modules/openapi-generator/src/main/resources/haskell-http-client/tests/Instances.mustache vendored
View File

@ -114,7 +114,7 @@ gen{{classname}} :: Int -> Gen {{classname}}
gen{{classname}} n = gen{{classname}} n =
{{#isAlias}}{{classname}} <$> arbitrary{{/isAlias}}{{^isAlias}}{{^hasVars}} {{#isAlias}}{{classname}} <$> arbitrary{{/isAlias}}{{^isAlias}}{{^hasVars}}
pure {{/hasVars}}{{classname}} pure {{/hasVars}}{{classname}}
{{#hasVars}} <$>{{/hasVars}} {{#vars}}{{#required}}{{#isPrimitiveType}}arbitrary{{/isPrimitiveType}}{{^isPrimitiveType}}arbitraryReduced n{{/isPrimitiveType}}{{/required}}{{^required}}{{^isFreeFormObject}}arbitraryReducedMaybe n{{/isFreeFormObject}}{{#isFreeFormObject}}arbitraryReducedMaybeValue n{{/isFreeFormObject}}{{/required}} -- {{name}} :: {{^required}}Maybe {{/required}}{{{vendorExtensions.x-dataType}}} {{#hasVars}} <$>{{/hasVars}} {{#vars}}{{#required}}{{#isPrimitiveType}}arbitrary{{/isPrimitiveType}}{{^isPrimitiveType}}arbitraryReduced n{{/isPrimitiveType}}{{/required}}{{^required}}{{^vendorExtensions.x-isMaybeValue}}arbitraryReducedMaybe n{{/vendorExtensions.x-isMaybeValue}}{{#vendorExtensions.x-isMaybeValue}}arbitraryReducedMaybeValue n{{/vendorExtensions.x-isMaybeValue}}{{/required}} -- {{name}} :: {{^required}}Maybe {{/required}}{{{vendorExtensions.x-dataType}}}
{{#hasMore}} <*> {{/hasMore}}{{/vars}}{{/isAlias}} {{#hasMore}} <*> {{/hasMore}}{{/vars}}{{/isAlias}}
{{/isEnum}} {{/isEnum}}
{{/model}} {{/model}}