Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop 2.0 - support binary input and output #1166

Closed
wants to merge 9 commits into from
Closed

Develop 2.0 - support binary input and output #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64fb2f6
Support binary input and output
May 20, 2015
71a04d0
Support binary input and output
May 20, 2015
e8bf92d
Merge remote-tracking branch 'upstream/develop_2.0' into develop_2.0
Jun 14, 2015
06d91fe
Manually merge changes that were done on the master branch in order t…
Jun 14, 2015
3d3a4ba
fix type and format strings for serialization
Jun 14, 2015
a3c2f11
Update test to include new ByteArray property type
Jun 14, 2015
3fee1a0
Merge remote-tracking branch 'upstream/develop_2.0' into develop_2.0
Aug 6, 2015
a18409e
Support binary input body params and binary response - use format "bi…
Aug 6, 2015
62678fb
Remove unnecessary comment
Aug 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-core/src/test/scala/ModelSerializerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}}"""
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)
Expand Down
29 changes: 29 additions & 0 deletions modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package io.swagger.models.properties;

import io.swagger.models.Xml;

import java.util.*;

public class ByteArrayProperty extends AbstractProperty implements Property {


public ByteArrayProperty() {
super.type = "string";
super.format = "binary";
}

public static boolean isType(String type, String format) {
if("string".equals(type) && "binary".equals(format))
return true;
else return false;
}
public ByteArrayProperty xml(Xml xml) {
this.setXml(xml);
return this;
}

public ByteArrayProperty example(String example) {
this.setExample(example);
return this;
}
}
11 changes: 11 additions & 0 deletions modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,17 @@ public Model toModel(Property property) {
}

},
BYTE_ARRAY(ByteArrayProperty.class) {
@Override
protected boolean isType(String type, String format) {
return ByteArrayProperty.isType(type, format);
}

@Override
protected ByteArrayProperty create() {
return new ByteArrayProperty();
}
},
DATE(DateProperty.class) {
@Override
protected boolean isType(String type, String format) {
Expand Down