Skip to content

Commit

Permalink
Merge pull request #303 from swagger-api/prepare-release-2.0.0
Browse files Browse the repository at this point in the history
prepare release 2.0.0
  • Loading branch information
frantuma authored Apr 24, 2019
2 parents 514639f + fc87192 commit c02cf43
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
8 changes: 4 additions & 4 deletions pom.xml
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>2.0.0-SNAPSHOT</version>
<version>2.0.0</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 @@ -454,9 +454,9 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>2.0.4</swagger-core-version>
<swagger-parser-version>2.0.4</swagger-parser-version>
<jackson.version>2.9.5</jackson.version>
<swagger-core-version>2.0.8</swagger-core-version>
<swagger-parser-version>2.0.12</swagger-parser-version>
<jackson.version>2.9.8</jackson.version>
<jetty-version>9.4.11.v20180605</jetty-version>
<jersey2-version>2.26</jersey2-version>
<servlet-api-version>3.1.0</servlet-api-version>
Expand Down
2 changes: 1 addition & 1 deletion scripts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-inflector</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
</dependency>
</dependencies>
<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.swagger.oas.test.utils;

import com.fasterxml.jackson.databind.JavaType;
import com.sun.org.apache.xerces.internal.xs.StringList;
import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.oas.models.media.ObjectSchema;
import io.swagger.oas.sample.models.Dog;
import io.swagger.oas.inflector.config.Configuration;
Expand All @@ -22,7 +20,6 @@
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import io.swagger.v3.parser.util.ResolverFully;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import mockit.Injectable;
import org.apache.commons.io.FileUtils;
import org.testng.Assert;
Expand All @@ -32,7 +29,6 @@

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand All @@ -57,7 +53,7 @@ public void allowBooleanAdditionalProperties(@Injectable final List<Authorizatio
OpenAPI openAPI = result.getOpenAPI();
Assert.assertEquals(result.getOpenAPI().getOpenapi(), "3.0.0");
List<String> messages = result.getMessages();
assertTrue(messages.isEmpty(), messages.stream().collect(Collectors.joining("\n")));
assertTrue(messages.get(0).contains("attribute components.schemas.someObject.additionalProperties is not of type `object`"), messages.stream().collect(Collectors.joining("\n")));

Assert.assertTrue(openAPI.getComponents().getSchemas().get("someObject").getAdditionalProperties() instanceof Schema);
Assert.assertTrue(((Schema)(openAPI.getComponents().getSchemas().get("someObject").getProperties().get("innerObject"))).getAdditionalProperties() instanceof Boolean);
Expand Down

0 comments on commit c02cf43

Please sign in to comment.