diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f4794d..5609cd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: run: mvn -q versions:set -DnewVersion="${{ steps.prep.outputs.version }}" -DprocessAllModules=true - name: Build with Maven - run: mvn -B deploy -DskipTests --file feasibility-dsf-process/pom.xml + run: mvn -B deploy -DskipTests --file mii-process-feasibility/pom.xml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USERNAME: ${{ github.actor }} @@ -97,7 +97,7 @@ jobs: draft: true generate_release_notes: true files: | - feasibility-dsf-process/target/feasibility-dsf-process-*.jar - feasibility-dsf-process/target/feasibility-dsf-process-*.jar.sha256 - name: "Feasibility DSF Process - v${{ steps.prep.outputs.version }}" + mii-process-feasibility/target/mii-process-feasibility-*.jar + mii-process-feasibility/target/mii-process-feasibility-*.jar.sha256 + name: "MII Process Feasibility - v${{ steps.prep.outputs.version }}" diff --git a/.gitignore b/.gitignore index 64fca32..822cbd2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,54 +1,54 @@ -/feasibility-dsf-process/target/ -/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/certs - -/feasibility-dsf-process-docker-test-setup/certs/*.pem -/feasibility-dsf-process-docker-test-setup/certs/*.p12 - -/feasibility-dsf-process-docker-test-setup/.env -/feasibility-dsf-process-docker-test-setup/secrets/*.pem -/feasibility-dsf-process-docker-test-setup/secrets/*.p12 - -/feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/*.log.gz -/feasibility-dsf-process-docker-test-setup/dic-1/bpe/plugin/*.jar -/feasibility-dsf-process-docker-test-setup/dic-1/bpe/process/*.jar -/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/bundle.xml -/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/config.properties -/feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/*.log.gz - -/feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/*.log.gz -/feasibility-dsf-process-docker-test-setup/dic-2/bpe/plugin/*.jar -/feasibility-dsf-process-docker-test-setup/dic-2/bpe/process/*.jar -/feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/bundle.xml -/feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/config.properties -/feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/*.log.gz - -/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/*.log.gz -/feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin/*.jar -/feasibility-dsf-process-docker-test-setup/dic-3/bpe/process/*.jar -/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/bundle.xml -/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/config.properties -/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log -/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/*.log.gz - -/feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log -/feasibility-dsf-process-docker-test-setup/zars/bpe/log/*.log.gz -/feasibility-dsf-process-docker-test-setup/zars/bpe/plugin/*.jar -/feasibility-dsf-process-docker-test-setup/zars/bpe/process/*.jar -/feasibility-dsf-process-docker-test-setup/zars/fhir/conf/bundle.xml -/feasibility-dsf-process-docker-test-setup/zars/fhir/conf/config.properties -/feasibility-dsf-process-docker-test-setup/zars/fhir/log/*.log -/feasibility-dsf-process-docker-test-setup/zars/fhir/log/*.log.gz - -/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/bundle/*.xml -/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/*/ -/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/*.txt -/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/config/*.properties -/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/target/ +/mii-process-feasibility/target/ +/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/certs + +/mii-process-feasibility-docker-test-setup/certs/*.pem +/mii-process-feasibility-docker-test-setup/certs/*.p12 + +/mii-process-feasibility-docker-test-setup/.env +/mii-process-feasibility-docker-test-setup/secrets/*.pem +/mii-process-feasibility-docker-test-setup/secrets/*.p12 + +/mii-process-feasibility-docker-test-setup/dic-1/bpe/log/*.log +/mii-process-feasibility-docker-test-setup/dic-1/bpe/log/*.log.gz +/mii-process-feasibility-docker-test-setup/dic-1/bpe/plugin/*.jar +/mii-process-feasibility-docker-test-setup/dic-1/bpe/process/*.jar +/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/bundle.xml +/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/config.properties +/mii-process-feasibility-docker-test-setup/dic-1/fhir/log/*.log +/mii-process-feasibility-docker-test-setup/dic-1/fhir/log/*.log.gz + +/mii-process-feasibility-docker-test-setup/dic-2/bpe/log/*.log +/mii-process-feasibility-docker-test-setup/dic-2/bpe/log/*.log.gz +/mii-process-feasibility-docker-test-setup/dic-2/bpe/plugin/*.jar +/mii-process-feasibility-docker-test-setup/dic-2/bpe/process/*.jar +/mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/bundle.xml +/mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/config.properties +/mii-process-feasibility-docker-test-setup/dic-2/fhir/log/*.log +/mii-process-feasibility-docker-test-setup/dic-2/fhir/log/*.log.gz + +/mii-process-feasibility-docker-test-setup/dic-3/bpe/log/*.log +/mii-process-feasibility-docker-test-setup/dic-3/bpe/log/*.log.gz +/mii-process-feasibility-docker-test-setup/dic-3/bpe/plugin/*.jar +/mii-process-feasibility-docker-test-setup/dic-3/bpe/process/*.jar +/mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/bundle.xml +/mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/config.properties +/mii-process-feasibility-docker-test-setup/dic-3/fhir/log/*.log +/mii-process-feasibility-docker-test-setup/dic-3/fhir/log/*.log.gz + +/mii-process-feasibility-docker-test-setup/zars/bpe/log/*.log +/mii-process-feasibility-docker-test-setup/zars/bpe/log/*.log.gz +/mii-process-feasibility-docker-test-setup/zars/bpe/plugin/*.jar +/mii-process-feasibility-docker-test-setup/zars/bpe/process/*.jar +/mii-process-feasibility-docker-test-setup/zars/fhir/conf/bundle.xml +/mii-process-feasibility-docker-test-setup/zars/fhir/conf/config.properties +/mii-process-feasibility-docker-test-setup/zars/fhir/log/*.log +/mii-process-feasibility-docker-test-setup/zars/fhir/log/*.log.gz + +/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/bundle/*.xml +/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/*/ +/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/*.txt +/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/config/*.properties +/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/target/ /docker/bpe/plugin/*.jar /docker/bpe/process/*.jar diff --git a/README.md b/README.md index 21fd89f..975adde 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ mvn clean package ## Usage -You can test the processes by following the [README](feasibility-dsf-process-docker-test-setup/README.md) in -the `feasibility-dsf-process-docker-test-setup` directory. +You can test the processes by following the [README](mii-process-feasibility-docker-test-setup/README.md) in +the `mii-process-feasibility-docker-test-setup` directory. ## Edit You should edit the *.bpmn files only with the standalone Camunda Modeller, because of different diff --git a/feasibility-dsf-process/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition b/feasibility-dsf-process/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition deleted file mode 100644 index 0975ca5..0000000 --- a/feasibility-dsf-process/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition +++ /dev/null @@ -1 +0,0 @@ -de.medizininformatik_initiative.feasibility_dsf_process.FeasibilityProcessPluginDefinition diff --git a/feasibility-dsf-process-docker-test-setup/README.md b/mii-process-feasibility-docker-test-setup/README.md similarity index 77% rename from feasibility-dsf-process-docker-test-setup/README.md rename to mii-process-feasibility-docker-test-setup/README.md index fbf1bdc..116517a 100644 --- a/feasibility-dsf-process-docker-test-setup/README.md +++ b/mii-process-feasibility-docker-test-setup/README.md @@ -44,9 +44,9 @@ After that, you can query the [CapabilityStatement][1] of the inbox: ```sh curl \ - --cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \ + --cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \ --cert-type P12 \ - --cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ + --cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ -H accept:application/fhir+json \ -s https://zars/fhir/metadata |\ jq '.software, .implementation' @@ -73,9 +73,9 @@ The following command should return the CapabilityStatement: ```sh curl \ - --cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \ + --cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \ --cert-type P12 \ - --cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ + --cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ -H accept:application/fhir+json \ -s https://dic-1/fhir/metadata |\ jq '.software, .implementation' @@ -93,9 +93,9 @@ After that we can POST the first Task to the ZARS: ```sh curl \ - --cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \ + --cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \ --cert-type P12 \ - --cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ + --cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ -H accept:application/fhir+json \ -H content-type:application/fhir+json \ -d @data/feasibility-bundle.json \ @@ -107,9 +107,9 @@ After exporting the Task ID to $TASK_ID, you can fetch the task: ```sh curl \ - --cacert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/ca/testca_certificate.pem \ + --cacert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/ca/testca_certificate.pem \ --cert-type P12 \ - --cert ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ + --cert ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12:password \ -H accept:application/fhir+json \ -s "https://zars/fhir/Task/${TASK_ID}" |\ jq . diff --git a/feasibility-dsf-process-docker-test-setup/data/feasibility-bundle.json b/mii-process-feasibility-docker-test-setup/data/feasibility-bundle.json similarity index 100% rename from feasibility-dsf-process-docker-test-setup/data/feasibility-bundle.json rename to mii-process-feasibility-docker-test-setup/data/feasibility-bundle.json diff --git a/feasibility-dsf-process-docker-test-setup/db/init-db.sh b/mii-process-feasibility-docker-test-setup/db/init-db.sh similarity index 100% rename from feasibility-dsf-process-docker-test-setup/db/init-db.sh rename to mii-process-feasibility-docker-test-setup/db/init-db.sh diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/bpe/cache/.gitkeep b/mii-process-feasibility-docker-test-setup/dic-1/bpe/cache/.gitkeep similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/bpe/cache/.gitkeep rename to mii-process-feasibility-docker-test-setup/dic-1/bpe/cache/.gitkeep diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/README.md b/mii-process-feasibility-docker-test-setup/dic-1/bpe/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/bpe/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-1/bpe/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/bpe/plugin/README.md b/mii-process-feasibility-docker-test-setup/dic-1/bpe/plugin/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/bpe/plugin/README.md rename to mii-process-feasibility-docker-test-setup/dic-1/bpe/plugin/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/bpe/process/README.md b/mii-process-feasibility-docker-test-setup/dic-1/bpe/process/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/bpe/process/README.md rename to mii-process-feasibility-docker-test-setup/dic-1/bpe/process/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/README.md b/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/README.md rename to mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/application.yaml b/mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/application.yaml similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/fhir/conf/application.yaml rename to mii-process-feasibility-docker-test-setup/dic-1/fhir/conf/application.yaml diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/README.md b/mii-process-feasibility-docker-test-setup/dic-1/fhir/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-1/fhir/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-1/fhir/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/bpe/cache/.gitkeep b/mii-process-feasibility-docker-test-setup/dic-2/bpe/cache/.gitkeep similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/bpe/cache/.gitkeep rename to mii-process-feasibility-docker-test-setup/dic-2/bpe/cache/.gitkeep diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/README.md b/mii-process-feasibility-docker-test-setup/dic-2/bpe/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/bpe/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-2/bpe/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/bpe/plugin/README.md b/mii-process-feasibility-docker-test-setup/dic-2/bpe/plugin/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/bpe/plugin/README.md rename to mii-process-feasibility-docker-test-setup/dic-2/bpe/plugin/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/bpe/process/README.md b/mii-process-feasibility-docker-test-setup/dic-2/bpe/process/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/bpe/process/README.md rename to mii-process-feasibility-docker-test-setup/dic-2/bpe/process/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/README.md b/mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/fhir/conf/README.md rename to mii-process-feasibility-docker-test-setup/dic-2/fhir/conf/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/README.md b/mii-process-feasibility-docker-test-setup/dic-2/fhir/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-2/fhir/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-2/fhir/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-3-store-proxy/nginx.conf b/mii-process-feasibility-docker-test-setup/dic-3-store-proxy/nginx.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3-store-proxy/nginx.conf rename to mii-process-feasibility-docker-test-setup/dic-3-store-proxy/nginx.conf diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/bpe/cache/.gitkeep b/mii-process-feasibility-docker-test-setup/dic-3/bpe/cache/.gitkeep similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/bpe/cache/.gitkeep rename to mii-process-feasibility-docker-test-setup/dic-3/bpe/cache/.gitkeep diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/README.md b/mii-process-feasibility-docker-test-setup/dic-3/bpe/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/bpe/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-3/bpe/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin/README.md b/mii-process-feasibility-docker-test-setup/dic-3/bpe/plugin/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin/README.md rename to mii-process-feasibility-docker-test-setup/dic-3/bpe/plugin/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/bpe/process/README.md b/mii-process-feasibility-docker-test-setup/dic-3/bpe/process/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/bpe/process/README.md rename to mii-process-feasibility-docker-test-setup/dic-3/bpe/process/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/README.md b/mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/fhir/conf/README.md rename to mii-process-feasibility-docker-test-setup/dic-3/fhir/conf/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/README.md b/mii-process-feasibility-docker-test-setup/dic-3/fhir/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-3/fhir/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-3/fhir/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-4-store-init/init.sh b/mii-process-feasibility-docker-test-setup/dic-4-store-init/init.sh similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4-store-init/init.sh rename to mii-process-feasibility-docker-test-setup/dic-4-store-init/init.sh diff --git a/feasibility-dsf-process-docker-test-setup/dic-4-store-init/library-fhir-helpers.json b/mii-process-feasibility-docker-test-setup/dic-4-store-init/library-fhir-helpers.json similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4-store-init/library-fhir-helpers.json rename to mii-process-feasibility-docker-test-setup/dic-4-store-init/library-fhir-helpers.json diff --git a/feasibility-dsf-process-docker-test-setup/dic-4-store-init/library-fhir-model-definition.json b/mii-process-feasibility-docker-test-setup/dic-4-store-init/library-fhir-model-definition.json similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4-store-init/library-fhir-model-definition.json rename to mii-process-feasibility-docker-test-setup/dic-4-store-init/library-fhir-model-definition.json diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/bpe/cache/.gitkeep b/mii-process-feasibility-docker-test-setup/dic-4/bpe/cache/.gitkeep similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/bpe/cache/.gitkeep rename to mii-process-feasibility-docker-test-setup/dic-4/bpe/cache/.gitkeep diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/bpe/log/README.md b/mii-process-feasibility-docker-test-setup/dic-4/bpe/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/bpe/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-4/bpe/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/bpe/plugin/README.md b/mii-process-feasibility-docker-test-setup/dic-4/bpe/plugin/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/bpe/plugin/README.md rename to mii-process-feasibility-docker-test-setup/dic-4/bpe/plugin/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/bpe/process/README.md b/mii-process-feasibility-docker-test-setup/dic-4/bpe/process/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/bpe/process/README.md rename to mii-process-feasibility-docker-test-setup/dic-4/bpe/process/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/fhir/conf/README.md b/mii-process-feasibility-docker-test-setup/dic-4/fhir/conf/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/fhir/conf/README.md rename to mii-process-feasibility-docker-test-setup/dic-4/fhir/conf/README.md diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/fhir/conf/application.yaml b/mii-process-feasibility-docker-test-setup/dic-4/fhir/conf/application.yaml similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/fhir/conf/application.yaml rename to mii-process-feasibility-docker-test-setup/dic-4/fhir/conf/application.yaml diff --git a/feasibility-dsf-process-docker-test-setup/dic-4/fhir/log/README.md b/mii-process-feasibility-docker-test-setup/dic-4/fhir/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/dic-4/fhir/log/README.md rename to mii-process-feasibility-docker-test-setup/dic-4/fhir/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/docker-compose.yml b/mii-process-feasibility-docker-test-setup/docker-compose.yml similarity index 100% rename from feasibility-dsf-process-docker-test-setup/docker-compose.yml rename to mii-process-feasibility-docker-test-setup/docker-compose.yml diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/default.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/default.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/default.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/default.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-1.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-1.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-1.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-1.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-2.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-2.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-2.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-2.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-3.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-3.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-3.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-3.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-4.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-4.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/dic-4.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/dic-4.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/conf.d/zars.conf b/mii-process-feasibility-docker-test-setup/proxy/conf.d/zars.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/conf.d/zars.conf rename to mii-process-feasibility-docker-test-setup/proxy/conf.d/zars.conf diff --git a/feasibility-dsf-process-docker-test-setup/proxy/nginx.conf b/mii-process-feasibility-docker-test-setup/proxy/nginx.conf similarity index 100% rename from feasibility-dsf-process-docker-test-setup/proxy/nginx.conf rename to mii-process-feasibility-docker-test-setup/proxy/nginx.conf diff --git a/feasibility-dsf-process-docker-test-setup/rebuild.sh b/mii-process-feasibility-docker-test-setup/rebuild.sh similarity index 92% rename from feasibility-dsf-process-docker-test-setup/rebuild.sh rename to mii-process-feasibility-docker-test-setup/rebuild.sh index d26c13f..562382e 100755 --- a/feasibility-dsf-process-docker-test-setup/rebuild.sh +++ b/mii-process-feasibility-docker-test-setup/rebuild.sh @@ -3,8 +3,8 @@ set -e BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -mvn -f ../feasibility-dsf-process/pom.xml clean package -mvn -f ../feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/pom.xml clean package +mvn -f ../mii-process-feasibility/pom.xml clean package +mvn -f ../mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/pom.xml clean package # Create a self signed CA openssl req -x509 -sha256 -days 365 -nodes -newkey rsa:2048 -keyout ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca_key.pem \ @@ -41,4 +41,4 @@ rm -f ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.srl # Bundle Proxy Certificates cat ${BASE_DIR}/secrets/dic_3_store_proxy_cert.pem > ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem -cat ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.pem >> ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem \ No newline at end of file +cat ${BASE_DIR}/secrets/dic_3_store_proxy_self_signed_ca.pem >> ${BASE_DIR}/secrets/dic_3_store_proxy_cert_bundle.pem diff --git a/feasibility-dsf-process-docker-test-setup/secrets/README.md b/mii-process-feasibility-docker-test-setup/secrets/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/README.md rename to mii-process-feasibility-docker-test-setup/secrets/README.md diff --git a/feasibility-dsf-process-docker-test-setup/secrets/app_client_certificate_private_key.pem.password b/mii-process-feasibility-docker-test-setup/secrets/app_client_certificate_private_key.pem.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/app_client_certificate_private_key.pem.password rename to mii-process-feasibility-docker-test-setup/secrets/app_client_certificate_private_key.pem.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_1_bpe_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_1_bpe_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_1_bpe_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_1_bpe_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_1_bpe_user_camunda.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_1_bpe_user_camunda.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_1_bpe_user_camunda.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_1_bpe_user_camunda.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_2_bpe_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_2_bpe_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_2_bpe_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_2_bpe_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_2_bpe_user_camunda.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_2_bpe_user_camunda.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_2_bpe_user_camunda.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_2_bpe_user_camunda.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_3_bpe_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_3_bpe_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_3_bpe_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_3_bpe_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_3_bpe_user_camunda.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_3_bpe_user_camunda.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_3_bpe_user_camunda.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_3_bpe_user_camunda.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_4_bpe_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_4_bpe_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_4_bpe_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_4_bpe_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_dic_4_bpe_user_camunda.password b/mii-process-feasibility-docker-test-setup/secrets/db_dic_4_bpe_user_camunda.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_dic_4_bpe_user_camunda.password rename to mii-process-feasibility-docker-test-setup/secrets/db_dic_4_bpe_user_camunda.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_1_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_1_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_1_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_1_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_1_user_permanent_delete.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_1_user_permanent_delete.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_1_user_permanent_delete.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_1_user_permanent_delete.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_2_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_2_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_2_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_2_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_2_user_permanent_delete.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_2_user_permanent_delete.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_2_user_permanent_delete.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_2_user_permanent_delete.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_3_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_3_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_3_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_3_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_3_user_permanent_delete.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_3_user_permanent_delete.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_3_user_permanent_delete.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_3_user_permanent_delete.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_4_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_4_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_4_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_4_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_4_user_permanent_delete.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_4_user_permanent_delete.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_dic_4_user_permanent_delete.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_dic_4_user_permanent_delete.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_zars_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_zars_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_zars_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_zars_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_fhir_zars_user_permanent_delete.password b/mii-process-feasibility-docker-test-setup/secrets/db_fhir_zars_user_permanent_delete.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_fhir_zars_user_permanent_delete.password rename to mii-process-feasibility-docker-test-setup/secrets/db_fhir_zars_user_permanent_delete.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_liquibase.password b/mii-process-feasibility-docker-test-setup/secrets/db_liquibase.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_liquibase.password rename to mii-process-feasibility-docker-test-setup/secrets/db_liquibase.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_zars_bpe_user.password b/mii-process-feasibility-docker-test-setup/secrets/db_zars_bpe_user.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_zars_bpe_user.password rename to mii-process-feasibility-docker-test-setup/secrets/db_zars_bpe_user.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/db_zars_bpe_user_camunda.password b/mii-process-feasibility-docker-test-setup/secrets/db_zars_bpe_user_camunda.password similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/db_zars_bpe_user_camunda.password rename to mii-process-feasibility-docker-test-setup/secrets/db_zars_bpe_user_camunda.password diff --git a/feasibility-dsf-process-docker-test-setup/secrets/dic_3_store_proxy.htpasswd b/mii-process-feasibility-docker-test-setup/secrets/dic_3_store_proxy.htpasswd similarity index 100% rename from feasibility-dsf-process-docker-test-setup/secrets/dic_3_store_proxy.htpasswd rename to mii-process-feasibility-docker-test-setup/secrets/dic_3_store_proxy.htpasswd diff --git a/feasibility-dsf-process-docker-test-setup/set-rights.sh b/mii-process-feasibility-docker-test-setup/set-rights.sh similarity index 100% rename from feasibility-dsf-process-docker-test-setup/set-rights.sh rename to mii-process-feasibility-docker-test-setup/set-rights.sh diff --git a/feasibility-dsf-process-docker-test-setup/zars/bpe/cache/.gitkeep b/mii-process-feasibility-docker-test-setup/zars/bpe/cache/.gitkeep similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/bpe/cache/.gitkeep rename to mii-process-feasibility-docker-test-setup/zars/bpe/cache/.gitkeep diff --git a/feasibility-dsf-process-docker-test-setup/zars/bpe/log/README.md b/mii-process-feasibility-docker-test-setup/zars/bpe/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/bpe/log/README.md rename to mii-process-feasibility-docker-test-setup/zars/bpe/log/README.md diff --git a/feasibility-dsf-process-docker-test-setup/zars/bpe/plugin/README.md b/mii-process-feasibility-docker-test-setup/zars/bpe/plugin/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/bpe/plugin/README.md rename to mii-process-feasibility-docker-test-setup/zars/bpe/plugin/README.md diff --git a/feasibility-dsf-process-docker-test-setup/zars/bpe/process/README.md b/mii-process-feasibility-docker-test-setup/zars/bpe/process/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/bpe/process/README.md rename to mii-process-feasibility-docker-test-setup/zars/bpe/process/README.md diff --git a/feasibility-dsf-process-docker-test-setup/zars/fhir/conf/README.md b/mii-process-feasibility-docker-test-setup/zars/fhir/conf/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/fhir/conf/README.md rename to mii-process-feasibility-docker-test-setup/zars/fhir/conf/README.md diff --git a/feasibility-dsf-process-docker-test-setup/zars/fhir/log/README.md b/mii-process-feasibility-docker-test-setup/zars/fhir/log/README.md similarity index 100% rename from feasibility-dsf-process-docker-test-setup/zars/fhir/log/README.md rename to mii-process-feasibility-docker-test-setup/zars/fhir/log/README.md diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/.gitignore b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/.gitignore similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/.gitignore rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/.gitignore diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/bundle/README.md b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/bundle/README.md similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/bundle/README.md rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/bundle/README.md diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/README.md b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/README.md similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/cert/README.md rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/cert/README.md diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/pom.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/pom.xml similarity index 94% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/pom.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/pom.xml index 5110fb8..6bc048f 100755 --- a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/pom.xml +++ b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/pom.xml @@ -2,15 +2,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - feasibility-dsf-process-test-data-generator + mii-process-feasibility-test-data-generator de.medizininformatik-initiative - feasibility-dsf-process-tools + mii-process-feasibility-tools 0.0.0.0 - MII Feasibility Process Test Data Generator + MII Process Feasibility Test Data Generator @@ -59,7 +59,7 @@ -classpath - de.medizininformatik_initiative.feasibility_dsf_process.tools.generator.TestDataGenerator + de.medizininformatik_initiative.process.feasibility.tools.generator.TestDataGenerator ${project.basedir} diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/BundleGenerator.java b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/BundleGenerator.java similarity index 92% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/BundleGenerator.java rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/BundleGenerator.java index 25fbc56..3f993fe 100755 --- a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/BundleGenerator.java +++ b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/BundleGenerator.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator; +package de.medizininformatik_initiative.process.feasibility.tools.generator; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; @@ -159,23 +159,23 @@ private void createDockerTestZarsBundle(Map !cn.equals("Webbrowser Test User")) .forEach(cn -> copyDockerTestClientCertFiles(baseFolder.resolve("secrets").toString(), cn)); @@ -419,7 +419,7 @@ private void copyDockerTestClientCertFiles(String folder, String commonName) { } public void copyDockerTestServerCert() { - Path baseFolder = Paths.get("../../feasibility-dsf-process-docker-test-setup"); + Path baseFolder = Paths.get("../../mii-process-feasibility-docker-test-setup"); final X509Certificate testCaCertificate = ca.getCertificate(); @@ -427,7 +427,7 @@ public void copyDockerTestServerCert() { logger.info("Copying Test CA certificate file to {}", testCaCertificateFile); writeCertificate(testCaCertificateFile, testCaCertificate); - copyDockerTestServerCertFiles("../../feasibility-dsf-process-docker-test-setup/secrets"); + copyDockerTestServerCertFiles("../../mii-process-feasibility-docker-test-setup/secrets"); } private void copyDockerTestServerCertFiles(String folder) { diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/EnvGenerator.java b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/EnvGenerator.java similarity index 97% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/EnvGenerator.java rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/EnvGenerator.java index aaaef98..d444ab5 100644 --- a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/EnvGenerator.java +++ b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/EnvGenerator.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator; +package de.medizininformatik_initiative.process.feasibility.tools.generator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -89,7 +89,7 @@ public void generateAndWriteDockerTestFhirEnvFiles(Map filterAndMapToThumbprint(Map clientCertificateFilesByCommonName, diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/TestDataGenerator.java b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/TestDataGenerator.java similarity index 88% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/TestDataGenerator.java rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/TestDataGenerator.java index 93d444e..6ad227b 100755 --- a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/tools/generator/TestDataGenerator.java +++ b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/java/de/medizininformatik_initiative/process/feasibility/tools/generator/TestDataGenerator.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.tools.generator; +package de.medizininformatik_initiative.process.feasibility.tools.generator; -import de.medizininformatik_initiative.feasibility_dsf_process.tools.generator.CertificateGenerator.CertificateFiles; +import de.medizininformatik_initiative.process.feasibility.tools.generator.CertificateGenerator.CertificateFiles; import de.rwh.utils.crypto.CertificateAuthority; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-1-bundle.xml diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-2-bundle.xml diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-3-bundle.xml diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-4-bundle.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-4-bundle.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/dic-4-bundle.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/dic-4-bundle.xml diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/bundle-templates/zars-bundle.xml diff --git a/feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/log4j2.xml b/mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/log4j2.xml similarity index 100% rename from feasibility-dsf-process-tools/feasibility-dsf-process-test-data-generator/src/main/resources/log4j2.xml rename to mii-process-feasibility-tools/mii-process-feasibility-test-data-generator/src/main/resources/log4j2.xml diff --git a/feasibility-dsf-process-tools/pom.xml b/mii-process-feasibility-tools/pom.xml similarity index 83% rename from feasibility-dsf-process-tools/pom.xml rename to mii-process-feasibility-tools/pom.xml index 0925ddd..aa2d110 100755 --- a/feasibility-dsf-process-tools/pom.xml +++ b/mii-process-feasibility-tools/pom.xml @@ -2,20 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - feasibility-dsf-process-tools + mii-process-feasibility-tools pom de.medizininformatik-initiative - feasibility-dsf-process-parent + mii-process-feasibility-parent 0.0.0.0 - feasibility-dsf-process-test-data-generator + mii-process-feasibility-test-data-generator - MII Feasibility Process Tools + MII Process Feasibility Tools diff --git a/feasibility-dsf-process/README.md b/mii-process-feasibility/README.md similarity index 100% rename from feasibility-dsf-process/README.md rename to mii-process-feasibility/README.md diff --git a/feasibility-dsf-process/docs/feasibility-process-01.drawio b/mii-process-feasibility/docs/feasibility-process-01.drawio similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-01.drawio rename to mii-process-feasibility/docs/feasibility-process-01.drawio diff --git a/feasibility-dsf-process/docs/feasibility-process-01.png b/mii-process-feasibility/docs/feasibility-process-01.png similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-01.png rename to mii-process-feasibility/docs/feasibility-process-01.png diff --git a/feasibility-dsf-process/docs/feasibility-process-02.drawio b/mii-process-feasibility/docs/feasibility-process-02.drawio similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-02.drawio rename to mii-process-feasibility/docs/feasibility-process-02.drawio diff --git a/feasibility-dsf-process/docs/feasibility-process-02.png b/mii-process-feasibility/docs/feasibility-process-02.png similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-02.png rename to mii-process-feasibility/docs/feasibility-process-02.png diff --git a/feasibility-dsf-process/docs/feasibility-process-03.drawio b/mii-process-feasibility/docs/feasibility-process-03.drawio similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-03.drawio rename to mii-process-feasibility/docs/feasibility-process-03.drawio diff --git a/feasibility-dsf-process/docs/feasibility-process-03.png b/mii-process-feasibility/docs/feasibility-process-03.png similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-03.png rename to mii-process-feasibility/docs/feasibility-process-03.png diff --git a/feasibility-dsf-process/docs/feasibility-process-04.drawio b/mii-process-feasibility/docs/feasibility-process-04.drawio similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-04.drawio rename to mii-process-feasibility/docs/feasibility-process-04.drawio diff --git a/feasibility-dsf-process/docs/feasibility-process-04.png b/mii-process-feasibility/docs/feasibility-process-04.png similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-04.png rename to mii-process-feasibility/docs/feasibility-process-04.png diff --git a/feasibility-dsf-process/docs/feasibility-process-05.drawio b/mii-process-feasibility/docs/feasibility-process-05.drawio similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-05.drawio rename to mii-process-feasibility/docs/feasibility-process-05.drawio diff --git a/feasibility-dsf-process/docs/feasibility-process-05.png b/mii-process-feasibility/docs/feasibility-process-05.png similarity index 100% rename from feasibility-dsf-process/docs/feasibility-process-05.png rename to mii-process-feasibility/docs/feasibility-process-05.png diff --git a/feasibility-dsf-process/docs/feasibilityExecute.png b/mii-process-feasibility/docs/feasibilityExecute.png similarity index 100% rename from feasibility-dsf-process/docs/feasibilityExecute.png rename to mii-process-feasibility/docs/feasibilityExecute.png diff --git a/feasibility-dsf-process/docs/feasibilityRequest.png b/mii-process-feasibility/docs/feasibilityRequest.png similarity index 100% rename from feasibility-dsf-process/docs/feasibilityRequest.png rename to mii-process-feasibility/docs/feasibilityRequest.png diff --git a/feasibility-dsf-process/pom.xml b/mii-process-feasibility/pom.xml similarity index 89% rename from feasibility-dsf-process/pom.xml rename to mii-process-feasibility/pom.xml index 7c19e6f..6145a0d 100755 --- a/feasibility-dsf-process/pom.xml +++ b/mii-process-feasibility/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - feasibility-dsf-process + mii-process-feasibility de.medizininformatik-initiative - feasibility-dsf-process-parent + mii-process-feasibility-parent 0.0.0.0 @@ -16,7 +16,7 @@ yyyy-MM-dd - MII Feasibility DSF Process + MII Process Feasibility @@ -219,7 +219,7 @@ ${project.version} - ../feasibility-dsf-process-docker-test-setup/dic-1/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-1/bpe/process @@ -237,7 +237,7 @@ ${project.version} - ../feasibility-dsf-process-docker-test-setup/dic-2/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-2/bpe/process @@ -255,7 +255,7 @@ ${project.version} - ../feasibility-dsf-process-docker-test-setup/dic-3/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-3/bpe/process @@ -273,7 +273,7 @@ ${project.version} - ../feasibility-dsf-process-docker-test-setup/dic-4/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-4/bpe/process @@ -291,7 +291,7 @@ ${project.version} - ../feasibility-dsf-process-docker-test-setup/zars/bpe/process + ../mii-process-feasibility-docker-test-setup/zars/bpe/process @@ -317,70 +317,70 @@ false - ../feasibility-dsf-process-docker-test-setup/dic-1/bpe/plugin + ../mii-process-feasibility-docker-test-setup/dic-1/bpe/plugin *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-1/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-1/bpe/process *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-2/bpe/plugin + ../mii-process-feasibility-docker-test-setup/dic-2/bpe/plugin *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-2/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-2/bpe/process *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-3/bpe/plugin + ../mii-process-feasibility-docker-test-setup/dic-3/bpe/plugin *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-3/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-3/bpe/process *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-4/bpe/plugin + ../mii-process-feasibility-docker-test-setup/dic-4/bpe/plugin *.jar false - ../feasibility-dsf-process-docker-test-setup/dic-4/bpe/process + ../mii-process-feasibility-docker-test-setup/dic-4/bpe/process *.jar false - ../feasibility-dsf-process-docker-test-setup/zars/bpe/plugin + ../mii-process-feasibility-docker-test-setup/zars/bpe/plugin *.jar false - ../feasibility-dsf-process-docker-test-setup/zars/bpe/process + ../mii-process-feasibility-docker-test-setup/zars/bpe/process *.jar diff --git a/feasibility-dsf-process/scripts/create_certs_for_client_tests.sh b/mii-process-feasibility/scripts/create_certs_for_client_tests.sh similarity index 97% rename from feasibility-dsf-process/scripts/create_certs_for_client_tests.sh rename to mii-process-feasibility/scripts/create_certs_for_client_tests.sh index be5e521..5aaaaff 100755 --- a/feasibility-dsf-process/scripts/create_certs_for_client_tests.sh +++ b/mii-process-feasibility/scripts/create_certs_for_client_tests.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -TARGET_DIR="${BASE_DIR}/../src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/certs" +TARGET_DIR="${BASE_DIR}/../src/test/resources/de/medizininformatik_initiative/process/feasibility/client/certs" mkdir -p "${TARGET_DIR}" diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProvider.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProvider.java similarity index 92% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProvider.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProvider.java index d60b48a..6bf066f 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProvider.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProvider.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import dev.dsf.fhir.client.FhirWebserviceClient; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImpl.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImpl.java similarity index 95% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImpl.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImpl.java index c5c24f1..21f890b 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImpl.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImpl.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import dev.dsf.fhir.client.FhirWebserviceClient; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProvider.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProvider.java similarity index 95% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProvider.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProvider.java index e5fd7ca..674419d 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProvider.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProvider.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import java.time.Duration; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImpl.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImpl.java similarity index 97% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImpl.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImpl.java index 2614148..10de3a2 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImpl.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImpl.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import java.time.Duration; import java.util.Objects; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategy.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategy.java similarity index 96% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategy.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategy.java index b17c646..0b99178 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategy.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategy.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import java.util.Arrays; import java.util.Objects; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscator.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscator.java similarity index 89% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscator.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscator.java index 10547bf..f104348 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscator.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscator.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -58,11 +58,11 @@ private long privatize(int value, double obfuscationNum) { * @param meanDist mean of distribution divDist diversity of distribution */ private static double laplace(int meanDist, double sensitivity, double epsilon, SecureRandom rand) { - double divDist = sensitivity / epsilon; - double min = -0.5; - double max = 0.5; - double random = rand.nextDouble(); - double uniform = min + random * (max - min); + var divDist = sensitivity / epsilon; + var min = -0.5; + var max = 0.5; + var random = rand.nextDouble(); + var uniform = min + random * (max - min); return meanDist - divDist * Math.signum(uniform) * Math.log(1 - 2 * Math.abs(uniform)); } } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDefinition.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDefinition.java similarity index 72% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDefinition.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDefinition.java index 7d05445..5a05b8a 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDefinition.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDefinition.java @@ -1,15 +1,14 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; - -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClientSpringConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientSpringConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.BaseConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.EnhancedFhirWebserviceClientProviderConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.EvaluationConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.FeasibilityConfig; +package de.medizininformatik_initiative.process.feasibility; + +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClientSpringConfig; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientSpringConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.BaseConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.EnhancedFhirWebserviceClientProviderConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.EvaluationConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.FeasibilityConfig; import dev.dsf.bpe.v1.ProcessPluginDefinition; import java.io.IOException; -import java.io.InputStream; import java.time.LocalDate; import java.util.Arrays; import java.util.List; @@ -17,8 +16,8 @@ import java.util.Properties; import static com.google.common.base.Preconditions.checkNotNull; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.FEASIBILITY_REQUEST_PROCESS_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.FEASIBILITY_REQUEST_PROCESS_ID; public class FeasibilityProcessPluginDefinition implements ProcessPluginDefinition { @@ -26,10 +25,10 @@ public class FeasibilityProcessPluginDefinition implements ProcessPluginDefiniti private final LocalDate releaseDate; public FeasibilityProcessPluginDefinition() { - try (InputStream input = FeasibilityProcessPluginDefinition.class.getClassLoader() + try (var input = FeasibilityProcessPluginDefinition.class.getClassLoader() .getResourceAsStream("app.properties")) { checkNotNull(input); - Properties props = new Properties(); + var props = new Properties(); props.load(input); this.version = props.getProperty("build.version").replaceFirst("-.*$", ""); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListener.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListener.java similarity index 86% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListener.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListener.java index 6ae1f96..16e0a02 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListener.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListener.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import ca.uhn.fhir.rest.client.api.IGenericClient; -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient; +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClient; import dev.dsf.bpe.v1.ProcessPluginDeploymentStateListener; import org.hl7.fhir.r4.model.CapabilityStatement; import org.slf4j.Logger; @@ -10,7 +10,7 @@ import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; import static java.util.Objects.requireNonNull; /** @@ -42,7 +42,7 @@ public void onProcessesDeployed(List processes) { if (processes.contains(FEASIBILITY_EXECUTE_PROCESS_ID)) { if (strategy.equals(EvaluationStrategy.CQL)) { try { - CapabilityStatement statement = storeClient.capabilities().ofType(CapabilityStatement.class) + var statement = storeClient.capabilities().ofType(CapabilityStatement.class) .execute(); logger.info("Connection test OK ({} - {})", statement.getSoftware().getName(), statement.getSoftware().getVersion()); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/Obfuscator.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/Obfuscator.java similarity index 84% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/Obfuscator.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/Obfuscator.java index 4693793..d23177b 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/Obfuscator.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/Obfuscator.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; /** * Describes how values of a type T can get obfuscated. diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RandomNumberGenerator.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RandomNumberGenerator.java similarity index 87% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RandomNumberGenerator.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RandomNumberGenerator.java index becaf89..94a238f 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RandomNumberGenerator.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RandomNumberGenerator.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; /** * Describes a simple random number generator. diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimit.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RateLimit.java similarity index 95% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimit.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RateLimit.java index f97eceb..aff47c1 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimit.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/RateLimit.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import io.github.bucket4j.Bandwidth; import io.github.bucket4j.Bucket; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClient.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClient.java similarity index 93% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClient.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClient.java index cfb0d5b..1d9eeff 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClient.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClient.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import java.io.IOException; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImpl.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImpl.java similarity index 96% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImpl.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImpl.java index fb0a5ac..2c6d59a 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImpl.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImpl.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientSpringConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientSpringConfig.java similarity index 77% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientSpringConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientSpringConfig.java index 1252194..16dbc11 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientSpringConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientSpringConfig.java @@ -1,10 +1,10 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationStrategy; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.TlsClientFactory; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.BaseConfig; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.EvaluationConfig; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProvider; +import de.medizininformatik_initiative.process.feasibility.EvaluationStrategy; +import de.medizininformatik_initiative.process.feasibility.client.store.TlsClientFactory; +import de.medizininformatik_initiative.process.feasibility.spring.config.BaseConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.EvaluationConfig; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.auth.AuthScope; @@ -43,31 +43,31 @@ @Import({ BaseConfig.class, EvaluationConfig.class }) public class FlareWebserviceClientSpringConfig { - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url:}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.flare.base_url:}") private String flareBaseUrl; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.flare.timeout.connect:2000}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.flare.timeout.connect:2000}") private int connectTimeout; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.host:#{null}}") private String proxyHost; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port:}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.port:}") private Integer proxyPort; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.username:#{null}}") private String proxyUsername; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.password:#{null}}") private String proxyPassword; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.username:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.username:#{null}}") private String basicAuthUsername; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.password:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.password:#{null}}") private String basicAuthPassword; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.bearer.token:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.bearer.token:#{null}}") private String bearerAuthToken; @Bean @@ -86,7 +86,7 @@ private FlareWebserviceClient createFlareClient(HttpClient httpClient) { return new ErrorFlareWebserviceClient(new IllegalArgumentException("FLARE_BASE_URL is not set.")); } else { try { - URI parsedFlareBaseUrl = new URI(flareBaseUrl); + var parsedFlareBaseUrl = new URI(flareBaseUrl); return new FlareWebserviceClientImpl(httpClient, parsedFlareBaseUrl); } catch (URISyntaxException e) { return new ErrorFlareWebserviceClient(new IllegalArgumentException( @@ -99,16 +99,16 @@ private FlareWebserviceClient createFlareClient(HttpClient httpClient) { public HttpClient flareHttpClient(@Qualifier("base-client") SSLContext sslContext, EvaluationSettingsProvider evaluationSettingsProvider) { if (EvaluationStrategy.STRUCTURED_QUERY == evaluationSettingsProvider.evaluationStrategy()) { - TlsClientFactory clientFactory = new TlsClientFactory(null, sslContext); + var clientFactory = new TlsClientFactory(null, sslContext); clientFactory.setConnectTimeout(connectTimeout); clientFactory.setConnectionRequestTimeout(connectTimeout); clientFactory.setSocketTimeout(connectTimeout); - HttpClientBuilder builder = clientFactory.getNativeHttpClientBuilder(); + var builder = clientFactory.getNativeHttpClientBuilder(); - BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + var credentialsProvider = new BasicCredentialsProvider(); if (!isNullOrEmpty(proxyHost) && proxyPort != null) { - HttpHost proxy = new HttpHost(proxyHost, proxyPort); + var proxy = new HttpHost(proxyHost, proxyPort); builder.setProxy(proxy); if (!isNullOrEmpty(proxyUsername) && !isNullOrEmpty(proxyPassword)) { builder.setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy()); @@ -117,7 +117,7 @@ public HttpClient flareHttpClient(@Qualifier("base-client") SSLContext sslContex } } if (!isNullOrEmpty(basicAuthUsername) && !isNullOrEmpty(basicAuthPassword)) { - URI flareUri = URI.create(flareBaseUrl); + var flareUri = URI.create(flareBaseUrl); credentialsProvider.setCredentials(new AuthScope(new HttpHost(flareUri.getHost(), flareUri.getPort())), new UsernamePasswordCredentials(basicAuthUsername, basicAuthPassword)); } else if (!isNullOrEmpty(bearerAuthToken)) { diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/listener/SetCorrelationKeyListener.java similarity index 75% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/listener/SetCorrelationKeyListener.java index ca63063..8a24f5c 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/listener/SetCorrelationKeyListener.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/listener/SetCorrelationKeyListener.java @@ -1,9 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.listener; +package de.medizininformatik_initiative.process.feasibility.client.listener; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.constants.BpmnExecutionVariables; -import dev.dsf.bpe.v1.variables.Target; -import dev.dsf.bpe.v1.variables.Variables; import org.camunda.bpm.engine.delegate.DelegateExecution; import org.camunda.bpm.engine.delegate.ExecutionListener; import org.springframework.beans.factory.InitializingBean; @@ -25,8 +23,8 @@ public void afterPropertiesSet() throws Exception { @Override public void notify(DelegateExecution execution) throws Exception { - Variables variables = api.getVariables(execution); - Target target = variables.getTarget(); + var variables = api.getVariables(execution); + var target = variables.getTarget(); execution.setVariableLocal(BpmnExecutionVariables.CORRELATION_KEY, target.getCorrelationKey()); } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientConfiguration.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientConfiguration.java similarity index 96% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientConfiguration.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientConfiguration.java index dc7686d..13509cd 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientConfiguration.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientConfiguration.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import lombok.Builder; import lombok.Getter; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientFactory.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientFactory.java similarity index 86% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientFactory.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientFactory.java index 9287d32..6c6698b 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientFactory.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientFactory.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; @@ -6,9 +6,9 @@ import ca.uhn.fhir.rest.client.impl.RestfulClientFactory; import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor; import ca.uhn.fhir.rest.client.interceptor.BearerTokenAuthInterceptor; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.ConnectionConfiguration; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.ProxyConfiguration; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.ConnectionConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.ProxyConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientSpringConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java similarity index 67% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientSpringConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java index b8b92c8..fc9c4e9 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientSpringConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; @@ -6,7 +6,7 @@ import ca.uhn.fhir.rest.client.impl.RestfulClientFactory; import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor; import ca.uhn.fhir.rest.client.interceptor.BearerTokenAuthInterceptor; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.BaseConfig; +import de.medizininformatik_initiative.process.feasibility.spring.config.BaseConfig; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -19,37 +19,37 @@ @Import(BaseConfig.class) public class StoreClientSpringConfig { - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.host:#{null}}") private String proxyHost; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port:}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.port:}") private Integer proxyPort; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.username:#{null}}") private String proxyUsername; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.proxy.password:#{null}}") private String proxyPassword; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.bearer.token:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.bearer.token:#{null}}") private String bearerAuthToken; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.username:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.username:#{null}}") private String basicAuthUsername; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.password:#{null}}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.password:#{null}}") private String basicAuthPassword; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.timeout.connect:2000}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.timeout.connect:2000}") private Integer connectTimeout; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.timeout.connect_request:20000}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.timeout.connect_request:20000}") private Integer connectRequestTimeout; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.timeout.socket:20000}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.timeout.socket:20000}") private Integer socketTimeout; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.base_url:}") + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.base_url:}") private String storeBaseUrl; @Bean diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/TlsClientFactory.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/TlsClientFactory.java similarity index 90% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/TlsClientFactory.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/TlsClientFactory.java index cd1d8c7..8c81928 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/TlsClientFactory.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/TlsClientFactory.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.EncodingEnum; @@ -17,7 +17,6 @@ import org.apache.http.client.CredentialsProvider; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; -import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; @@ -89,7 +88,7 @@ private ApacheHttpClient getClient() { return clientByServerBase.get(serverBase); } else { log.debug("Returning new ApacheHttpClient for ServerBase {}", serverBase); - ApacheHttpClient client = new ApacheHttpClient(getNativeHttpClient(), new StringBuilder(serverBase), + var client = new ApacheHttpClient(getNativeHttpClient(), new StringBuilder(serverBase), null, null, null, null); clientByServerBase.put(serverBase, client); return client; @@ -115,24 +114,24 @@ public HttpClient getNativeHttpClient() { } public HttpClientBuilder getNativeHttpClientBuilder() { - SSLContext sslContext = getSslContext(); + var sslContext = getSslContext(); - Registry socketFactoryRegistry = RegistryBuilder.create() + var socketFactoryRegistry = RegistryBuilder.create() .register("http", PlainConnectionSocketFactory.getSocketFactory()) .register("https", new SSLConnectionSocketFactory(sslContext)).build(); - PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( + var connectionManager = new PoolingHttpClientConnectionManager( socketFactoryRegistry, null, null, null, 5000, TimeUnit.MILLISECONDS); connectionManager.setMaxTotal(getPoolMaxTotal()); connectionManager.setDefaultMaxPerRoute(getPoolMaxPerRoute()); - RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(getSocketTimeout()) + var defaultRequestConfig = RequestConfig.custom().setSocketTimeout(getSocketTimeout()) .setConnectTimeout(getConnectTimeout()).setConnectionRequestTimeout(getConnectionRequestTimeout()) .setProxy(myProxy).build(); - HttpClientBuilder builder = HttpClients.custom().setConnectionManager(connectionManager) + var builder = HttpClients.custom().setConnectionManager(connectionManager) .setSSLContext(sslContext).setDefaultRequestConfig(defaultRequestConfig).disableCookieManagement(); if (myProxy != null && StringUtils.isNotBlank(getProxyUsername()) diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicRequest.java similarity index 80% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicRequest.java index 1c8044a..2475bc6 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicRequest.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicRequest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.message; +package de.medizininformatik_initiative.process.feasibility.message; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend; @@ -11,8 +11,8 @@ import java.util.stream.Stream; import static com.google.common.base.Preconditions.checkNotNull; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; public class SendDicRequest extends AbstractTaskMessageSend { diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicResponse.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicResponse.java similarity index 65% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicResponse.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicResponse.java index 20b1482..a97d6af 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/message/SendDicResponse.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/message/SendDicResponse.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.message; +package de.medizininformatik_initiative.process.feasibility.message; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractTaskMessageSend; @@ -9,9 +9,9 @@ import java.util.stream.Stream; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; public class SendDicResponse extends AbstractTaskMessageSend { diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResources.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResources.java similarity index 79% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResources.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResources.java index 9b3f214..06ba56e 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResources.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResources.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -22,8 +22,8 @@ import java.util.Objects; import java.util.Optional; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; public class DownloadFeasibilityResources extends AbstractServiceDelegate implements InitializingBean { @@ -44,11 +44,11 @@ public void afterPropertiesSet() throws Exception { @Override protected void doExecute(DelegateExecution execution, Variables variables) { - Task task = variables.getStartTask(); + var task = variables.getStartTask(); - IdType measureId = getMeasureId(task); - FhirWebserviceClient client = clientProvider.getWebserviceClientByReference(measureId); - Bundle bundle = getMeasureAndLibrary(measureId, client); + var measureId = getMeasureId(task); + var client = clientProvider.getWebserviceClientByReference(measureId); + var bundle = getMeasureAndLibrary(measureId, client); variables.setResource(ConstantsFeasibility.VARIABLE_MEASURE, bundle.getEntry().get(0).getResource()); variables.setResource(ConstantsFeasibility.VARIABLE_LIBRARY, bundle.getEntry().get(1).getResource()); @@ -68,7 +68,7 @@ private IdType getMeasureId(Task task) { private Bundle getMeasureAndLibrary(IdType measureId, FhirWebserviceClient client) { try { - Bundle bundle = client.searchWithStrictHandling(Measure.class, + var bundle = client.searchWithStrictHandling(Measure.class, Map.of("_id", Collections.singletonList(measureId.getIdPart()), "_include", Collections.singletonList("Measure:depends-on"))); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReport.java similarity index 73% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReport.java index 34b6612..c711bc4 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReport.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReport.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -17,9 +17,9 @@ import java.util.Objects; import java.util.Optional; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; public class DownloadMeasureReport extends AbstractServiceDelegate implements InitializingBean { @@ -39,11 +39,11 @@ public void afterPropertiesSet() throws Exception { @Override protected void doExecute(DelegateExecution execution, Variables variables) { - Task task = variables.getLatestTask(); - IdType measureReportId = getMeasureReportId(task); - FhirWebserviceClient client = clientProvider + var task = variables.getLatestTask(); + var measureReportId = getMeasureReportId(task); + var client = clientProvider .getWebserviceClientByReference(measureReportId); - MeasureReport measureReport = downloadMeasureReport(client, measureReportId); + var measureReport = downloadMeasureReport(client, measureReportId); execution.setVariableLocal(VARIABLE_MEASURE_REPORT, measureReport); } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasure.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasure.java similarity index 80% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasure.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasure.java index 8cb01b3..d57f632 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasure.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasure.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import ca.uhn.fhir.rest.client.api.IGenericClient; import dev.dsf.bpe.v1.ProcessPluginApi; @@ -14,10 +14,10 @@ import java.util.Objects; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_ID; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; public class EvaluateCqlMeasure extends AbstractServiceDelegate implements InitializingBean { @@ -43,9 +43,9 @@ public void afterPropertiesSet() throws Exception { @Override protected void doExecute(DelegateExecution execution, Variables variables) { - String measureId = variables.getString(VARIABLE_MEASURE_ID); + var measureId = variables.getString(VARIABLE_MEASURE_ID); - MeasureReport report = executeEvaluateMeasure(measureId); + var report = executeEvaluateMeasure(measureId); validateMeasureReport(report); variables.setResource(VARIABLE_MEASURE_REPORT, report); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateRequestRate.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateRequestRate.java similarity index 80% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateRequestRate.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateRequestRate.java index 8fe3dca..2b6dd88 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateRequestRate.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateRequestRate.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.RateLimit; -import de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility; +import de.medizininformatik_initiative.process.feasibility.RateLimit; +import de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasure.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasure.java similarity index 77% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasure.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasure.java index 51120e3..53e25b2 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasure.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasure.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient; +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClient; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -20,13 +20,13 @@ import java.util.List; import java.util.Objects; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_LIBRARY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_LIBRARY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportStatus.COMPLETE; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportType.SUMMARY; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleaner.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleaner.java similarity index 93% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleaner.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleaner.java index a661b56..46ba9a4 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleaner.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleaner.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import org.hl7.fhir.r4.model.Library; import org.hl7.fhir.r4.model.Measure; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/LogReceiveTimeout.java similarity index 84% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/LogReceiveTimeout.java index c125ae9..9c0ecf1 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/LogReceiveTimeout.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/LogReceiveTimeout.java @@ -1,8 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; -import dev.dsf.bpe.v1.variables.Target; import dev.dsf.bpe.v1.variables.Variables; import org.camunda.bpm.engine.delegate.BpmnError; import org.camunda.bpm.engine.delegate.DelegateExecution; @@ -19,7 +18,7 @@ public LogReceiveTimeout(ProcessPluginApi api) { @Override protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception { - Target target = variables.getTarget(); + var target = variables.getTarget(); logger.warn("Timeout while waiting for result from {} (endpoint url: {}).", target.getOrganizationIdentifierValue(), target.getEndpointUrl()); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResult.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResult.java similarity index 80% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResult.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResult.java index 9c2b6c8..8222e5d 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResult.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResult.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.Obfuscator; +import de.medizininformatik_initiative.process.feasibility.Obfuscator; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -14,11 +14,11 @@ import java.util.Objects; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static java.lang.String.format; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportStatus.COMPLETE; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportType.SUMMARY; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecter.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecter.java similarity index 81% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecter.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecter.java index faed2c2..0ea6c81 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecter.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecter.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; @@ -18,7 +18,7 @@ public RateLimitExceededTaskRejecter(ProcessPluginApi api) { @Override protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception { - CodeableConcept reason = new CodeableConcept().setText("The request rate limit has been exceeded."); + var reason = new CodeableConcept().setText("The request rate limit has been exceeded."); variables.getStartTask().setStatus(FAILED).setStatusReason(reason); } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargets.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargets.java similarity index 73% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargets.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargets.java index 3a9f8d7..40e1231 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargets.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargets.java @@ -1,11 +1,9 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; -import dev.dsf.bpe.v1.service.OrganizationProvider; import dev.dsf.bpe.v1.variables.Target; import dev.dsf.bpe.v1.variables.Variables; -import dev.dsf.fhir.client.FhirWebserviceClient; import org.camunda.bpm.engine.delegate.DelegateExecution; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.Endpoint; @@ -22,8 +20,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; import static dev.dsf.common.auth.conf.Identity.ORGANIZATION_IDENTIFIER_SYSTEM; public class SelectRequestTargets extends AbstractServiceDelegate { @@ -37,12 +35,12 @@ public SelectRequestTargets(ProcessPluginApi api) { @Override protected void doExecute(DelegateExecution execution, Variables variables) { - OrganizationProvider organizationProvider = api.getOrganizationProvider(); - FhirWebserviceClient client = api.getFhirWebserviceClientProvider().getLocalWebserviceClient(); - Identifier parentIdentifier = new Identifier() + var organizationProvider = api.getOrganizationProvider(); + var client = api.getFhirWebserviceClientProvider().getLocalWebserviceClient(); + var parentIdentifier = new Identifier() .setSystem(ORGANIZATION_IDENTIFIER_SYSTEM) .setValue("medizininformatik-initiative.de"); - Coding memberOrganizationRole = new Coding() + var memberOrganizationRole = new Coding() .setSystem("http://dsf.dev/fhir/CodeSystem/organization-role") .setCode("DIC"); List targets = organizationProvider @@ -51,9 +49,9 @@ protected void doExecute(DelegateExecution execution, Variables variables) { .filter(Organization::hasEndpoint) .filter(Organization::hasIdentifier) .map(organization -> { - Identifier organizationIdentifier = organization.getIdentifierFirstRep(); - String path = URI.create(organization.getEndpointFirstRep().getReference()).getPath(); - Endpoint endpoint = client.read(Endpoint.class, path.substring(path.lastIndexOf("/") + 1)); + var organizationIdentifier = organization.getIdentifierFirstRep(); + var path = URI.create(organization.getEndpointFirstRep().getReference()).getPath(); + var endpoint = client.read(Endpoint.class, path.substring(path.lastIndexOf("/") + 1)); return variables.createTarget(organizationIdentifier.getValue(), endpoint.getIdentifierFirstRep().getValue(), endpoint.getAddress(), diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTarget.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTarget.java similarity index 62% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTarget.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTarget.java index 0a84b1e..09967d8 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTarget.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTarget.java @@ -1,21 +1,17 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.constants.CodeSystems.BpmnMessage; -import dev.dsf.bpe.v1.variables.Target; import dev.dsf.bpe.v1.variables.Variables; import dev.dsf.fhir.client.FhirWebserviceClient; import org.camunda.bpm.engine.delegate.BpmnError; import org.camunda.bpm.engine.delegate.DelegateExecution; import org.hl7.fhir.r4.model.Endpoint; -import org.hl7.fhir.r4.model.Identifier; import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Reference; -import org.hl7.fhir.r4.model.Task; import org.springframework.beans.factory.InitializingBean; import java.net.URI; -import java.util.function.Supplier; import static java.lang.String.format; @@ -27,11 +23,11 @@ public SelectResponseTarget(ProcessPluginApi api) { @Override protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception { - Task task = variables.getStartTask(); - String correlationKey = api.getTaskHelper() + var task = variables.getStartTask(); + var correlationKey = api.getTaskHelper() .getFirstInputParameterStringValue(task, BpmnMessage.URL, BpmnMessage.Codes.CORRELATION_KEY).get(); - Identifier organizationIdentifier = task.getRequester().getIdentifier(); - Endpoint endpoint = api.getOrganizationProvider() + var organizationIdentifier = task.getRequester().getIdentifier(); + var endpoint = api.getOrganizationProvider() .getOrganization(organizationIdentifier) .map(Organization::getEndpointFirstRep) .map(Reference::getReference) @@ -40,17 +36,11 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw String path = URI.create(r).getPath(); return client.read(Endpoint.class, path.substring(path.lastIndexOf("/") + 1)); }) - .orElseThrow(new Supplier() { + .orElseThrow(() -> new IllegalArgumentException( + format("No endpoint found for organization with identifier '%s'", + organizationIdentifier.getValue()))); - @Override - public Exception get() { - return new IllegalArgumentException( - format("No endpoint found for organization with identifier '%s'", - organizationIdentifier.getValue())); - } - }); - - Target target = variables.createTarget(organizationIdentifier.getValue(), + var target = variables.createTarget(organizationIdentifier.getValue(), endpoint.getIdentifierFirstRep().getValue(), endpoint.getAddress(), correlationKey); variables.setTarget(target); diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettings.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettings.java similarity index 68% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettings.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettings.java index d7bf8e1..a4e2c1f 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettings.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettings.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProvider; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProvider; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -9,10 +9,10 @@ import java.util.Objects; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_EPSILON; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_SENSITIVITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_STRATEGY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_EPSILON; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_SENSITIVITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_STRATEGY; public class SetupEvaluationSettings extends AbstractServiceDelegate implements InitializingBean { diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResources.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResources.java similarity index 85% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResources.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResources.java index dd9743d..c583e14 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResources.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResources.java @@ -1,8 +1,8 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.client.api.IGenericClient; -import de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility; +import de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; import dev.dsf.bpe.v1.variables.Variables; @@ -16,8 +16,8 @@ import java.util.Objects; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_LIBRARY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_LIBRARY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; public class StoreFeasibilityResources extends AbstractServiceDelegate implements InitializingBean { diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResult.java similarity index 77% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResult.java index 218ab0f..c1e042f 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResult.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResult.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; @@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static dev.dsf.fhir.authorization.read.ReadAccessHelper.READ_ACCESS_TAG_VALUE_LOCAL; /** @@ -38,12 +38,12 @@ public StoreLiveResult(ProcessPluginApi api) { @Override protected void doExecute(DelegateExecution execution, Variables variables) { - Task task = variables.getLatestTask(); + var task = variables.getLatestTask(); - MeasureReport measureReport = (MeasureReport) execution.getVariableLocal(VARIABLE_MEASURE_REPORT); + var measureReport = (MeasureReport) execution.getVariableLocal(VARIABLE_MEASURE_REPORT); addReadAccessTag(measureReport); - MeasureReport storedMeasureReport = storeMeasureReport(measureReport); + var storedMeasureReport = storeMeasureReport(measureReport); addMeasureReportReferenceToTaskOutput(task, storedMeasureReport.getIdElement()); logger.info("Added measure report {} to {}", storedMeasureReport.getId(), task.getId()); } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReport.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReport.java similarity index 77% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReport.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReport.java index da2023d..431ae87 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReport.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReport.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; @@ -14,9 +14,9 @@ import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; public class StoreMeasureReport extends AbstractServiceDelegate implements InitializingBean { @@ -38,7 +38,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) { referenceZarsMeasure(measureReport, associatedMeasure); stripEvaluatedResources(measureReport); - IdType measureReportId = storeMeasureReport(measureReport); + var measureReportId = storeMeasureReport(measureReport); logger.debug("Stored MeasureReport {}", measureReportId); variables.setString(VARIABLE_MEASURE_REPORT_ID, measureReportId.getValue()); @@ -46,7 +46,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) { private void addReadAccessTag(MeasureReport measureReport, Task task) { - String identifier = task.getRequester().getIdentifier().getValue(); + var identifier = task.getRequester().getIdentifier().getValue(); api.getReadAccessHelper().addOrganization(measureReport, identifier); } diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/BaseConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/BaseConfig.java similarity index 81% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/BaseConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/BaseConfig.java index 5cf7105..86803b1 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/BaseConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/BaseConfig.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.spring.config; +package de.medizininformatik_initiative.process.feasibility.spring.config; import ca.uhn.fhir.context.FhirContext; import org.apache.http.ssl.SSLContexts; @@ -22,13 +22,13 @@ @Configuration public class BaseConfig { - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_path:#{null}}") private String trustStorePath; + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.trust_store_path:#{null}}") private String trustStorePath; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_password:#{null}}") private String trustStorePassword; + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.trust_store_password:#{null}}") private String trustStorePassword; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.key_store_path:#{null}}") private String keyStorePath; + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.key_store_path:#{null}}") private String keyStorePath; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.client.store.key_store_password:#{null}}") private String keyStorePassword; + @Value("${de.medizininformatik_initiative.process.feasibility.client.store.key_store_password:#{null}}") private String keyStorePassword; @Bean @Qualifier("base") diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/DefaultTrustStoreUtils.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/DefaultTrustStoreUtils.java similarity index 75% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/DefaultTrustStoreUtils.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/DefaultTrustStoreUtils.java index 0e5b7fd..87b1a70 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/DefaultTrustStoreUtils.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/DefaultTrustStoreUtils.java @@ -1,7 +1,5 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.spring.config; -import java.io.File; +package de.medizininformatik_initiative.process.feasibility.spring.config; import java.io.IOException; -import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -21,29 +19,29 @@ public static KeyStore loadDefaultTrustStore() { String type = null; String password = null; - String locationProperty = System.getProperty("javax.net.ssl.trustStore"); + var locationProperty = System.getProperty("javax.net.ssl.trustStore"); if ((null != locationProperty) && (locationProperty.length() > 0)) { - Path p = Paths.get(locationProperty); - File f = p.toFile(); + var p = Paths.get(locationProperty); + var f = p.toFile(); if (f.exists() && f.isFile() && f.canRead()) { location = p; } } else { - String javaHome = System.getProperty("java.home"); + var javaHome = System.getProperty("java.home"); location = Paths.get(javaHome, "lib", "security", "jssecacerts"); if (!location.toFile().exists()) { location = Paths.get(javaHome, "lib", "security", "cacerts"); } } - String passwordProperty = System.getProperty("javax.net.ssl.trustStorePassword"); + var passwordProperty = System.getProperty("javax.net.ssl.trustStorePassword"); if ((null != passwordProperty) && (passwordProperty.length() > 0)) { password = passwordProperty; } else { password = "changeit"; } - String typeProperty = System.getProperty("javax.net.ssl.trustStoreType"); + var typeProperty = System.getProperty("javax.net.ssl.trustStoreType"); if ((null != typeProperty) && (typeProperty.length() > 0)) { type = passwordProperty; } else { @@ -57,7 +55,7 @@ public static KeyStore loadDefaultTrustStore() { throw new RuntimeException(e); } - try (InputStream is = Files.newInputStream(location)) { + try (var is = Files.newInputStream(location)) { trustStore.load(is, password.toCharArray()); } catch (IOException | CertificateException diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EnhancedFhirWebserviceClientProviderConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EnhancedFhirWebserviceClientProviderConfig.java similarity index 69% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EnhancedFhirWebserviceClientProviderConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EnhancedFhirWebserviceClientProviderConfig.java index 2811048..2126c4e 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EnhancedFhirWebserviceClientProviderConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EnhancedFhirWebserviceClientProviderConfig.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.spring.config; +package de.medizininformatik_initiative.process.feasibility.spring.config; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProviderImpl; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProviderImpl; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EvaluationConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EvaluationConfig.java similarity index 52% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EvaluationConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EvaluationConfig.java index d1d17a7..b7ca4b9 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/EvaluationConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/EvaluationConfig.java @@ -1,8 +1,8 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.spring.config; +package de.medizininformatik_initiative.process.feasibility.spring.config; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProviderImpl; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationStrategy; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProvider; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProviderImpl; +import de.medizininformatik_initiative.process.feasibility.EvaluationStrategy; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,22 +12,22 @@ @Configuration public class EvaluationConfig { - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy:cql}") + @Value("${de.medizininformatik_initiative.process.feasibility.evaluation.strategy:cql}") private String evaluationStrategy; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.evaluation.obfuscate:true}") + @Value("${de.medizininformatik_initiative.process.feasibility.evaluation.obfuscate:true}") private boolean obfuscateEvaluationResult; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.evaluation.obfuscation.sensitivity:1.0}") + @Value("${de.medizininformatik_initiative.process.feasibility.evaluation.obfuscation.sensitivity:1.0}") private double obfuscationLaplaceSensitivity; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.evaluation.obfuscation.epsilon:0.5}") + @Value("${de.medizininformatik_initiative.process.feasibility.evaluation.obfuscation.epsilon:0.5}") private double obfuscationLaplaceEpsilon; - @Value("${de.medizininformatik_initiative.feasibility_dsf_process.rate.limit.count:999}") + @Value("${de.medizininformatik_initiative.process.feasibility.rate.limit.count:999}") private Integer rateLimitCount; - @Value("#{T(java.time.Duration).parse('${de.medizininformatik_initiative.feasibility_dsf_process.rate.limit.interval.duration:PT1H}')}") + @Value("#{T(java.time.Duration).parse('${de.medizininformatik_initiative.process.feasibility.rate.limit.interval.duration:PT1H}')}") private Duration rateLimitTimeIntervalDuration; @Bean diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/FeasibilityConfig.java similarity index 69% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/FeasibilityConfig.java index 1d712ad..0b81a7a 100755 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/spring/config/FeasibilityConfig.java @@ -1,33 +1,33 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.spring.config; +package de.medizininformatik_initiative.process.feasibility.spring.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.client.api.IGenericClient; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProviderImpl; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.FeasibilityCachingLaplaceCountObfuscator; -import de.medizininformatik_initiative.feasibility_dsf_process.FeasibilityProcessPluginDeploymentStateListener; -import de.medizininformatik_initiative.feasibility_dsf_process.Obfuscator; -import de.medizininformatik_initiative.feasibility_dsf_process.RateLimit; -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient; -import de.medizininformatik_initiative.feasibility_dsf_process.client.listener.SetCorrelationKeyListener; -import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicRequest; -import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicResponse; -import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadFeasibilityResources; -import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport; -import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateCqlMeasure; -import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateRequestRate; -import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateStructuredQueryMeasure; -import de.medizininformatik_initiative.feasibility_dsf_process.service.FeasibilityResourceCleaner; -import de.medizininformatik_initiative.feasibility_dsf_process.service.LogReceiveTimeout; -import de.medizininformatik_initiative.feasibility_dsf_process.service.ObfuscateEvaluationResult; -import de.medizininformatik_initiative.feasibility_dsf_process.service.RateLimitExceededTaskRejecter; -import de.medizininformatik_initiative.feasibility_dsf_process.service.SelectRequestTargets; -import de.medizininformatik_initiative.feasibility_dsf_process.service.SelectResponseTarget; -import de.medizininformatik_initiative.feasibility_dsf_process.service.SetupEvaluationSettings; -import de.medizininformatik_initiative.feasibility_dsf_process.service.StoreFeasibilityResources; -import de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult; -import de.medizininformatik_initiative.feasibility_dsf_process.service.StoreMeasureReport; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProviderImpl; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProvider; +import de.medizininformatik_initiative.process.feasibility.FeasibilityCachingLaplaceCountObfuscator; +import de.medizininformatik_initiative.process.feasibility.FeasibilityProcessPluginDeploymentStateListener; +import de.medizininformatik_initiative.process.feasibility.Obfuscator; +import de.medizininformatik_initiative.process.feasibility.RateLimit; +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClient; +import de.medizininformatik_initiative.process.feasibility.client.listener.SetCorrelationKeyListener; +import de.medizininformatik_initiative.process.feasibility.message.SendDicRequest; +import de.medizininformatik_initiative.process.feasibility.message.SendDicResponse; +import de.medizininformatik_initiative.process.feasibility.service.DownloadFeasibilityResources; +import de.medizininformatik_initiative.process.feasibility.service.DownloadMeasureReport; +import de.medizininformatik_initiative.process.feasibility.service.EvaluateCqlMeasure; +import de.medizininformatik_initiative.process.feasibility.service.EvaluateRequestRate; +import de.medizininformatik_initiative.process.feasibility.service.EvaluateStructuredQueryMeasure; +import de.medizininformatik_initiative.process.feasibility.service.FeasibilityResourceCleaner; +import de.medizininformatik_initiative.process.feasibility.service.LogReceiveTimeout; +import de.medizininformatik_initiative.process.feasibility.service.ObfuscateEvaluationResult; +import de.medizininformatik_initiative.process.feasibility.service.RateLimitExceededTaskRejecter; +import de.medizininformatik_initiative.process.feasibility.service.SelectRequestTargets; +import de.medizininformatik_initiative.process.feasibility.service.SelectResponseTarget; +import de.medizininformatik_initiative.process.feasibility.service.SetupEvaluationSettings; +import de.medizininformatik_initiative.process.feasibility.service.StoreFeasibilityResources; +import de.medizininformatik_initiative.process.feasibility.service.StoreLiveResult; +import de.medizininformatik_initiative.process.feasibility.service.StoreMeasureReport; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import org.springframework.beans.factory.annotation.Autowired; diff --git a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/variables/ConstantsFeasibility.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/variables/ConstantsFeasibility.java similarity index 95% rename from feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/variables/ConstantsFeasibility.java rename to mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/variables/ConstantsFeasibility.java index e361a26..eb62fe7 100644 --- a/feasibility-dsf-process/src/main/java/de/medizininformatik_initiative/feasibility_dsf_process/variables/ConstantsFeasibility.java +++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/variables/ConstantsFeasibility.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.variables; +package de.medizininformatik_initiative.process.feasibility.variables; import org.joda.time.LocalDate; diff --git a/mii-process-feasibility/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition b/mii-process-feasibility/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition new file mode 100644 index 0000000..5a09dfe --- /dev/null +++ b/mii-process-feasibility/src/main/resources/META-INF/services/dev.dsf.bpe.v1.ProcessPluginDefinition @@ -0,0 +1 @@ +de.medizininformatik_initiative.process.feasibility.FeasibilityProcessPluginDefinition diff --git a/feasibility-dsf-process/src/main/resources/app.properties b/mii-process-feasibility/src/main/resources/app.properties similarity index 100% rename from feasibility-dsf-process/src/main/resources/app.properties rename to mii-process-feasibility/src/main/resources/app.properties diff --git a/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn b/mii-process-feasibility/src/main/resources/bpe/feasibilityExecute.bpmn similarity index 94% rename from feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn rename to mii-process-feasibility/src/main/resources/bpe/feasibilityExecute.bpmn index 96f46ac..1866322 100755 --- a/feasibility-dsf-process/src/main/resources/bpe/feasibilityExecute.bpmn +++ b/mii-process-feasibility/src/main/resources/bpe/feasibilityExecute.bpmn @@ -5,25 +5,25 @@ Flow_1f6bge9 - + Flow_0h1fgqi Flow_11cnoe1 - + Flow_11lpcfm SequenceFlow_0ascyjc - + Flow_1cad9ed Flow_1qdam0i - + Flow_09g5hz4 Flow_1cad9ed - + Flow_1lvwaa9 Flow_10dmu4o Flow_11lpcfm @@ -40,15 +40,15 @@ ${execution.getVariable('evaluation-strategy')=='structured-query'} - + Flow_0gowl5w Flow_1cs9290 - + Flow_0r37nze Flow_10dmu4o - + Flow_1f6bge9 Flow_07fkz0p @@ -67,7 +67,7 @@ ${execution.getVariable('evaluation-obfuscation')==false} - + Flow_07fkz0p Flow_0js57at @@ -79,7 +79,7 @@ ${execution.getVariable('request-rate-below-limit')} - + Flow_0ug5qml Flow_1gqxni9 @@ -98,7 +98,7 @@ R3/PT5S SequenceFlow_0ascyjc - + http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|#{version} diff --git a/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn b/mii-process-feasibility/src/main/resources/bpe/feasibilityRequest.bpmn similarity index 96% rename from feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn rename to mii-process-feasibility/src/main/resources/bpe/feasibilityRequest.bpmn index b8e27e1..ee542fb 100755 --- a/feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn +++ b/mii-process-feasibility/src/main/resources/bpe/feasibilityRequest.bpmn @@ -5,7 +5,7 @@ SequenceFlow_11k77gx - + SequenceFlow_11k77gx Flow_0j3kdv8 @@ -22,11 +22,11 @@ - + Flow_1oq6cy1 Flow_097xx9e - + Flow_02h2l8y Flow_1oq6cy1 @@ -45,7 +45,7 @@ Flow_1d7lpns Flow_1whfhqu - + http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-execute|#{version} @@ -68,7 +68,7 @@ - + Flow_02yveoj Flow_0uyhw70 @@ -83,7 +83,7 @@ - + Flow_0pq3j9e Flow_0gkh900 diff --git a/feasibility-dsf-process/src/main/resources/fhir/ActivityDefinition/feasibilityExecute.xml b/mii-process-feasibility/src/main/resources/fhir/ActivityDefinition/feasibilityExecute.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/ActivityDefinition/feasibilityExecute.xml rename to mii-process-feasibility/src/main/resources/fhir/ActivityDefinition/feasibilityExecute.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/ActivityDefinition/feasibilityRequest.xml b/mii-process-feasibility/src/main/resources/fhir/ActivityDefinition/feasibilityRequest.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/ActivityDefinition/feasibilityRequest.xml rename to mii-process-feasibility/src/main/resources/fhir/ActivityDefinition/feasibilityRequest.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/CodeSystem/feasibility.xml b/mii-process-feasibility/src/main/resources/fhir/CodeSystem/feasibility.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/CodeSystem/feasibility.xml rename to mii-process-feasibility/src/main/resources/fhir/CodeSystem/feasibility.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-extension-dic.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-extension-dic.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-extension-dic.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-extension-dic.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-library.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-library.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-library.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-library.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-measure-report.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-measure-report.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-measure-report.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-measure-report.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-measure.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-measure.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-measure.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-measure.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-execute.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-execute.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-execute.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-execute.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-request.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-request.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-request.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-request.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-single-dic-result.xml b/mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-single-dic-result.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/StructureDefinition/feasibility-task-single-dic-result.xml rename to mii-process-feasibility/src/main/resources/fhir/StructureDefinition/feasibility-task-single-dic-result.xml diff --git a/feasibility-dsf-process/src/main/resources/fhir/ValueSet/feasibility.xml b/mii-process-feasibility/src/main/resources/fhir/ValueSet/feasibility.xml similarity index 100% rename from feasibility-dsf-process/src/main/resources/fhir/ValueSet/feasibility.xml rename to mii-process-feasibility/src/main/resources/fhir/ValueSet/feasibility.xml diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImplTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImplTest.java similarity index 71% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImplTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImplTest.java index 0c563d6..edeaa25 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EnhancedFhirWebserviceClientProviderImplTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EnhancedFhirWebserviceClientProviderImplTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import dev.dsf.fhir.client.FhirWebserviceClient; @@ -27,46 +27,46 @@ public class EnhancedFhirWebserviceClientProviderImplTest { @Test public void testGetWebserviceClientByReference_Local() { - IdType idType = new IdType("Something/id-123456"); + var idType = new IdType("Something/id-123456"); when(clientProvider.getLocalWebserviceClient()) .thenReturn(client); - FhirWebserviceClient webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(idType); + var webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(idType); assertSame(client, webserviceClient); } @Test public void testGetWebserviceClientByReference_ReferenceUrlEqualsLocalBaseUrl() { - IdType localIdType = new IdType(FULL_URL); + var localIdType = new IdType(FULL_URL); when(clientProvider.getLocalWebserviceClient()).thenReturn(client); when(client.getBaseUrl()).thenReturn(BASE_URL); - final FhirWebserviceClient webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(localIdType); + final var webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(localIdType); assertSame(client, webserviceClient); } @Test public void testGetWebserviceClientByReference_Remote() { - IdType idType = new IdType("http://remote.host/Something/id-123456"); + var idType = new IdType("http://remote.host/Something/id-123456"); when(clientProvider.getLocalWebserviceClient()).thenReturn(client); when(clientProvider.getWebserviceClient("http://remote.host")) .thenReturn(client); - FhirWebserviceClient webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(idType); + var webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClientByReference(idType); assertSame(client, webserviceClient); } @Test public void testGetLocalBaseUrl() { - String baseUrl = "http://localhost"; + var baseUrl = "http://localhost"; when(clientProvider.getLocalWebserviceClient()).thenReturn(client); when(client.getBaseUrl()).thenReturn(baseUrl); - String localBaseUrl = enhancedFhirWebserviceClientProvider.getLocalBaseUrl(); + var localBaseUrl = enhancedFhirWebserviceClientProvider.getLocalBaseUrl(); assertEquals(baseUrl, localBaseUrl); } @@ -76,7 +76,7 @@ public void testGetLocalWebserviceClient() { when(clientProvider.getLocalWebserviceClient()) .thenReturn(client); - FhirWebserviceClient webserviceClient = enhancedFhirWebserviceClientProvider.getLocalWebserviceClient(); + var webserviceClient = enhancedFhirWebserviceClientProvider.getLocalWebserviceClient(); assertSame(client, webserviceClient); } @@ -85,7 +85,7 @@ public void testGetLocalWebserviceClient() { public void testGetWebserviceClient() { when(clientProvider.getWebserviceClient(FULL_URL)) .thenReturn(client); - FhirWebserviceClient webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClient(FULL_URL); + var webserviceClient = enhancedFhirWebserviceClientProvider.getWebserviceClient(FULL_URL); assertSame(client, webserviceClient); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImplTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImplTest.java similarity index 96% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImplTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImplTest.java index 3382f16..cbb8a97 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationSettingsProviderImplTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationSettingsProviderImplTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import org.junit.jupiter.api.DisplayName; @@ -40,7 +40,7 @@ public void testEvaluationResultObfuscationDisabled() { @Test @DisplayName("is returned value of rate limit time interval seconds equal to input") public void rateLimitTimeInterval() { - Duration duration = ofSeconds(134651); + var duration = ofSeconds(134651); EvaluationSettingsProvider provider = new EvaluationSettingsProviderImpl(EvaluationStrategy.CQL, false, 1d, 0d, 0, duration); assertEquals(duration, provider.getRateLimitTimeIntervalDuration()); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategyTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategyTest.java similarity index 93% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategyTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategyTest.java index 31c213c..a1d1bc6 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/EvaluationStrategyTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/EvaluationStrategyTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import org.junit.jupiter.api.Test; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscatorTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscatorTest.java similarity index 92% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscatorTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscatorTest.java index b42b46e..b6177ef 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityCachingLaplaceCountObfuscatorTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityCachingLaplaceCountObfuscatorTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -32,8 +32,8 @@ public void setUp() { @Test @DisplayName("obfuscated result is rounded to nearest tens") public void checkIfObfuscatedResultIsNearestTens() { - int result = 490715; - Integer obfuscatedResult = obfuscator.obfuscate(result); + var result = 490715; + var obfuscatedResult = obfuscator.obfuscate(result); assertTrue(obfuscatedResult % 10 == 0, "obfuscated result is not rounded to tens"); assertTrue(Math.abs(result - obfuscatedResult) < 10, "obfuscated result is not rounded to nearest tens"); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListenerTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListenerTest.java similarity index 75% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListenerTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListenerTest.java index 93372a2..8fb13d7 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/FeasibilityProcessPluginDeploymentStateListenerTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/FeasibilityProcessPluginDeploymentStateListenerTest.java @@ -1,9 +1,9 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.gclient.IFetchConformanceTyped; import ca.uhn.fhir.rest.gclient.IFetchConformanceUntyped; -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient; +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClient; import org.hl7.fhir.r4.model.CapabilityStatement; import org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementSoftwareComponent; import org.junit.jupiter.api.AfterEach; @@ -19,8 +19,8 @@ import java.io.PrintStream; import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.FEASIBILITY_REQUEST_PROCESS_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.FEASIBILITY_EXECUTE_PROCESS_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.FEASIBILITY_REQUEST_PROCESS_ID; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -57,7 +57,7 @@ void restoreStreams() { @Test @DisplayName("connection test is not executed when no process is deployed.") void noConnectionTestIfNoProcessDeployed() throws Exception { - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.CQL, storeClient, flareClient); listener.onProcessesDeployed(List.of()); @@ -68,7 +68,7 @@ void noConnectionTestIfNoProcessDeployed() throws Exception { @Test @DisplayName("connection test is not executed when 'feasibilityExecute' process is not deployed.") void noConnectionTestIfExecuteProcessIsNotDeployed() throws Exception { - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.CQL, storeClient, flareClient); listener.onProcessesDeployed(List.of("foo", FEASIBILITY_REQUEST_PROCESS_ID, "bar")); @@ -80,7 +80,7 @@ void noConnectionTestIfExecuteProcessIsNotDeployed() throws Exception { @DisplayName("flare client connection test succeeds when evaluation strategy is 'structured-query' and no error occurs") void flareClientConnectionTestSucceeds() throws Exception { - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.STRUCTURED_QUERY, storeClient, flareClient); listener.onProcessesDeployed(List.of(FEASIBILITY_EXECUTE_PROCESS_ID)); @@ -92,17 +92,17 @@ void flareClientConnectionTestSucceeds() throws Exception { @Test @DisplayName("store client connection test succeeds when evaluation strategy is 'cql' and no error occurs") void storeClientConnectionTestSucceeds() throws Exception { - String softwareName = "software-213030"; - String softwareVersion = "version-213136"; - CapabilityStatementSoftwareComponent software = new CapabilityStatementSoftwareComponent() + var softwareName = "software-213030"; + var softwareVersion = "version-213136"; + var software = new CapabilityStatementSoftwareComponent() .setName(softwareName) .setVersion(softwareVersion); - CapabilityStatement statement = new CapabilityStatement().setSoftware(software); + var statement = new CapabilityStatement().setSoftware(software); when(storeClient.capabilities()).thenReturn(untypedFetch); when(untypedFetch.ofType(CapabilityStatement.class)).thenReturn(typedFetch); when(typedFetch.execute()).thenReturn(statement); - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.CQL, storeClient, flareClient); listener.onProcessesDeployed(List.of(FEASIBILITY_EXECUTE_PROCESS_ID)); @@ -113,10 +113,10 @@ void storeClientConnectionTestSucceeds() throws Exception { @Test @DisplayName("flare client connection test fails when evaluation strategy is 'structured-query' and error occurs") void flareClientConnectionTestFails() throws Exception { - String errorMessage = "error-223236"; - IOException exception = new IOException(errorMessage); + var errorMessage = "error-223236"; + var exception = new IOException(errorMessage); doThrow(exception).when(flareClient).testConnection(); - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.STRUCTURED_QUERY, storeClient, flareClient); listener.onProcessesDeployed(List.of(FEASIBILITY_EXECUTE_PROCESS_ID)); @@ -128,13 +128,13 @@ void flareClientConnectionTestFails() throws Exception { @Test @DisplayName("store client connection test fails when evaluation strategy is 'cql' and error occurs") void storeClientConnectionTestFails() throws Exception { - String errorMessage = "error-223622"; - RuntimeException exception = new RuntimeException(errorMessage); + var errorMessage = "error-223622"; + var exception = new RuntimeException(errorMessage); when(storeClient.capabilities()).thenReturn(untypedFetch); when(untypedFetch.ofType(CapabilityStatement.class)).thenReturn(typedFetch); doThrow(exception).when(typedFetch).execute(); - FeasibilityProcessPluginDeploymentStateListener listener = new FeasibilityProcessPluginDeploymentStateListener( + var listener = new FeasibilityProcessPluginDeploymentStateListener( EvaluationStrategy.CQL, storeClient, flareClient); listener.onProcessesDeployed(List.of(FEASIBILITY_EXECUTE_PROCESS_ID)); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimitTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/RateLimitTest.java similarity index 77% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimitTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/RateLimitTest.java index c435df1..aad1457 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/RateLimitTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/RateLimitTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process; +package de.medizininformatik_initiative.process.feasibility; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class RateLimitTest { @Test @DisplayName("once the limit has been exceeded it stays exceeded") void noResetLimit() throws Exception { - RateLimit rateLimit = new RateLimit(1, Duration.ofSeconds(1)); + var rateLimit = new RateLimit(1, Duration.ofSeconds(1)); assertTrue(rateLimit.countRequestAndCheckLimit()); assertFalse(rateLimit.countRequestAndCheckLimit()); @@ -27,7 +27,7 @@ void noResetLimit() throws Exception { @Test @DisplayName("if the inital limit is 0 it stays exceeded from the first check") void initialLimitIsZero() throws Exception { - RateLimit rateLimit = new RateLimit(0, Duration.ofSeconds(1)); + var rateLimit = new RateLimit(0, Duration.ofSeconds(1)); assertFalse(rateLimit.countRequestAndCheckLimit()); @@ -39,15 +39,15 @@ void initialLimitIsZero() throws Exception { @Test @DisplayName("rate gets reset after time interval") void countGetsResetAfterTimeRunsOut() throws Exception { - RateLimit rateLimit = new RateLimit(10, Duration.ofSeconds(1)); + var rateLimit = new RateLimit(10, Duration.ofSeconds(1)); - for (int i = 0; i < 10; i++) { + for (var i = 0; i < 10; i++) { assertTrue(rateLimit.countRequestAndCheckLimit()); } sleep(1100); - for (int i = 0; i < 10; i++) { + for (var i = 0; i < 10; i++) { assertTrue(rateLimit.countRequestAndCheckLimit()); } } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplBaseIT.java similarity index 94% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplBaseIT.java index c036693..c6e6b3b 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplBaseIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java similarity index 77% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java index ce01aad..59fa16c 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -43,17 +43,17 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = forwardProxy.getHost(); var proxyPort = forwardProxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> "http://flare:8080/"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.host", () -> proxyHost); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.port", () -> proxyPort); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.username", () -> "test"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.password", () -> "bar"); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java similarity index 81% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java index 7e44dae..11a4462 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -59,19 +59,19 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = forwardProxy.getHost(); var proxyPort = forwardProxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> "http://proxy:8080/"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.host", () -> proxyHost); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.port", () -> proxyPort); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.username", () -> "test"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.password", () -> "bar"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.bearer.token", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.bearer.token", () -> bearerToken); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java similarity index 81% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java index ca2fd24..5d643e5 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -64,21 +64,21 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = forwardProxy.getHost(); var proxyPort = forwardProxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> "https://proxy:8443/"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_path", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_path", () -> trustStoreFile.getPath()); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_password", () -> "changeit"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.host", () -> proxyHost); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.port", () -> proxyPort); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.username", () -> "test"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.password", () -> "bar"); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyIT.java similarity index 81% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyIT.java index f1173cc..3118b3b 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdProxyIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -41,13 +41,13 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = forwardProxy.getHost(); var proxyPort = forwardProxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> "http://flare:8080/"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.host", () -> proxyHost); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.port", () -> proxyPort); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java similarity index 79% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java index ed6a3e9..03157c8 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -60,21 +60,21 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = forwardProxy.getHost(); var proxyPort = forwardProxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> "http://proxy:8080/"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.host", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.host", () -> proxyHost); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.port", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.port", () -> proxyPort); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.username", () -> "test"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.proxy.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.proxy.password", () -> "bar"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.username", () -> "test"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.password", () -> "foo"); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplNonProxyIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplNonProxyIT.java similarity index 84% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplNonProxyIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplNonProxyIT.java index 1ca8817..51e4b8c 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplNonProxyIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplNonProxyIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -27,9 +27,9 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var flareHost = flare.getHost(); var flarePort = flare.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("http://%s:%s/", flareHost, flarePort)); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java similarity index 85% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java index d77a879..ebb289b 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -51,13 +51,13 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = proxy.getHost(); var proxyPort = proxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("http://%s:%s/", proxyHost, proxyPort)); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.username", () -> basicAuthUsername); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.password", () -> basicAuthPassword); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java similarity index 87% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java index d1959d4..1fb560a 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -50,11 +50,11 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = proxy.getHost(); var proxyPort = proxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("http://%s:%s/", proxyHost, proxyPort)); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.bearer.token", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.bearer.token", () -> bearerToken); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java similarity index 82% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java index 608a7d3..65f2098 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -56,17 +56,17 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = proxy.getHost(); var proxyPort = proxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("https://%s:%s/", proxyHost, proxyPort)); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_path", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_path", () -> trustStoreFile.getPath()); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_password", () -> "changeit"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.username", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.username", () -> basicAuthUsername); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.auth.basic.password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.auth.basic.password", () -> basicAuthPassword); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java similarity index 81% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java index cd7c3d8..5a83671 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -53,17 +53,17 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = proxy.getHost(); var proxyPort = proxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("https://%s:%s/", proxyHost, proxyPort)); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_path", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_path", () -> trustStoreFile.getPath()); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_password", () -> "changeit"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.key_store_path", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.key_store_path", () -> keyStoreFile.getPath()); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.key_store_password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.key_store_password", () -> "changeit"); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java similarity index 86% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java index 78b70a5..a423b2d 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -52,13 +52,13 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var proxyHost = proxy.getHost(); var proxyPort = proxy.getFirstMappedPort(); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("https://%s:%s/", proxyHost, proxyPort)); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_path", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_path", () -> trustStoreFile.getPath()); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.store.trust_store_password", + registry.add("de.medizininformatik_initiative.process.feasibility.client.store.trust_store_password", () -> "changeit"); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTest.java similarity index 93% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTest.java index b633e7f..8eeacba 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTest.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProviderImpl; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationStrategy; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProviderImpl; +import de.medizininformatik_initiative.process.feasibility.EvaluationStrategy; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.BasicResponseHandler; @@ -75,7 +75,7 @@ public void testRequestFeasibility() throws IOException, InterruptedException { @Test public void testBaseUrlPathIsKept() throws Exception { - String path = "/foo/bar/"; + var path = "/foo/bar/"; flareWebserviceClient = new FlareWebserviceClientImpl(httpClient, URI.create("http://foo.bar:1234" + path)); var structuredQuery = "foo".getBytes(); @@ -141,8 +141,8 @@ void testOtherEvaluationStrategyFails() throws Exception { @Test void sendErrorGetsRethrownWithAdditionalInformation() throws Exception { - byte[] structuredQuery = "foo".getBytes(); - IOException error = new IOException("error-151930"); + var structuredQuery = "foo".getBytes(); + var error = new IOException("error-151930"); when(httpClient.execute(any(HttpPost.class), any(BasicResponseHandler.class))).thenThrow(error); assertThatThrownBy(() -> { diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTimeoutsIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTimeoutsIT.java similarity index 92% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTimeoutsIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTimeoutsIT.java index f9f8d75..81f88a4 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplTimeoutsIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTimeoutsIT.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.flare; +package de.medizininformatik_initiative.process.feasibility.client.flare; import com.google.common.base.Stopwatch; import eu.rekawek.toxiproxy.Proxy; @@ -56,11 +56,11 @@ static void dynamicProperties(DynamicPropertyRegistry registry) { var flareHost = toxiproxy.getHost(); var flarePort = toxiproxy.getMappedPort(PROXY_PORT); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.timeout.connect", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.timeout.connect", () -> RANDOM_CLIENT_TIMEOUT); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.evaluation.strategy", + registry.add("de.medizininformatik_initiative.process.feasibility.evaluation.strategy", () -> "structured-query"); - registry.add("de.medizininformatik_initiative.feasibility_dsf_process.client.flare.base_url", + registry.add("de.medizininformatik_initiative.process.feasibility.client.flare.base_url", () -> String.format("http://%s:%s/", flareHost, flarePort)); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/MockServerProxyDispatcher.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/MockServerProxyDispatcher.java similarity index 97% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/MockServerProxyDispatcher.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/MockServerProxyDispatcher.java index 88cf8e7..c562a55 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/MockServerProxyDispatcher.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/MockServerProxyDispatcher.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/ProxyConfigurationTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/ProxyConfigurationTest.java similarity index 76% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/ProxyConfigurationTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/ProxyConfigurationTest.java index 324ed26..2bc1089 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/ProxyConfigurationTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/ProxyConfigurationTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.ProxyConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.ProxyConfiguration; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreAuthenticationConfigurationTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreAuthenticationConfigurationTest.java similarity index 80% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreAuthenticationConfigurationTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreAuthenticationConfigurationTest.java index 8d1a48e..eae5d8a 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreAuthenticationConfigurationTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreAuthenticationConfigurationTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientIT.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientIT.java similarity index 96% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientIT.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientIT.java index bca6a64..258c764 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/store/StoreClientIT.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientIT.java @@ -1,10 +1,10 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.client.store; +package de.medizininformatik_initiative.process.feasibility.client.store; import ca.uhn.fhir.context.FhirContext; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.ConnectionConfiguration; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.ProxyConfiguration; -import de.medizininformatik_initiative.feasibility_dsf_process.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; -import de.medizininformatik_initiative.feasibility_dsf_process.spring.config.DefaultTrustStoreUtils; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.ConnectionConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.ProxyConfiguration; +import de.medizininformatik_initiative.process.feasibility.client.store.StoreClientConfiguration.StoreAuthenticationConfiguration; +import de.medizininformatik_initiative.process.feasibility.spring.config.DefaultTrustStoreUtils; import lombok.NonNull; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResourcesTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResourcesTest.java similarity index 85% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResourcesTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResourcesTest.java index e0dc34b..3587323 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadFeasibilityResourcesTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadFeasibilityResourcesTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.TaskHelper; import dev.dsf.bpe.v1.variables.Variables; @@ -13,7 +13,6 @@ import org.hl7.fhir.r4.model.Measure; import org.hl7.fhir.r4.model.Patient; import org.hl7.fhir.r4.model.Reference; -import org.hl7.fhir.r4.model.Resource; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskStatus; import org.junit.jupiter.api.BeforeEach; @@ -30,10 +29,10 @@ import java.util.Map; import java.util.Optional; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_LIBRARY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_LIBRARY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -92,8 +91,8 @@ public void doExecute_NoMeasureReference(CapturedOutput output) { @Test public void testDoExecute_BundleWithTooFewResultEntries(CapturedOutput output) { - IdType measureRefId = new IdType("Measure/" + MEASURE_ID); - Reference measureRef = new Reference(measureRefId); + var measureRefId = new IdType("Measure/" + MEASURE_ID); + var measureRef = new Reference(measureRefId); when(variables.getTasks()).thenReturn(List.of(task)); when(task.getStatus()).thenReturn(TaskStatus.INPROGRESS); @@ -117,10 +116,10 @@ public void testDoExecute_BundleWithTooFewResultEntries(CapturedOutput output) { @Test public void testDoExecute_FirstBundleEntryIsNoMeasure(CapturedOutput output) { - IdType measureRefId = new IdType("Measure/" + MEASURE_ID); - Reference measureRef = new Reference(measureRefId); + var measureRefId = new IdType("Measure/" + MEASURE_ID); + var measureRef = new Reference(measureRefId); - Bundle bundle = new Bundle(); + var bundle = new Bundle(); bundle.addEntry().setResource(new Patient().setId("foo")); bundle.addEntry().setResource(new Patient().setId("foo")); @@ -146,10 +145,10 @@ public void testDoExecute_FirstBundleEntryIsNoMeasure(CapturedOutput output) { @Test public void testDoExecute_SecondBundleEntryIsNoLibrary(CapturedOutput output) { - IdType measureRefId = new IdType("Measure/" + MEASURE_ID); - Reference measureRef = new Reference(measureRefId); + var measureRefId = new IdType("Measure/" + MEASURE_ID); + var measureRef = new Reference(measureRefId); - Bundle bundle = new Bundle(); + var bundle = new Bundle(); bundle.addEntry().setResource(new Measure().setId("foo")); bundle.addEntry().setResource(new Measure().setId("foo")); @@ -175,12 +174,12 @@ public void testDoExecute_SecondBundleEntryIsNoLibrary(CapturedOutput output) { @Test public void testDoExecute() throws Exception { - IdType measureRefId = new IdType("Measure/" + MEASURE_ID); - Reference measureRef = new Reference(measureRefId); + var measureRefId = new IdType("Measure/" + MEASURE_ID); + var measureRef = new Reference(measureRefId); - Resource measure = new Measure().setId("foo"); - Resource library = new Library().setId("foo"); - Bundle bundle = new Bundle(); + var measure = new Measure().setId("foo"); + var library = new Library().setId("foo"); + var bundle = new Bundle(); bundle.addEntry().setResource(measure); bundle.addEntry().setResource(library); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReportTest.java similarity index 77% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReportTest.java index 2da8c66..8777088 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/DownloadMeasureReportTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/DownloadMeasureReportTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EnhancedFhirWebserviceClientProvider; +import de.medizininformatik_initiative.process.feasibility.EnhancedFhirWebserviceClientProvider; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.TaskHelper; import dev.dsf.bpe.v1.variables.Variables; @@ -25,9 +25,9 @@ import java.util.List; import java.util.Optional; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hl7.fhir.r4.model.Task.TaskStatus.FAILED; @@ -65,9 +65,9 @@ public void setUp() { @Test public void testDoExecute_MissingMeasureReportReference() throws Exception { - Task.TaskOutputComponent taskOutputComponent = new Task.TaskOutputComponent(); - String instanceId = "instanceId-241153"; - String errorMessage = "Missing measure report reference."; + var taskOutputComponent = new Task.TaskOutputComponent(); + var instanceId = "instanceId-241153"; + var errorMessage = "Missing measure report reference."; when(variables.getLatestTask()).thenReturn(task); when(taskHelper.getFirstInputParameterValue(task, CODESYSTEM_FEASIBILITY, @@ -91,13 +91,13 @@ public void testDoExecute_MissingMeasureReportReference() throws Exception { @Test public void testDoExecute() throws Exception { - Reference requesterRef = new Reference().setReference("http://localhost"); + var requesterRef = new Reference().setReference("http://localhost"); task.setRequester(requesterRef); - Reference measureReportRef = new Reference().setReference("MeasureReport/" + MEASURE_REPORT_ID); - CodeableConcept coding = new CodeableConcept(); - MeasureReport.MeasureReportGroupComponent measureReportGroup = new MeasureReport.MeasureReportGroupComponent() + var measureReportRef = new Reference().setReference("MeasureReport/" + MEASURE_REPORT_ID); + var coding = new CodeableConcept(); + var measureReportGroup = new MeasureReport.MeasureReportGroupComponent() .setCode(coding); - MeasureReport measureReport = new MeasureReport() + var measureReport = new MeasureReport() .setGroup(List.of(measureReportGroup)); when(variables.getLatestTask()).thenReturn(task); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasureTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasureTest.java similarity index 90% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasureTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasureTest.java index 066e85c..46eb7c3 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateCqlMeasureTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateCqlMeasureTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import ca.uhn.fhir.rest.client.api.IGenericClient; import dev.dsf.bpe.v1.variables.Variables; @@ -15,8 +15,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_ID; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -82,7 +82,7 @@ void testFailsOnEmptyMeasureReport() { @Test void testFailsOnMissingPopulation() { - MeasureReport report = new MeasureReport(); + var report = new MeasureReport(); report.getGroupFirstRep().setCode(new CodeableConcept().setText("foo")); when(evaluateMeasure()).thenReturn(report); @@ -92,7 +92,7 @@ void testFailsOnMissingPopulation() { @Test void testFailsOnMissingPopulationCode() { - MeasureReport report = new MeasureReport(); + var report = new MeasureReport(); report.getGroupFirstRep().getPopulationFirstRep().setCount(0); when(evaluateMeasure()).thenReturn(report); @@ -102,7 +102,7 @@ void testFailsOnMissingPopulationCode() { @Test void testFailsOnWrongPopulationCode() { - MeasureReport report = new MeasureReport(); + var report = new MeasureReport(); report.getGroupFirstRep().getPopulationFirstRep().setCode(new CodeableConcept().setText("foo")); when(evaluateMeasure()).thenReturn(report); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasureTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasureTest.java similarity index 80% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasureTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasureTest.java index 26270f2..c5f4018 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/EvaluateStructuredQueryMeasureTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/EvaluateStructuredQueryMeasureTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient; +import de.medizininformatik_initiative.process.feasibility.client.flare.FlareWebserviceClient; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.variables.Variables; import org.camunda.bpm.engine.delegate.DelegateExecution; @@ -19,9 +19,9 @@ import java.io.IOException; import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_LIBRARY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_LIBRARY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportStatus.COMPLETE; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportType.SUMMARY; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -44,8 +44,8 @@ public class EvaluateStructuredQueryMeasureTest { @Test public void testDoExecute_FailsIfStructuredQueryContentIsMissing() { - Measure measure = new Measure(); - Library library = new Library(); + var measure = new Measure(); + var library = new Library(); when(variables.getResource(VARIABLE_MEASURE)).thenReturn(measure); when(variables.getResource(VARIABLE_LIBRARY)).thenReturn(library); @@ -55,11 +55,11 @@ public void testDoExecute_FailsIfStructuredQueryContentIsMissing() { @Test public void testDoExecute_FailsIfFeasibilityCannotBeRequested() throws IOException, InterruptedException { - byte[] structuredQuery = "foo".getBytes(); + var structuredQuery = "foo".getBytes(); - Measure measure = new Measure(); + var measure = new Measure(); measure.setUrl("https://my-zars/Measure/a9d981ed-58dd-4213-9abf-cb86ab757162"); - Library library = new Library(); + var library = new Library(); library.setContent(List.of(new Attachment() .setContentType("application/json") .setData(structuredQuery))); @@ -73,11 +73,11 @@ public void testDoExecute_FailsIfFeasibilityCannotBeRequested() throws IOExcepti @Test public void testDoExecute_FailsIfLibraryDoesNotContainStructuredQuery() { - byte[] structuredQuery = "foo".getBytes(); + var structuredQuery = "foo".getBytes(); - Measure measure = new Measure(); + var measure = new Measure(); measure.setUrl("https://my-zars/Measure/a9d981ed-58dd-4213-9abf-cb86ab757162"); - Library library = new Library(); + var library = new Library(); library.setContent(List.of(new Attachment() .setContentType("text/plain") .setData(structuredQuery))); @@ -93,13 +93,13 @@ public void testDoExecute() throws IOException, InterruptedException { var structuredQuery = "foo".getBytes(); var measureRef = "https://my-zars/Measure/a9d981ed-58dd-4213-9abf-cb86ab757162"; - Measure measure = new Measure(); + var measure = new Measure(); measure.setUrl(measureRef); - Library library = new Library(); + var library = new Library(); library.setContent(List.of(new Attachment() .setContentType("application/json") .setData(structuredQuery))); - int feasibility = 10; + var feasibility = 10; when(variables.getResource(VARIABLE_MEASURE)).thenReturn(measure); when(variables.getResource(VARIABLE_LIBRARY)).thenReturn(library); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleanerTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleanerTest.java similarity index 90% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleanerTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleanerTest.java index 3b85ac2..e217aec 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/FeasibilityResourceCleanerTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/FeasibilityResourceCleanerTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import org.hl7.fhir.r4.model.Attachment; import org.hl7.fhir.r4.model.Library; @@ -8,7 +8,7 @@ import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.service.TestUtil.CQL_CONTENT_TYPE; +import static de.medizininformatik_initiative.process.feasibility.service.TestUtil.CQL_CONTENT_TYPE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.condition.MappedCondition.mappedCondition; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResultTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResultTest.java similarity index 92% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResultTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResultTest.java index b308ac5..b67d3c6 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/ObfuscateEvaluationResultTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/ObfuscateEvaluationResultTest.java @@ -1,6 +1,6 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.Obfuscator; +import de.medizininformatik_initiative.process.feasibility.Obfuscator; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; import dev.dsf.bpe.v1.service.TaskHelper; @@ -29,11 +29,11 @@ import java.util.Date; import java.util.List; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_MEASURE_POPULATION_VALUE_INITIAL_POPULATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_END; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.MEASURE_REPORT_PERIOD_START; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.hl7.fhir.r4.model.MeasureReport.MeasureReportStatus.COMPLETE; @@ -63,13 +63,7 @@ public class ObfuscateEvaluationResultTest { @BeforeEach public void setUp() { - var incrementFeasibilityCountObfuscator = new Obfuscator() { - - @Override - public Integer obfuscate(Integer value) { - return value + 1; - } - }; + var incrementFeasibilityCountObfuscator = (Obfuscator) value -> value + 1; service = new ObfuscateEvaluationResult(incrementFeasibilityCountObfuscator, api); } diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecterTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecterTest.java similarity index 96% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecterTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecterTest.java index feaa51c..946884b 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/RateLimitExceededTaskRejecterTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/RateLimitExceededTaskRejecterTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargetsTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargetsTest.java similarity index 90% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargetsTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargetsTest.java index e194b76..d7f7999 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectRequestTargetsTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectRequestTargetsTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.EndpointProvider; @@ -31,8 +31,8 @@ import java.util.List; import java.util.Optional; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -68,7 +68,7 @@ public class SelectRequestTargetsTest { @BeforeEach public void setup() { - Reference measureReference = new Reference(MEASURE_ID); + var measureReference = new Reference(MEASURE_ID); when(api.getOrganizationProvider()).thenReturn(organizationProvider); when(api.getTaskHelper()).thenReturn(taskHelper); when(variables.getStartTask()).thenReturn(task); @@ -99,11 +99,11 @@ public void testDoExecute_SingleTarget() { var endpointId = new Identifier() .setSystem("http://highmed.org/sid/endpointA-identifier") .setValue("DIC Endpoint"); - String endpointAddress = "https://dic/fhir"; + var endpointAddress = "https://dic/fhir"; var dic_endpoint = new Endpoint() .setIdentifier(List.of(endpointId)) .setAddress(endpointAddress); - String endpointReference = "reference-133340"; + var endpointReference = "reference-133340"; var organization = new Organization() .setIdentifier(List.of(organizationId)) .setEndpoint(List.of(new Reference(dic_endpoint).setReference(endpointReference))) @@ -128,12 +128,12 @@ public void testDoExecute_SingleTargetUseEndpointReferenceIdOnly() { var endpointId = new Identifier() .setSystem("http://highmed.org/sid/endpointA-identifier") .setValue("DIC Endpoint"); - String endpointAddress = "https://dic/fhir"; + var endpointAddress = "https://dic/fhir"; var dic_endpoint = new Endpoint() .setIdentifier(List.of(endpointId)) .setAddress(endpointAddress); - String endpointReferenceId = "reference-133340"; - String endpointReference = "Endpoint/" + endpointReferenceId; + var endpointReferenceId = "reference-133340"; + var endpointReference = "Endpoint/" + endpointReferenceId; var organization = new Organization() .setIdentifier(List.of(organizationId)) .setEndpoint(List.of(new Reference(dic_endpoint).setReference(endpointReference))) @@ -159,23 +159,23 @@ public void testDoExecute_MultipleTargets() { var endpointAId = new Identifier() .setSystem("http://highmed.org/sid/endpoint-identifier") .setValue("DIC 1 Endpoint"); - String endpointAAddress = "https://dic-1/fhir"; + var endpointAAddress = "https://dic-1/fhir"; var dic_1_endpoint = new Endpoint() .setIdentifier(List.of(endpointAId)) .setAddress(endpointAAddress); var endpointBId = new Identifier() .setSystem("http://highmed.org/sid/endpoint-identifier") .setValue("DIC 2 Endpoint"); - String endpointBAddress = "https://dic-2/fhir"; + var endpointBAddress = "https://dic-2/fhir"; var dic_2_endpoint = new Endpoint() .setIdentifier(List.of(endpointBId)) .setAddress(endpointBAddress); - String dic_1_endpointReference = "reference-133515"; + var dic_1_endpointReference = "reference-133515"; var organizationA = new Organization() .setIdentifier(List.of(organizationAId)) .setEndpoint(List.of(new Reference(dic_1_endpoint).setReference(dic_1_endpointReference))) .setActiveElement((BooleanType) new BooleanType().setValue(true)); - String dic_2_endpointReference = "reference-133620"; + var dic_2_endpointReference = "reference-133620"; var organizationB = new Organization() .setIdentifier(List.of(organizationBId)) .setEndpoint(List.of(new Reference(dic_2_endpoint).setReference(dic_2_endpointReference))) diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTargetTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTargetTest.java similarity index 86% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTargetTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTargetTest.java index 32b6d45..fe551d7 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SelectResponseTargetTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SelectResponseTargetTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.constants.CodeSystems.BpmnMessage; @@ -55,29 +55,29 @@ public class SelectResponseTargetTest { @Test public void testDoExecute() throws Exception { - Task task = new Task(); - Identifier organizationId = new Identifier() + var task = new Task(); + var organizationId = new Identifier() .setSystem("http://localhost/systems/sample-system") .setValue("requester-id"); - Reference requesterReference = new Reference().setIdentifier(organizationId); + var requesterReference = new Reference().setIdentifier(organizationId); task.setRequester(requesterReference); - Identifier endpointId = new Identifier() + var endpointId = new Identifier() .setSystem("http://localhost/systems/endpoint-system") .setValue("Test Endpoint"); - Endpoint endpoint = new Endpoint() + var endpoint = new Endpoint() .addIdentifier(endpointId) .setAddress("https://localhost/endpoint"); - String endpointReference = "endpoint-184410"; - Organization organization = new Organization() + var endpointReference = "endpoint-184410"; + var organization = new Organization() .setIdentifier(List.of(organizationId)) .setEndpoint(List.of(new Reference(endpoint).setReference(endpointReference))); - Target target = mock(Target.class); - Bundle bundle = new Bundle(); + var target = mock(Target.class); + var bundle = new Bundle(); bundle.addEntry().setSearch(new BundleEntrySearchComponent().setMode(SearchEntryMode.MATCH)) .setResource(organization); bundle.addEntry().setSearch(new BundleEntrySearchComponent().setMode(SearchEntryMode.INCLUDE)) .setResource(endpoint); - String correlationKey = "correlation-key-123547"; + var correlationKey = "correlation-key-123547"; when(api.getVariables(execution)).thenReturn(variables); when(variables.getStartTask()).thenReturn(task); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettingsTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettingsTest.java similarity index 63% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettingsTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettingsTest.java index b94f8a5..3b22093 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/SetupEvaluationSettingsTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/SetupEvaluationSettingsTest.java @@ -1,7 +1,7 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationSettingsProvider; -import de.medizininformatik_initiative.feasibility_dsf_process.EvaluationStrategy; +import de.medizininformatik_initiative.process.feasibility.EvaluationSettingsProvider; +import de.medizininformatik_initiative.process.feasibility.EvaluationStrategy; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.variables.Variables; import org.camunda.bpm.engine.delegate.DelegateExecution; @@ -11,10 +11,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_EPSILON; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_SENSITIVITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_EVALUATION_STRATEGY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_EPSILON; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_OBFUSCATION_LAPLACE_SENSITIVITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_EVALUATION_STRATEGY; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,9 +30,9 @@ public class SetupEvaluationSettingsTest { @Test public void testDoExecute() throws Exception { - String expectedEvaluationStrategy = "cql"; - double sensitivity = 113045d; - double epsilon = 113810d; + var expectedEvaluationStrategy = "cql"; + var sensitivity = 113045d; + var epsilon = 113810d; when(api.getVariables(execution)).thenReturn(variables); when(settingsProvider.evaluationStrategy()).thenReturn(EvaluationStrategy.CQL); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResourcesTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResourcesTest.java similarity index 92% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResourcesTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResourcesTest.java index 9fda4ae..704cb62 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreFeasibilityResourcesTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreFeasibilityResourcesTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.client.api.IGenericClient; @@ -15,7 +15,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.*; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResultTest.java similarity index 85% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResultTest.java index 3716a42..89a066c 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreLiveResultTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreLiveResultTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; @@ -24,9 +24,9 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -73,10 +73,10 @@ public void setUp() { @Test public void testDoExecute_MeasureReportReferenceIsAddedToTask() throws Exception { - MeasureReport report = new MeasureReport(); - IdType measureReportId = new IdType("e26daf2d-2d55-4f23-a7c8-4b994e3a319e"); + var report = new MeasureReport(); + var measureReportId = new IdType("e26daf2d-2d55-4f23-a7c8-4b994e3a319e"); report.setIdElement(measureReportId); - TaskOutputComponent taskOutputComponent = new TaskOutputComponent(); + var taskOutputComponent = new TaskOutputComponent(); when(execution.getVariableLocal(VARIABLE_MEASURE_REPORT)).thenReturn(measureReport); when(client.create(any(MeasureReport.class))).thenReturn(report); when(taskHelper.createOutput(refCaptor.capture(), eq(CODESYSTEM_FEASIBILITY), eq(CODESYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REFERENCE))) diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReportTest.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReportTest.java similarity index 89% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReportTest.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReportTest.java index 78497a1..096ba66 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/StoreMeasureReportTest.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/StoreMeasureReportTest.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.service.FhirWebserviceClientProvider; @@ -28,9 +28,9 @@ import java.util.List; import java.util.UUID; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; -import static de.medizininformatik_initiative.feasibility_dsf_process.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT; +import static de.medizininformatik_initiative.process.feasibility.variables.ConstantsFeasibility.VARIABLE_MEASURE_REPORT_ID; import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -69,7 +69,7 @@ public void testDoExecute() throws Exception measureReport = measureReport.setEvaluatedResource(List.of(patientRef)); var task = new Task(); - Identifier requesterId = new Identifier().setSystem("http://localhost/systems/sample-system").setValue("requester-id"); + var requesterId = new Identifier().setSystem("http://localhost/systems/sample-system").setValue("requester-id"); var requesterReference = new Reference().setIdentifier( requesterId); task.setRequester(requesterReference); diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/TestUtil.java b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/TestUtil.java similarity index 69% rename from feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/TestUtil.java rename to mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/TestUtil.java index 78b7912..6b91dc4 100644 --- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/service/TestUtil.java +++ b/mii-process-feasibility/src/test/java/de/medizininformatik_initiative/process/feasibility/service/TestUtil.java @@ -1,4 +1,4 @@ -package de.medizininformatik_initiative.feasibility_dsf_process.service; +package de.medizininformatik_initiative.process.feasibility.service; import org.assertj.core.api.Condition; diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.conf b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.conf similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.conf rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.conf diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.htpasswd b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.htpasswd similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy.htpasswd rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy.htpasswd diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy_basic_auth.conf b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy_basic_auth.conf similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/forward_proxy_basic_auth.conf rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/forward_proxy_basic_auth.conf diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/index.html b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/index.html similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/index.html rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/index.html diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/nginx.conf b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/nginx.conf similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/nginx.conf rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/nginx.conf diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy.htpasswd b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy.htpasswd similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy.htpasswd rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy.htpasswd diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_basic_auth.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_basic_auth.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_basic_auth.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_basic_auth.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_bearer_token_auth.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_bearer_token_auth.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_bearer_token_auth.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_bearer_token_auth.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls_basic_auth.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls_basic_auth.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls_basic_auth.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls_basic_auth.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls_client_cert.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls_client_cert.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/reverse_proxy_tls_client_cert.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/reverse_proxy_tls_client_cert.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/valid-structured-query.json b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/valid-structured-query.json similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/valid-structured-query.json rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/flare/valid-structured-query.json diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/.htpasswd b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/.htpasswd similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/.htpasswd rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/.htpasswd diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/fhir_metadata.json b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/fhir_metadata.json similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/fhir_metadata.json rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/fhir_metadata.json diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/forward_proxy.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/forward_proxy.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/forward_proxy.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/forward_proxy.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/index.html b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/index.html similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/index.html rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/index.html diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/nginx.conf b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/nginx.conf similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/nginx.conf rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/nginx.conf diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/reverse_proxy_client_cert.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/reverse_proxy_client_cert.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/reverse_proxy_client_cert.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/reverse_proxy_client_cert.conf.template diff --git a/feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/reverse_proxy_with_credentials.conf.template b/mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/reverse_proxy_with_credentials.conf.template similarity index 100% rename from feasibility-dsf-process/src/test/resources/de/medizininformatik_initiative/feasibility_dsf_process/client/store/reverse_proxy_with_credentials.conf.template rename to mii-process-feasibility/src/test/resources/de/medizininformatik_initiative/process/feasibility/client/store/reverse_proxy_with_credentials.conf.template diff --git a/feasibility-dsf-process/src/test/resources/log4j2.xml b/mii-process-feasibility/src/test/resources/log4j2.xml similarity index 100% rename from feasibility-dsf-process/src/test/resources/log4j2.xml rename to mii-process-feasibility/src/test/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index adff70a..59df77b 100755 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,13 @@ 4.0.0 de.medizininformatik-initiative - feasibility-dsf-process-parent + mii-process-feasibility-parent 0.0.0.0 pom - feasibility-dsf-process - feasibility-dsf-process-tools + mii-process-feasibility + mii-process-feasibility-tools @@ -21,15 +21,15 @@ 1.19.3 - MII Feasibility Processes + MII Processes Feasibility Business processes for the MII feasibility project as plugins for the HiGHmed Data Sharing Framework. - https://github.com/medizininformatik-initiative/feasibility-dsf-process + https://github.com/medizininformatik-initiative/mii-process-feasibility - scm:git:git://github.com/nmedizininformatik-initiative/feasibility-dsf-process.git - scm:git:git@github.com:medizininformatik-initiative/feasibility-dsf-process.git - https://github.com/medizininformatik-initiative/feasibility-dsf-process + scm:git:git://github.com/nmedizininformatik-initiative/mii-process-feasibility.git + scm:git:git@github.com:medizininformatik-initiative/mii-process-feasibility.git + https://github.com/medizininformatik-initiative/mii-process-feasibility @@ -193,7 +193,7 @@ - feasibility-dsf-process-docker-test-setup/dic-1/bpe/app/log + mii-process-feasibility-docker-test-setup/dic-1/bpe/app/log *.log *.log.gz @@ -201,7 +201,7 @@ false - feasibility-dsf-process-docker-test-setup/dic-1/fhir/app/log + mii-process-feasibility-docker-test-setup/dic-1/fhir/app/log *.log *.log.gz @@ -209,7 +209,7 @@ false - feasibility-dsf-process-docker-test-setup/dic-2/bpe/app/log + mii-process-feasibility-docker-test-setup/dic-2/bpe/app/log *.log *.log.gz @@ -217,7 +217,7 @@ false - feasibility-dsf-process-docker-test-setup/dic-2/fhir/app/log + mii-process-feasibility-docker-test-setup/dic-2/fhir/app/log *.log *.log.gz @@ -225,7 +225,7 @@ false - feasibility-dsf-process-docker-test-setup/zars/bpe/app/log + mii-process-feasibility-docker-test-setup/zars/bpe/app/log *.log *.log.gz @@ -233,7 +233,7 @@ false - feasibility-dsf-process-docker-test-setup/zars/fhir/app/log + mii-process-feasibility-docker-test-setup/zars/fhir/app/log *.log *.log.gz @@ -253,7 +253,7 @@ github GitHub Packages - https://maven.pkg.github.com/medizininformatik-initiative/feasibility-dsf-process + https://maven.pkg.github.com/medizininformatik-initiative/mii-process-feasibility