From ae376c151bfcd2c1ac7afa0c70520b1dc95bf0ff Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Wed, 20 Feb 2019 08:25:11 +0100 Subject: [PATCH] Something in the dependencies changed. This switch is no longer needed. (#1850) --- .../src/main/resources/haskell-servant/Types.mustache | 8 ++------ .../petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache b/modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache index adb8f5f871c..22682a1e654 100644 --- a/modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache @@ -70,7 +70,7 @@ uncapitalize [] = [] -- Remove a field label prefix during JSON parsing. -- Also perform any replacements for special characters. removeFieldLabelPrefix :: Bool -> String -> Options -removeFieldLabelPrefix forParsing prefix = +removeFieldLabelPrefix _ prefix = defaultOptions { omitNothingFields = True , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars @@ -81,8 +81,4 @@ removeFieldLabelPrefix forParsing prefix = [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}} , {{/hasMore}}{{/specialCharReplacements}} ] - mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack - replacer = - if forParsing - then flip T.replace - else T.replace + mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack diff --git a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs index 570827d14a7..fd1b92aab96 100644 --- a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs +++ b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs @@ -147,7 +147,7 @@ uncapitalize [] = [] -- Remove a field label prefix during JSON parsing. -- Also perform any replacements for special characters. removeFieldLabelPrefix :: Bool -> String -> Options -removeFieldLabelPrefix forParsing prefix = +removeFieldLabelPrefix _ prefix = defaultOptions { omitNothingFields = True , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars @@ -190,8 +190,4 @@ removeFieldLabelPrefix forParsing prefix = , ("?", "'Question_Mark") , (">=", "'Greater_Than_Or_Equal_To") ] - mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack - replacer = - if forParsing - then flip T.replace - else T.replace + mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack