Support binary input body params and binary response - use format "bi…

…nary" in swagger file
swagger-api · Aug 6, 2015 · a18409e · a18409e
1 parent 3fee1a0
commit a18409e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/swagger-core/src/test/scala/ModelSerializerTest.scala b/modules/swagger-core/src/test/scala/ModelSerializerTest.scala
@@ -29,7 +29,7 @@ class ModelSerializerTest extends FlatSpec with Matchers {
   }
 
   it should "deserialize a model" in {
-    val json = """{"required":["intValue"],"properties":{"dateValue":{"type":"string","format":"date"},"longValue":{"type":"integer","format":"int64"},"dateTimeValue":{"type":"string","format":"date-time"},"intValue":{"type":"integer","format":"int32"},"byteArrayValue":{"type":"string","format":"byte"}}}"""
+    val json = """{"required":["intValue"],"properties":{"dateValue":{"type":"string","format":"date"},"longValue":{"type":"integer","format":"int64"},"dateTimeValue":{"type":"string","format":"date-time"},"intValue":{"type":"integer","format":"int32"},"byteArrayValue":{"type":"string","format":"binary"}}}"""
 
     val p = m.readValue(json, classOf[Model])
     m.writeValueAsString(p) should equal(json)

diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java
@@ -9,11 +9,11 @@ public class ByteArrayProperty extends AbstractProperty implements Property {
 
   public ByteArrayProperty() {
     super.type = "string";
-    super.format = "byte";
+    super.format = "binary";
   }
 
   public static boolean isType(String type, String format) {
-    if("string".equals(type) &&  "byte".equals(format))
+    if("string".equals(type) &&  "binary".equals(format))
       return true;
     else return false;
   }