diff --git a/datashare-app/pom.xml b/datashare-app/pom.xml index 0ac76d7dc..169de71e0 100644 --- a/datashare-app/pom.xml +++ b/datashare-app/pom.xml @@ -109,7 +109,7 @@ org.icij fluent-swagger-apigen - 0.2.0 + 0.3.0 diff --git a/datashare-app/src/main/java/org/icij/datashare/web/OpenApiResource.java b/datashare-app/src/main/java/org/icij/datashare/web/OpenApiResource.java index fa52bc549..2589dbcc2 100644 --- a/datashare-app/src/main/java/org/icij/datashare/web/OpenApiResource.java +++ b/datashare-app/src/main/java/org/icij/datashare/web/OpenApiResource.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.models.OpenAPI; import net.codestory.http.annotations.Get; @@ -31,7 +32,7 @@ public class OpenApiResource { * yaml """, - in = ParameterIn.QUERY) + in = ParameterIn.QUERY, schema = @Schema(implementation = String.class)) } ) @ApiResponse(responseCode = "200", description="returns the JSON or YAML file") diff --git a/datashare-app/src/main/java/org/icij/datashare/web/ProjectResource.java b/datashare-app/src/main/java/org/icij/datashare/web/ProjectResource.java index e40bba9e8..3379c608c 100644 --- a/datashare-app/src/main/java/org/icij/datashare/web/ProjectResource.java +++ b/datashare-app/src/main/java/org/icij/datashare/web/ProjectResource.java @@ -78,7 +78,7 @@ public ProjectResource(Repository repository, Indexer indexer, PropertiesProvide public Payload rootProjectOpt(String id) {return ok().withAllowMethods("OPTIONS", "POST", "GET", "DELETE");} @Operation(description = "Get all user's projects", - requestBody = @RequestBody(content = @Content(mediaType = "application/json", contentSchema = @Schema(implementation = Project[].class))) + requestBody = @RequestBody(content = @Content(mediaType = "application/json", schema = @Schema(implementation = Project[].class))) ) @ApiResponse(responseCode = "200", useReturnTypeSchema = true) @Get("/") @@ -88,7 +88,7 @@ public List getProjects(Context context) { } @Operation(description = "Creates a project", - requestBody = @RequestBody(content = @Content(mediaType = "application/json", contentSchema = @Schema(implementation = Project.class))) + requestBody = @RequestBody(content = @Content(mediaType = "application/json", schema = @Schema(implementation = Project.class))) ) @ApiResponse(responseCode = "201", description = "if project and index have been created") @ApiResponse(responseCode = "400", description = "if project name is empty") @@ -130,7 +130,7 @@ public Project projectRead(String id, Context context) { } @Operation(description = "Updates a project", - requestBody = @RequestBody(content = @Content(mediaType = "application/json", contentSchema = @Schema(implementation = Project.class))) + requestBody = @RequestBody(content = @Content(mediaType = "application/json", schema = @Schema(implementation = Project.class)), required = true) ) @ApiResponse(responseCode = "200", description = "if project has been updated") @ApiResponse(responseCode = "404", description = "if project doesn't exist in database") diff --git a/datashare-nlp-corenlp/pom.xml b/datashare-nlp-corenlp/pom.xml index 2d205baa5..0e13c78b9 100644 --- a/datashare-nlp-corenlp/pom.xml +++ b/datashare-nlp-corenlp/pom.xml @@ -44,7 +44,10 @@ org.apache.lucene lucene-core - + + org.apache.commons + commons-lang3 +