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

Updated jackson to 2.7.8 #167

Merged
merged 4 commits into from
Nov 19, 2016
Merged

Updated jackson to 2.7.8 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
620db65
updated deps
fehguy Nov 19, 2016
2cb8dc7
updated dependencies, some test chages
fehguy Nov 19, 2016
c962e9e
fixed test order
fehguy Nov 19, 2016
fd3730f
version update
fehguy Nov 19, 2016
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
39 changes: 35 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<artifactId>swagger-inflector</artifactId>
<packaging>jar</packaging>
<name>swagger-inflector</name>
<version>1.0.10</version>
<version>1.0.11-SNAPSHOT</version>
<url>https://github.com/swagger-api/swagger-inflector</url>
<scm>
<connection>scm:git:[email protected]:swagger-api/swagger-inflector.git</connection>
Expand Down Expand Up @@ -296,6 +296,20 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${swagger-core-version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
Expand Down Expand Up @@ -391,15 +405,31 @@
<version>${commons-io-version}</version>
</dependency>


<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.4.6</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-xml-provider</artifactId>
<version>2.4.6</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand All @@ -425,7 +455,8 @@
</dependencies>
<properties>
<swagger-core-version>1.5.10</swagger-core-version>
<swagger-parser-version>1.0.22</swagger-parser-version>
<swagger-parser-version>1.0.24-SNAPSHOT</swagger-parser-version>
<jackson.version>2.7.8</jackson.version>
<joda-time-version>2.2</joda-time-version>
<joda-version>1.2</joda-version>
<jetty-version>9.2.9.v20150224</jetty-version>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/swagger/test/examples/ExampleBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ public void testIssue126Inline() throws Exception {
assertEquals(Json.pretty(rep), "{\n" +
" \"id\" : 999,\n" +
" \"inline\" : {\n" +
" \"last\" : \"string\",\n" +
" \"first\" : \"string\"\n" +
" \"first\" : \"string\",\n" +
" \"last\" : \"string\"\n" +
" }\n" +
"}");
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/swagger/test/integration/responses/SchemaResponseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void testIssue130() throws Exception {
String response = client.invokeAPI("/issue-130", "GET", new HashMap<String, String>(), body,
new HashMap<String, String>(), null, null, "application/json", new String[0]);

assertEquals(response, "{\"anIntegerArray\":[99],\"aStringArray\":[\"a string value\"]}");
assertEquals(response, "{\"aStringArray\":[\"a string value\"],\"anIntegerArray\":[99]}");
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/io/swagger/test/validators/NumericValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ public void testInvalidIntegerEnum() throws Exception {
public void testValidLongEnum() throws Exception {
QueryParameter parameter = new QueryParameter()
.name("test")
._enum(Arrays.asList("1", "2", "3"))
.property(new LongProperty());
.property(new LongProperty())
._enum(Arrays.asList("1", "2", "3"));

InputConverter.getInstance().validate(new Long(3), parameter);
}
Expand All @@ -173,8 +173,8 @@ public void testValidLongEnum() throws Exception {
public void testInvalidLongEnum() throws Exception {
QueryParameter parameter = new QueryParameter()
.name("test")
._enum(Arrays.asList("1", "2", "3"))
.property(new LongProperty());
.property(new LongProperty())
._enum(Arrays.asList("1", "2", "3"));

InputConverter.getInstance().validate(new Long(4), parameter);
}
Expand All @@ -183,11 +183,11 @@ public void testInvalidLongEnum() throws Exception {
public void testValidDoubleEnum() throws Exception {
QueryParameter parameter = new QueryParameter()
.name("test")
.property(new DoubleProperty())
._enum(Arrays.asList(
new Double(1).toString(),
new Double(2).toString(),
new Double(3).toString()))
.property(new DoubleProperty());
new Double(3).toString()));

InputConverter.getInstance().validate(new Double(3), parameter);
}
Expand All @@ -196,11 +196,11 @@ public void testValidDoubleEnum() throws Exception {
public void testInvalidDoubleEnum() throws Exception {
QueryParameter parameter = new QueryParameter()
.name("test")
.property(new DoubleProperty())
._enum(Arrays.asList(
new Double(1).toString(),
new Double(2).toString(),
new Double(3).toString()))
.property(new DoubleProperty());
new Double(3).toString()));

InputConverter.getInstance().validate(new Double(4), parameter);
}
Expand Down