From cdb92086db5a2799e4f07b1d83d14c67e32b7416 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 14 Jun 2021 11:00:11 +0200 Subject: [PATCH] [haskell][server]: Set "AnyType" to `Aeson.Value` (#9733) * [haskell][server]: Set "AnyType" to `Aeson.Value` `AnyType` would not be translated to the json value type. This fixes that. * [haskell][server] Fix haddock error in `API.hs` Haddock (the Haskell documentation generator) would choke on the misplaced docstring. The heading has to appear inside the list. --- .../openapitools/codegen/languages/HaskellServantCodegen.java | 1 + .../src/main/resources/haskell-servant/API.mustache | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index e19e4d024a2..ad013a6bbef 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -201,6 +201,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf typeMapping.put("number", "Double"); typeMapping.put("BigDecimal", "Double"); typeMapping.put("any", "Value"); + typeMapping.put("AnyType", "Value"); typeMapping.put("UUID", "UUID"); typeMapping.put("URI", "Text"); typeMapping.put("ByteArray", "Text"); diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache index ab052a4f468..87e7c874aee 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/API.mustache @@ -14,8 +14,8 @@ -fno-warn-unused-binds -fno-warn-unused-imports -freduction-depth=328 #-} module {{title}}.API - -- * Client and Server - ( Config(..) + ( -- * Client and Server + Config(..) , {{title}}Backend(..) , create{{title}}Client , run{{title}}Server