From 81c04dc55b133eb282be841388cc115d90673c7f Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 14:56:14 +0300
Subject: [PATCH 1/2] rl-492/openapi-generator OpenapiGenerator: - add ability
 to run v5.0.0-beta openapi generator version - add ability to run
 update-models.sh without DOCS_DEFINITION_FOLDER environment

---
 dev.md           |  6 +-----
 update-models.sh | 12 +++++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev.md b/dev.md
index c393000b..127ac710 100755
--- a/dev.md
+++ b/dev.md
@@ -15,11 +15,7 @@ Instead of using enums, generator produces static constants.
 
 To regenerate models from openapi definition, 
 clone [latest open api definitions](https://github.com/regulaforensics/DocumentReader-api-openapi)
-and set `DOCS_DEFINITION_FOLDER` as path to cloned directory.
-```bash
-export DOCS_DEFINITION_FOLDER="/home/user/projects/DocumentReader-api-openapi"
-```
-Then use next command from the project root.
+and use next command from the project root.
 ```bash
 ./update-models.sh
 ```
diff --git a/update-models.sh b/update-models.sh
index ee486ee6..bdeb2ddb 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -1,31 +1,33 @@
 #!/bin/sh
 
-ENUM_MAPPINGS="TextFieldType=Integer,GraphicFieldType=Integer,Scenario=String,DocumentFormat=Integer,\
+DOCS_DEFINITION_FOLDER="${PWD}/../DocumentReader-web-openapi" \
+\
+&& ENUM_MAPPINGS="TextFieldType=Integer,GraphicFieldType=Integer,Scenario=String,DocumentFormat=Integer,\
 Light=Integer,Result=Integer,VerificationResult=Integer,RfidLocation=Integer,\
 DocumentTypeRecognitionResult=Integer,ProcessingStatus=Integer,Source=String,CheckResult=Integer,\
 LCID=Integer,DocumentType=Integer" \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "$DOCS_DEFINITION_FOLDER:/definitions" \
-openapitools/openapi-generator-cli generate \
+openapitools/openapi-generator-cli:v5.0.0-beta generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli generate \
+openapitools/openapi-generator-cli:v5.0.0-beta generate \
 -i /client/docs/openapi/index.yml -g java -o /client/clients/java/client \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli generate \
+openapitools/openapi-generator-cli:v5.0.0-beta generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS,TextField=com.regula.documentreader.webclient.model.ext.TextField,\
 ImagesField=com.regula.documentreader.webclient.model.ext.ImagesField \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli generate \
+openapitools/openapi-generator-cli:v5.0.0-beta generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS,Text=com.regula.documentreader.webclient.model.ext.Text,\

From d76cf49521536fe96a9020d0df70deaf137ebb42 Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 19:00:48 +0300
Subject: [PATCH 2/2] rl-492/openapi-generator OpenapiGenerator: - change
 openapi generator tag: v5.0.0-beta -> v5.0.0-beta2

---
 update-models.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/update-models.sh b/update-models.sh
index bdeb2ddb..4ee21347 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -8,26 +8,26 @@ DocumentTypeRecognitionResult=Integer,ProcessingStatus=Integer,Source=String,Che
 LCID=Integer,DocumentType=Integer" \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "$DOCS_DEFINITION_FOLDER:/definitions" \
-openapitools/openapi-generator-cli:v5.0.0-beta generate \
+openapitools/openapi-generator-cli:v5.0.0-beta2 generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli:v5.0.0-beta generate \
+openapitools/openapi-generator-cli:v5.0.0-beta2 generate \
 -i /client/docs/openapi/index.yml -g java -o /client/clients/java/client \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli:v5.0.0-beta generate \
+openapitools/openapi-generator-cli:v5.0.0-beta2 generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS,TextField=com.regula.documentreader.webclient.model.ext.TextField,\
 ImagesField=com.regula.documentreader.webclient.model.ext.ImagesField \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli:v5.0.0-beta generate \
+openapitools/openapi-generator-cli:v5.0.0-beta2 generate \
 -i /definitions/index.yml -g java -o /client/client \
 -c /client/java-generator-config.json -t /client/client/generator-templates/ \
 --import-mappings $ENUM_MAPPINGS,Text=com.regula.documentreader.webclient.model.ext.Text,\