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

Something in the dependencies changed. This switch is no longer needed. (#1850)

Browse Source
This commit is contained in:
Stefan Dresselhaus 2019-02-20 08:25:11 +01:00 committed by William Cheng
parent bc6c94d412
commit ae376c151b
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache vendored
View File

@ -70,7 +70,7 @@ uncapitalize [] = []
-- Remove a field label prefix during JSON parsing. -- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters. -- Also perform any replacements for special characters.
removeFieldLabelPrefix :: Bool -> String -> Options removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix forParsing prefix = removeFieldLabelPrefix _ prefix =
defaultOptions defaultOptions
{ omitNothingFields = True { omitNothingFields = True
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
@ -81,8 +81,4 @@ removeFieldLabelPrefix forParsing prefix =
[ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}} [ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
, {{/hasMore}}{{/specialCharReplacements}} , {{/hasMore}}{{/specialCharReplacements}}
] ]
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
if forParsing
then flip T.replace
else T.replace

8
samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs
View File

@ -147,7 +147,7 @@ uncapitalize [] = []
-- Remove a field label prefix during JSON parsing. -- Remove a field label prefix during JSON parsing.
-- Also perform any replacements for special characters. -- Also perform any replacements for special characters.
removeFieldLabelPrefix :: Bool -> String -> Options removeFieldLabelPrefix :: Bool -> String -> Options
removeFieldLabelPrefix forParsing prefix = removeFieldLabelPrefix _ prefix =
defaultOptions defaultOptions
{ omitNothingFields = True { omitNothingFields = True
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars , fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
@ -190,8 +190,4 @@ removeFieldLabelPrefix forParsing prefix =
, ("?", "'Question_Mark") , ("?", "'Question_Mark")
, (">=", "'Greater_Than_Or_Equal_To") , (">=", "'Greater_Than_Or_Equal_To")
] ]
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
if forParsing
then flip T.replace
else T.replace