IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

update openapi deps

Browse Source
This commit is contained in:
Jonathan Shook
2021-07-13 16:12:11 -05:00
parent a4bad299f4
commit ff048bd700
5 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine-rest/pom.xml
View File

@@ -21,27 +21,15 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId> <artifactId>swagger-parser</artifactId>
<version>2.0.0-rc1</version> <version>2.0.27</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
<version>2.0.0-rc2</version> <version>2.1.10</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>2.0.0-rc2</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-parser-v3</artifactId>
<version>2.0.0-rc1</version>
</dependency> </dependency>
<dependency> <dependency>

2
engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/OpenApiEndpoint.java
View File

@@ -6,8 +6,8 @@ import io.nosqlbench.docsys.api.WebServiceObject;
import io.nosqlbench.engine.rest.services.openapi.OpenApiLoader; import io.nosqlbench.engine.rest.services.openapi.OpenApiLoader;
import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.nb.annotations.Service;
import io.swagger.parser.OpenAPIParser; import io.swagger.parser.OpenAPIParser;
import io.swagger.parser.v2.SwaggerConverter;
import io.swagger.util.Json; import io.swagger.util.Json;
import io.swagger.v3.parser.converter.SwaggerConverter;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;

12
engine-rest/src/main/java/io/nosqlbench/engine/rest/services/openapi/OpenApiLoader.java
View File

@@ -4,13 +4,13 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import io.nosqlbench.nb.api.content.Content; import io.nosqlbench.nb.api.content.Content;
import io.nosqlbench.nb.api.content.NBIO; import io.nosqlbench.nb.api.content.NBIO;
import io.swagger.oas.models.OpenAPI;
import io.swagger.oas.models.Operation;
import io.swagger.oas.models.PathItem;
import io.swagger.oas.models.Paths;
import io.swagger.parser.OpenAPIParser; import io.swagger.parser.OpenAPIParser;
import io.swagger.parser.models.ParseOptions; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.parser.models.SwaggerParseResult; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.Paths;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.introspector.BeanAccess; import org.yaml.snakeyaml.introspector.BeanAccess;

32
engine-rest/src/main/java/io/nosqlbench/engine/rest/services/openapi/OpenApiView.java
View File

@@ -1,16 +1,16 @@
package io.nosqlbench.engine.rest.services.openapi; package io.nosqlbench.engine.rest.services.openapi;
import io.swagger.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.oas.models.PathItem; import io.swagger.v3.oas.models.PathItem;
import io.swagger.oas.models.Paths; import io.swagger.v3.oas.models.Paths;
import io.swagger.oas.models.headers.Header; import io.swagger.v3.oas.models.headers.Header;
import io.swagger.oas.models.links.Link; import io.swagger.v3.oas.models.links.Link;
import io.swagger.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.responses.ApiResponses;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
@@ -222,10 +222,12 @@ public class OpenApiView {
} }
for (String linkKey : links.keySet()) { for (String linkKey : links.keySet()) {
Link modelLink = model.getComponents().getLinks().get(linkKey); Link modelLink = model.getComponents().getLinks().get(linkKey);
RequestBody body = modelLink.getRequestBody();
while (body.get$ref() != null) { // RequestBody body = modelLink.getRequestBody();
body = model.getComponents().getRequestBodies().get(body.get$ref()); // while (body.get$ref() != null) {
} // body = model.getComponents().getRequestBodies().get(body.get$ref());
// }
Object body = modelLink.getRequestBody();
modelLink.setRequestBody(body); modelLink.setRequestBody(body);
} }
} }

6
engine-rest/src/main/java/io/nosqlbench/engine/rest/services/openapi/PathOp.java
View File

@@ -1,8 +1,8 @@
package io.nosqlbench.engine.rest.services.openapi; package io.nosqlbench.engine.rest.services.openapi;
import io.swagger.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.oas.models.PathItem; import io.swagger.v3.oas.models.PathItem;
import io.swagger.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.Parameter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;