Skip to content

Commit ae376c1

Browse files
Drezilwing328
authored andcommitted
Something in the dependencies changed. This switch is no longer needed. (#1850)
1 parent bc6c94d commit ae376c1

File tree

2 files changed

+4
-12
lines changed
  • modules/openapi-generator/src/main/resources/haskell-servant
  • samples/server/petstore/haskell-servant/lib/OpenAPIPetstore

2 files changed

+4
-12
lines changed

modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ uncapitalize [] = []
7070
-- Remove a field label prefix during JSON parsing.
7171
-- Also perform any replacements for special characters.
7272
removeFieldLabelPrefix :: Bool -> String -> Options
73-
removeFieldLabelPrefix forParsing prefix =
73+
removeFieldLabelPrefix _ prefix =
7474
defaultOptions
7575
{ omitNothingFields = True
7676
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
@@ -81,8 +81,4 @@ removeFieldLabelPrefix forParsing prefix =
8181
[ {{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}
8282
, {{/hasMore}}{{/specialCharReplacements}}
8383
]
84-
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
85-
replacer =
86-
if forParsing
87-
then flip T.replace
88-
else T.replace
84+
mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ uncapitalize [] = []
147147
-- Remove a field label prefix during JSON parsing.
148148
-- Also perform any replacements for special characters.
149149
removeFieldLabelPrefix :: Bool -> String -> Options
150-
removeFieldLabelPrefix forParsing prefix =
150+
removeFieldLabelPrefix _ prefix =
151151
defaultOptions
152152
{ omitNothingFields = True
153153
, fieldLabelModifier = uncapitalize . fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
@@ -190,8 +190,4 @@ removeFieldLabelPrefix forParsing prefix =
190190
, ("?", "'Question_Mark")
191191
, (">=", "'Greater_Than_Or_Equal_To")
192192
]
193-
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
194-
replacer =
195-
if forParsing
196-
then flip T.replace
197-
else T.replace
193+
mkCharReplacement (replaceStr, searchStr) = T.unpack . T.replace (T.tail $ T.pack searchStr) (T.pack replaceStr) . T.pack

0 commit comments

Comments
 (0)