Merge pull request #11 from nlpsandbox/ymnliu-develop

Update API to version 0.2.2

Author: tschaffter

.github/dependabot.yml

@@ -7,8 +7,8 @@ updates:
       interval: "monthly"
     target-branch: "develop"
 
-  - package-ecosystem: "pip"
-    directory: "/server"
+  - package-ecosystem: "npm"
+    directory: "/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "develop"

.github/workflows/ci.yml

@@ -11,6 +11,10 @@ on:
       - '*.*.*'
   pull_request:
 
+
+env:
+  docker_repository: nlpsandbox/person-name-annotator-example
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -38,7 +42,7 @@ jobs:
     - name: Prepare
       id: prep
       run: |
-        DOCKER_IMAGE=nlpsandbox/date-annotator-example-java
+        DOCKER_IMAGE=${{ env.docker_repository }}
         VERSION=noop
         PUSH=false
         if [ "${{ github.event_name }}" = "schedule" ]; then
@@ -99,4 +103,4 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
-        repository: nlpsandbox/date-annotator-example-java
+        repository: ${{ env.docker_repository }}

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 .idea
-venv
+venv
+dist.yaml
+openapi.yaml

README.md

@@ -9,8 +9,8 @@ An example implementation of the [NLP Sandbox Date Annotator] using Java Spring
 
 ## Specification
 
-- Annotates date strings in clinical notes using simple regular expressions
 - Implements the [NLP Sandbox Date Annotator OpenAPI specification]
+- Annotates date strings in clinical notes using simple regular expressions
 
 ## Usage
 
@@ -26,7 +26,7 @@ Build and start the Date Annotator.
 
     cd server/
     mvn package
-    java -jar target/openapi-spring-0.1.6.jar
+    java -jar target/openapi-spring-0.2.2.jar
 
 ## Interactive documentation
 

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   date-annotator:
-    image: nlpsandbox/date-annotator-example-java:edge
+    image: nlpsandbox/date-annotator-example-java:latest
     build:
       context: server
       dockerfile: Dockerfile

openapitools.json

@@ -0,0 +1,11 @@
+{
+    "name": "date-annotator-example-java",
+    "version": "0.2.2",
+    "license": "Apache-2.0",
+    "devDependencies": {
+        "@openapitools/openapi-generator-cli": "^1.0.18-4.3.1"
+    },
+    "scripts": {
+        "generate:server": "openapi-generator generate -g spring -o server -i $npm_config_spec"
+    }
+}

package-lock.json

@@ -21,3 +21,5 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
+
+Dockerfile

package.json

@@ -0,0 +1,20 @@
+README.md
+pom.xml
+src/main/java/org/openapitools/OpenAPI2SpringBoot.java
+src/main/java/org/openapitools/RFC3339DateFormat.java
+src/main/java/org/openapitools/api/ApiUtil.java
+src/main/java/org/openapitools/api/ServiceApi.java
+src/main/java/org/openapitools/api/ServiceApiController.java
+src/main/java/org/openapitools/api/TextDateAnnotationsApi.java
+src/main/java/org/openapitools/api/TextDateAnnotationsApiController.java
+src/main/java/org/openapitools/configuration/HomeController.java
+src/main/java/org/openapitools/configuration/OpenAPIDocumentationConfig.java
+src/main/java/org/openapitools/model/Error.java
+src/main/java/org/openapitools/model/Note.java
+src/main/java/org/openapitools/model/Service.java
+src/main/java/org/openapitools/model/TextAnnotation.java
+src/main/java/org/openapitools/model/TextDateAnnotation.java
+src/main/java/org/openapitools/model/TextDateAnnotationAllOf.java
+src/main/java/org/openapitools/model/TextDateAnnotationRequest.java
+src/main/java/org/openapitools/model/TextDateAnnotations.java
+src/main/resources/application.properties