[schema] support cookie params, tests

Author: lispyclouds

src/navi/core.clj

@@ -20,7 +20,7 @@
                         (.setResolveFully true))
         contents (.readContents (OpenAPIV3Parser.) api-spec nil parse-options)
         paths (.getPaths (.getOpenAPI contents))]
-    (mapv identity (i/update-kvs paths identity #(i/path-item->data % handlers)))))
+    (i/update-kvs paths identity #(i/path-item->data % handlers))))
 
 (comment
   (require '[clojure.pprint :as pp])

src/navi/transform.clj

@@ -24,6 +24,7 @@
     StringSchema
     UUIDSchema]
    [io.swagger.v3.oas.models.parameters
+    CookieParameter
     HeaderParameter
     PathParameter
     QueryParameter
@@ -117,6 +118,9 @@
   ByteArraySchema
   (p/transform [_] any?)
 
+  nil
+  (p/transform [_] any?)
+
   Schema
   (p/transform [schema]
     (if-let [t (first (.getTypes schema))]
@@ -125,9 +129,6 @@
         (throw (Exception. (str "Unsupported schema" schema))))
       (throw (Exception. "Missing schema"))))
 
-  nil
-  (p/transform [_] any?)
-
   ;; TODO: Better. The extra [] is there to help with merge-with into
   PathParameter
   (p/transform [param]
@@ -141,6 +142,10 @@
   (p/transform [param]
     {:query [(i/->param-schema param)]})
 
+  CookieParameter
+  (p/transform [param]
+    {:cookie [(i/->param-schema param)]})
+
   ;; TODO: Handle more kinds of request-bodies
   RequestBody
   (p/transform [param]

test/navi/transform_test.clj

@@ -13,6 +13,8 @@
   (:import
    [io.swagger.v3.oas.models.media
     ArraySchema
+    BinarySchema
+    ByteArraySchema
     ComposedSchema
     Content
     IntegerSchema
@@ -24,6 +26,7 @@
     StringSchema
     UUIDSchema]
    [io.swagger.v3.oas.models.parameters
+    CookieParameter
     HeaderParameter
     PathParameter
     QueryParameter
@@ -70,7 +73,13 @@
       (is (= [:sequential string?]
              (p/transform arr)))
       (is (= [:sequential string?]
-             (p/transform arr-json))))))
+             (p/transform arr-json)))))
+  (testing "byte array"
+    (is (= any? (p/transform (ByteArraySchema.)))))
+  (testing "binary"
+    (is (= any? (p/transform (BinarySchema.)))))
+  (testing "nil"
+    (is (= any? (p/transform nil)))))
 
 (deftest string-formats
   (testing "uuid"
@@ -119,6 +128,13 @@
                   (.setSchema (IntegerSchema.)))]
       (is (= {:header [[:x int?]]}
              (p/transform param)))))
+  (testing "cookie"
+    (let [param (doto (CookieParameter.)
+                  (.setName "x")
+                  (.setRequired true)
+                  (.setSchema (IntegerSchema.)))]
+      (is (= {:cookie [[:x int?]]}
+             (p/transform param)))))
   (testing "required request body"
     (let [media (doto (MediaType.)
                   (.setSchema (ObjectSchema.)))