diff --git a/README.md b/README.md
index 2e25e62..c4756b1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
[](https://github.com/nlpsandbox/date-annotator-example-java/blob/develop/LICENSE)
[](https://hub.docker.com/r/nlpsandbox/date-annotator-example-java)
[](https://discord.gg/Zb4ymtF "Realtime support / chat with the community and the team")
-[](https://www.nlpsandbox.io/tools/date-annotator/leaderboards "View the performance of this NLP Tool on nlpsandbox.io")
Example implementation of the [NLP Sandbox Date Annotator]
@@ -18,8 +17,8 @@ and outputs a list of predicted date annotations found in the clinical note.
### Specification
-- Date Annotator API version: 1.0.0
-- Tool version: 1.0.0
+- Date Annotator API version: 1.0.1
+- Tool version: 1.0.1
- Docker image: [nlpsandbox/date-annotator-example-java]
## Model
diff --git a/docker-compose.yml b/docker-compose.yml
index 89395b7..a0a9505 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
services:
date-annotator:
- image: nlpsandbox/date-annotator-example-java:1.0.0
+ image: nlpsandbox/date-annotator-example-java:1.0.1
build:
context: server
dockerfile: Dockerfile
diff --git a/package.json b/package.json
index d89778b..4423100 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
"@openapitools/openapi-generator-cli": "2.1.23"
},
"scripts": {
- "generate:server": "openapi-generator-cli generate -g spring -o server -i $npm_config_specification"
+ "generate:server": "openapi-generator-cli generate -g spring -o server -i $npm_config_specification",
+ "generate:server:latest": "openapi-generator-cli generate -g spring -o server -i https://nlpsandbox.github.io/nlpsandbox-schemas/date-annotator/latest/openapi.json"
}
}
diff --git a/server/Dockerfile b/server/Dockerfile
index 0ceda3a..cf22ac3 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,7 +1,7 @@
FROM python:3.9.1-slim-buster
ENV APP_DIR=/opt/app
-ENV APP_VERSION="1.0.0"
+ENV APP_VERSION="1.0.1"
SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
diff --git a/server/pom.xml b/server/pom.xml
index 08af9c9..4e29c00 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,7 +4,7 @@
openapi-spring
jar
openapi-spring
- 1.0.0
+ 1.0.1
1.8
${java.version}
diff --git a/server/src/main/java/org/openapitools/api/HealthCheckApiController.java b/server/src/main/java/org/openapitools/api/HealthCheckApiController.java
index a40e80b..60b195f 100644
--- a/server/src/main/java/org/openapitools/api/HealthCheckApiController.java
+++ b/server/src/main/java/org/openapitools/api/HealthCheckApiController.java
@@ -4,7 +4,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.NativeWebRequest;
import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-12T21:49:56.981797-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
@Controller
@RequestMapping("${openapi.nLPSandboxDateAnnotator.base-path:/api/v1}")
public class HealthCheckApiController implements HealthCheckApi {
diff --git a/server/src/main/java/org/openapitools/api/TextDateAnnotationsApiController.java b/server/src/main/java/org/openapitools/api/TextDateAnnotationsApiController.java
index e0fe5bf..a091334 100644
--- a/server/src/main/java/org/openapitools/api/TextDateAnnotationsApiController.java
+++ b/server/src/main/java/org/openapitools/api/TextDateAnnotationsApiController.java
@@ -4,7 +4,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.NativeWebRequest;
import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-12T21:49:56.981797-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
@Controller
@RequestMapping("${openapi.nLPSandboxDateAnnotator.base-path:/api/v1}")
public class TextDateAnnotationsApiController implements TextDateAnnotationsApi {
diff --git a/server/src/main/java/org/openapitools/api/ToolApi.java b/server/src/main/java/org/openapitools/api/ToolApi.java
index 87946d6..098a91d 100644
--- a/server/src/main/java/org/openapitools/api/ToolApi.java
+++ b/server/src/main/java/org/openapitools/api/ToolApi.java
@@ -56,7 +56,7 @@ default Optional getRequest() {
default ResponseEntity getTool() {
Tool tool = new Tool()
.name("date-annotator-example-java")
- .version("1.0.0")
+ .version("1.0.1")
.license(License.APACHE_2_0)
.repository("github:nlpsandbox/date-annotator-example-java")
.description("Example implementation of the NLP Sandbox Date Annotator")
@@ -64,7 +64,7 @@ default ResponseEntity getTool() {
.authorEmail("thomas.schaffter@sagebionetworks.org")
.url(URI.create("https://github.com/nlpsandbox/date-annotator-example-java"))
.toolType("nlpsandbox:date-annotator")
- .toolApiVersion("1.0.0");
+ .toolApiVersion("1.0.1");
return new ResponseEntity(tool, HttpStatus.OK);
}
diff --git a/server/src/main/java/org/openapitools/api/ToolApiController.java b/server/src/main/java/org/openapitools/api/ToolApiController.java
index e2ea623..11627b5 100644
--- a/server/src/main/java/org/openapitools/api/ToolApiController.java
+++ b/server/src/main/java/org/openapitools/api/ToolApiController.java
@@ -4,7 +4,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.NativeWebRequest;
import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-12T21:49:56.981797-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
@Controller
@RequestMapping("${openapi.nLPSandboxDateAnnotator.base-path:/api/v1}")
public class ToolApiController implements ToolApi {
diff --git a/server/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java b/server/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
index f0a4b94..4210d08 100644
--- a/server/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+++ b/server/src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
@@ -17,7 +17,7 @@
import javax.servlet.ServletContext;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
@Configuration
@EnableSwagger2
public class OpenAPIDocumentationConfig {
@@ -25,11 +25,11 @@ public class OpenAPIDocumentationConfig {
ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("NLP Sandbox Date Annotator API")
- .description("# Overview This NLP tool detects references of dates in the clinical note given as input and returns a list of date annotations. # Examples - [NLP Sandbox Date Annotator (Python)](https://github.com/nlpsandbox/date-annotator-example) - [NLP Sandbox Date Annotator (Java)](https://github.com/nlpsandbox/date-annotator-example-java) ")
+ .description("")
.license("Apache 2.0")
.licenseUrl("https://github.com/nlpsandbox/nlpsandbox-schemas/blob/develop/LICENSE")
.termsOfServiceUrl("https://nlpsandbox.io")
- .version("1.0.0")
+ .version("1.0.1")
.contact(new Contact("","", "thomas.schaffter@sagebionetworks.org"))
.build();
}
diff --git a/server/src/main/java/org/openapitools/model/Error.java b/server/src/main/java/org/openapitools/model/Error.java
index 7ee852c..e7e68b5 100644
--- a/server/src/main/java/org/openapitools/model/Error.java
+++ b/server/src/main/java/org/openapitools/model/Error.java
@@ -13,7 +13,7 @@
* Problem details (tools.ietf.org/html/rfc7807)
*/
@ApiModel(description = "Problem details (tools.ietf.org/html/rfc7807)")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class Error {
@JsonProperty("title")
private String title;
diff --git a/server/src/main/java/org/openapitools/model/HealthCheck.java b/server/src/main/java/org/openapitools/model/HealthCheck.java
index 4f36a53..d703620 100644
--- a/server/src/main/java/org/openapitools/model/HealthCheck.java
+++ b/server/src/main/java/org/openapitools/model/HealthCheck.java
@@ -14,7 +14,7 @@
* Represents the health of a service
*/
@ApiModel(description = "Represents the health of a service")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class HealthCheck {
/**
* Indicates whether the service status is acceptable or not
diff --git a/server/src/main/java/org/openapitools/model/License.java b/server/src/main/java/org/openapitools/model/License.java
index 2a8a2af..df4ffd4 100644
--- a/server/src/main/java/org/openapitools/model/License.java
+++ b/server/src/main/java/org/openapitools/model/License.java
@@ -80,7 +80,9 @@ public enum License {
UNLICENSE("unlicense"),
- ZLIB("zlib");
+ ZLIB("zlib"),
+
+ NONE("none");
private String value;
diff --git a/server/src/main/java/org/openapitools/model/Note.java b/server/src/main/java/org/openapitools/model/Note.java
index 8762206..dc6e29d 100644
--- a/server/src/main/java/org/openapitools/model/Note.java
+++ b/server/src/main/java/org/openapitools/model/Note.java
@@ -13,7 +13,7 @@
* A clinical note
*/
@ApiModel(description = "A clinical note")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class Note {
@JsonProperty("identifier")
private String identifier;
diff --git a/server/src/main/java/org/openapitools/model/TextAnnotation.java b/server/src/main/java/org/openapitools/model/TextAnnotation.java
index c395644..1f26309 100644
--- a/server/src/main/java/org/openapitools/model/TextAnnotation.java
+++ b/server/src/main/java/org/openapitools/model/TextAnnotation.java
@@ -13,7 +13,7 @@
* An annotation in a text
*/
@ApiModel(description = "An annotation in a text")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class TextAnnotation {
@JsonProperty("start")
private Integer start;
@@ -101,7 +101,8 @@ public TextAnnotation confidence(Float confidence) {
* maximum: 100
* @return confidence
*/
- @ApiModelProperty(value = "The confidence in the accuracy of the annotation")
+ @ApiModelProperty(required = true, value = "The confidence in the accuracy of the annotation")
+ @NotNull
@DecimalMin("0") @DecimalMax("100")
public Float getConfidence() {
diff --git a/server/src/main/java/org/openapitools/model/TextDateAnnotation.java b/server/src/main/java/org/openapitools/model/TextDateAnnotation.java
index 2864ee0..2b5f53c 100644
--- a/server/src/main/java/org/openapitools/model/TextDateAnnotation.java
+++ b/server/src/main/java/org/openapitools/model/TextDateAnnotation.java
@@ -15,7 +15,7 @@
* A date annotation in a text
*/
@ApiModel(description = "A date annotation in a text")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class TextDateAnnotation {
@JsonProperty("start")
private Integer start;
@@ -106,7 +106,8 @@ public TextDateAnnotation confidence(Float confidence) {
* maximum: 100
* @return confidence
*/
- @ApiModelProperty(value = "The confidence in the accuracy of the annotation")
+ @ApiModelProperty(required = true, value = "The confidence in the accuracy of the annotation")
+ @NotNull
@DecimalMin("0") @DecimalMax("100")
public Float getConfidence() {
diff --git a/server/src/main/java/org/openapitools/model/TextDateAnnotationAllOf.java b/server/src/main/java/org/openapitools/model/TextDateAnnotationAllOf.java
index a0ef024..7025214 100644
--- a/server/src/main/java/org/openapitools/model/TextDateAnnotationAllOf.java
+++ b/server/src/main/java/org/openapitools/model/TextDateAnnotationAllOf.java
@@ -12,7 +12,7 @@
/**
* TextDateAnnotationAllOf
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class TextDateAnnotationAllOf {
@JsonProperty("dateFormat")
private String dateFormat;
diff --git a/server/src/main/java/org/openapitools/model/TextDateAnnotationRequest.java b/server/src/main/java/org/openapitools/model/TextDateAnnotationRequest.java
index d508cc5..3737c43 100644
--- a/server/src/main/java/org/openapitools/model/TextDateAnnotationRequest.java
+++ b/server/src/main/java/org/openapitools/model/TextDateAnnotationRequest.java
@@ -14,7 +14,7 @@
* A request to annotate dates in a clinical note
*/
@ApiModel(description = "A request to annotate dates in a clinical note")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class TextDateAnnotationRequest {
@JsonProperty("note")
private Note note;
diff --git a/server/src/main/java/org/openapitools/model/TextDateAnnotationResponse.java b/server/src/main/java/org/openapitools/model/TextDateAnnotationResponse.java
index 0d1d5b2..875cc74 100644
--- a/server/src/main/java/org/openapitools/model/TextDateAnnotationResponse.java
+++ b/server/src/main/java/org/openapitools/model/TextDateAnnotationResponse.java
@@ -16,7 +16,7 @@
* The response to a dates annotation request
*/
@ApiModel(description = "The response to a dates annotation request")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class TextDateAnnotationResponse {
@JsonProperty("textDateAnnotations")
@Valid
diff --git a/server/src/main/java/org/openapitools/model/Tool.java b/server/src/main/java/org/openapitools/model/Tool.java
index 2a7f35e..82531ae 100644
--- a/server/src/main/java/org/openapitools/model/Tool.java
+++ b/server/src/main/java/org/openapitools/model/Tool.java
@@ -15,7 +15,7 @@
* Information about an NLP tool
*/
@ApiModel(description = "Information about an NLP tool")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class Tool {
@JsonProperty("name")
private String name;
diff --git a/server/src/main/java/org/openapitools/model/ToolDependencies.java b/server/src/main/java/org/openapitools/model/ToolDependencies.java
index d8f3244..ceedd2d 100644
--- a/server/src/main/java/org/openapitools/model/ToolDependencies.java
+++ b/server/src/main/java/org/openapitools/model/ToolDependencies.java
@@ -16,7 +16,7 @@
* A list of tool dependencies
*/
@ApiModel(description = "A list of tool dependencies")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-14T20:17:34.317816-08:00[America/Los_Angeles]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-02-25T15:53:35.186246-08:00[America/Los_Angeles]")
public class ToolDependencies {
@JsonProperty("toolDependencies")
@Valid