Merge pull request #49 from stevladimir/fix-allof-oneof

Don't add 'object' type when generating sum schema with allOf/oneOf
biocad · Nov 21, 2022 · acc5ea7 · acc5ea7
2 parents ac7058e + 2413197
commit acc5ea7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 22 deletions.
diff --git a/openapi3.cabal b/openapi3.cabal
@@ -84,7 +84,6 @@ library
     , http-media                >=0.8.0.0  && <0.9
     , insert-ordered-containers >=0.2.3    && <0.3
     , lens                      >=4.16.1   && <5.3
-    , network                   >=2.6.3.5  && <3.2
     , optics-core               >=0.2      && <0.5
     , optics-th                 >=0.2      && <0.5
     , scientific                >=0.3.6.2  && <0.4

diff --git a/src/Data/OpenApi.hs b/src/Data/OpenApi.hs
@@ -412,8 +412,7 @@ import Data.OpenApi.Internal
 --             ],
 --             "type": "object"
 --         }
---     ],
---     "type": "object"
+--     ]
 -- }
 
 -- $manipulation

diff --git a/src/Data/OpenApi/Internal.hs b/src/Data/OpenApi/Internal.hs
@@ -43,7 +43,6 @@ import           Data.Text.Encoding    (encodeUtf8)
 import           GHC.Generics          (Generic)
 import           Network.HTTP.Media    (MediaType, mainType, parameters, parseAccept, subType, (//),
                                         (/:))
-import           Network.Socket        (HostName, PortNumber)
 import           Text.Read             (readMaybe)
 
 import           Data.HashMap.Strict.InsOrd (InsOrdHashMap)

diff --git a/src/Data/OpenApi/Internal/Schema.hs b/src/Data/OpenApi/Internal/Schema.hs
@@ -1034,7 +1034,6 @@ gdeclareNamedSumSchema opts proxy _
   | otherwise = do
     (schemas, _) <- runWriterT declareSumSchema
     return $ unnamed $ mempty
-      & type_ ?~ OpenApiObject
       & oneOf ?~ (snd <$> schemas)
   where
     declareSumSchema = gsumToSchema opts proxy
@@ -1079,7 +1078,6 @@ gsumConToSchemaWith ref opts _ = (tag, schema)
 
           -- In the remaining cases we combine "tag" object and "contents" object using allOf.
           _ -> Inline $ mempty
-            & type_ ?~ OpenApiObject
             & allOf ?~ [Inline $ mempty
               & type_ ?~ OpenApiObject
               & required .~ (T.pack tagField : if isRecord then [] else [T.pack contentsField])

diff --git a/test/Data/OpenApi/CommonTestTypes.hs b/test/Data/OpenApi/CommonTestTypes.hs
@@ -312,8 +312,7 @@ characterSchemaJSON = [aesonQQ|
         }
       }
     }
-  ],
-  "type": "object"
+  ]
 }
 
 |]
@@ -398,8 +397,7 @@ characterInlinedSchemaJSON = [aesonQQ|
         }
       }
     }
-  ],
-  "type": "object"
+  ]
 }
 |]
 
@@ -455,8 +453,7 @@ characterInlinedPlayerSchemaJSON = [aesonQQ|
         }
       }
     }
-  ],
-  "type": "object"
+  ]
 }
 |]
 
@@ -705,8 +702,7 @@ lightSchemaJSON = [aesonQQ|
         }
       }
     }
-  ],
-  "type": "object"
+  ]
 }
 |]
 
@@ -789,8 +785,7 @@ lightInlinedSchemaJSON = [aesonQQ|
         }
       }
     }
-  ],
-  "type": "object"
+  ]
 }
 |]
 
@@ -929,8 +924,7 @@ predicateSchemaDeclareJSON = [aesonQQ|
           "required": ["tag", "contents"],
           "type": "object"
         }
-      ],
-      "type": "object"
+      ]
     },
     "Noun": {
       "properties": {
@@ -969,8 +963,7 @@ predicateSchemaDeclareJSON = [aesonQQ|
           "required": ["tag", "contents"],
           "type": "object"
         }
-      ],
-      "type": "object"
+      ]
     },
     "Omitted": {
       "properties": {

diff --git a/test/Data/OpenApiSpec.hs b/test/Data/OpenApiSpec.hs
@@ -978,7 +978,6 @@ petstoreExampleJSON = [aesonQQ|
 
 compositionSchemaExample :: Schema
 compositionSchemaExample = mempty
-  & type_ ?~ OpenApiObject
   & Data.OpenApi.allOf ?~ [
       Ref (Reference "Other")
     , Inline (mempty
@@ -991,7 +990,6 @@ compositionSchemaExample = mempty
 compositionSchemaExampleJSON :: Value
 compositionSchemaExampleJSON = [aesonQQ|
 {
-  "type": "object",
   "allOf": [
       {
          "$ref": "#/components/schemas/Other"