[haskell-http-client] Update haskell-http-client generator to Aeson 2.x (#12309)

* Update haskell-http-client generator to Aeson 2.x

Co-authored-by: Andrea Cognolato <[email protected]>

Author: jonschoning

modules/openapi-generator/src/main/resources/haskell-http-client/Core.mustache

@@ -70,7 +70,7 @@ data {{configType}} = {{configType}}
   , configLogContext :: LogContext -- ^ Configures the logger
   , configAuthMethods :: [AnyAuthMethod] -- ^ List of configured auth methods
   , configValidateAuthMethods :: Bool -- ^ throw exceptions if auth methods are not configured
-  , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':' 
+  , configQueryExtraUnreserved :: B.ByteString -- ^ Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'
   }
 
 -- | display the config
@@ -419,7 +419,7 @@ _applyAuthMethods req config@({{configType}} {configAuthMethods = as}) =
 -- * Utils
 
 -- | Removes Null fields.  (OpenAPI-Specification 2.0 does not allow Null in JSON)
-_omitNulls :: [(Text, A.Value)] -> A.Value
+_omitNulls :: [(A.Key, A.Value)] -> A.Value
 _omitNulls = A.object . P.filter notNull
   where
     notNull (_, A.Null) = False

modules/openapi-generator/src/main/resources/haskell-http-client/haskell-http-client.cabal.mustache

@@ -39,7 +39,7 @@ library
       lib
   ghc-options: -Wall -funbox-strict-fields
   build-depends:
-      aeson >=1.0 && <2.0
+      aeson >=2.0 && <3.0
     , base >=4.7 && <5.0
     , base64-bytestring >1.0 && <2.0
     , bytestring >=0.10.0

modules/openapi-generator/src/main/resources/haskell-http-client/stack.mustache

@@ -1,4 +1,4 @@
-resolver: lts-18.6
+resolver: lts-19.6
 build:
   haddock-arguments:
     haddock-args:

modules/openapi-generator/src/main/resources/haskell-http-client/tests/Instances.mustache

@@ -13,6 +13,7 @@ import qualified Data.Set as Set
 import qualified Data.Text as T
 import qualified Data.Time as TI
 import qualified Data.Vector as V
+import Data.String (fromString)
 
 import Control.Monad
 import Data.Char (isSpace)
@@ -53,8 +54,12 @@ instance Arbitrary Date where
     shrink (Date xs) = Date <$> shrink xs
 
 -- | A naive Arbitrary instance for A.Value:
-instance Arbitrary A.Value where
-  arbitrary = frequency [(3, simpleTypes), (1, arrayTypes), (1, objectTypes)]
+-- instance Arbitrary A.Value where
+--   arbitrary = arbitraryValue
+
+arbitraryValue :: Gen A.Value
+arbitraryValue =
+  frequency [(3, simpleTypes), (1, arrayTypes), (1, objectTypes)]
     where
       simpleTypes :: Gen A.Value
       simpleTypes =
@@ -64,7 +69,7 @@ instance Arbitrary A.Value where
           , (2, liftM (A.Number . fromIntegral) (arbitrary :: Gen Int))
           , (2, liftM (A.String . T.pack) (arbitrary :: Gen String))
           ]
-      mapF (k, v) = (T.pack k, v)
+      mapF (k, v) = (fromString k, v)
       simpleAndArrays = frequency [(1, sized sizedArray), (4, simpleTypes)]
       arrayTypes = sized sizedArray
       objectTypes = sized sizedObject