Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
* develop: (69 commits)
  build shaded jar, move business key to constant
  change P1W to P7D
  add missing negation
  fix possible nullpointer
  rename docker test setup according to new kds report name
  format and sort
  handle download search bundle errors
  rename report process to kds report process
  format and sort
  add component scan, fix process search, fix docker setup
  refactor kds client
  refactor build process
  do not delete the current process instance
  delete active instaces of autostart process if a new instance is started
  search for bundle instead of providing an absolute url
  move KDS client env variables to its own configuration class
  remove binary replacement in data logger
  adds missing definitions
  adds blaze issue link
  replace NamingSystem for report with organization-identifier NamingSystem
  ...
  • Loading branch information
@wetret
wetret committed Aug 1, 2022
2 parents 19267e1 + ee888eb commit ac1c24a
Show file tree
Hide file tree
Showing 163 changed files with 44,979 additions and 1,596 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###
# mii processes projectathon common ignores
# mii processes common ignores
###
**/.classpath
**/.project
Expand All @@ -9,6 +9,8 @@

**/*.iml

**/dependency-reduced-pom.xml

###
# test data generator ignores
###
Expand Down
298 changes: 298 additions & 0 deletions mii-dsf-process-kds-report/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>mii-dsf-process-kds-report</artifactId>

<parent>
<artifactId>mii-dsf-processes</artifactId>
<groupId>de.medizininformatik-initiative</groupId>
<version>0.2.0-SNAPSHOT</version>
</parent>

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-process-base</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.medizininformatik-initiative</groupId>
<artifactId>mii-dsf-processes-kds-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-documentation-generator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.hs-heilbronn.mi</groupId>
<artifactId>log4j2-utils</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-validation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-process-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<classpath/>
<argument>
org.highmed.dsf.tools.generator.DocumentationGenerator
</argument>
<argument>
de.medizininformatik_initiative.process.kds.report
</argument>
</arguments>
<includeProjectDependencies>true</includeProjectDependencies>
<addResourcesToClasspath>true</addResourcesToClasspath>
<classpathScope>compile</classpathScope>
<workingDirectory>${project.basedir}</workingDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>de.medizininformatik-initiative:mii-dsf-processes-kds-client</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-process-plugin-to-docker-test-setup/dic1</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/dic1</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/plugin
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-plugin-to-docker-test-setup/dic2</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/dic2</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/plugin
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-plugin-to-docker-test-setup/hrp</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies/hrp</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/plugin
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/process
</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic1/bpe/plugin
</directory>
<includes>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/process
</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/dic2/bpe/plugin
</directory>
<includes>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/process
</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>
../mii-dsf-processes-docker-test-setup/hrp/bpe/plugin
</directory>
<includes>
<include>hapi-fhir-client-${hapi.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project>
82 changes: 82 additions & 0 deletions .../src/main/java/de/medizininformatik_initiative/process/kds/report/ConstantsKdsReport.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package de.medizininformatik_initiative.process.kds.report;

import static de.medizininformatik_initiative.process.kds.report.KdsReportProcessPluginDefinition.VERSION;

public interface ConstantsKdsReport
{
String PROCESS_NAME_KDS_REPORT_AUTOSTART = "kdsReportAutostart";
String PROCESS_NAME_KDS_REPORT_RECEIVE = "kdsReportReceive";
String PROCESS_NAME_KDS_REPORT_SEND = "kdsReportSend";

String PROCESS_NAME_FULL_KDS_REPORT_AUTOSTART = "medizininformatik-initiativede_"
+ PROCESS_NAME_KDS_REPORT_AUTOSTART;
String PROCESS_NAME_FULL_KDS_REPORT_RECEIVE = "medizininformatik-initiativede_" + PROCESS_NAME_KDS_REPORT_RECEIVE;
String PROCESS_NAME_FULL_KDS_REPORT_SEND = "medizininformatik-initiativede_" + PROCESS_NAME_KDS_REPORT_SEND;

String BPMN_EXECUTION_VARIABLE_KDS_REPORT_TIMER_INTERVAL = "kdsReportTimerInterval";
String BPMN_EXECUTION_VARIABLE_KDS_REPORT_STOP_TIMER = "kdsReportStopTimer";
String BPMN_EXECUTION_VARIABLE_KDS_REPORT_SEARCH_BUNDLE = "kdsReportSearchBundle";
String BPMN_EXECUTION_VARIABLE_KDS_REPORT_SEARCH_BUNDLE_RESPONSE_REFERENCE = "kdsReportSearchBundleResponseReference";
String BPMN_EXECUTION_VARIABLE_KDS_REPORT_RECEIVE_ERROR = "kdsReportReceiveError";

String KDS_REPORT_TIMER_INTERVAL_DEFAULT_VALUE = "P7D";
String FHIR_STORE_TYPE_BLAZE = "blaze";

String PROFILE_KDS_REPORT_SEARCH_BUNDLE = "http://medizininformatik-initiative.de/fhir/Bundle/mii-kds-report-search-bundle"
+ "|" + VERSION;
String PROFILE_KDS_REPORT_SEARCH_BUNDLE_RESPONSE = "http://medizininformatik-initiative.de/fhir/Bundle/mii-kds-report-search-bundle-response"
+ "|" + VERSION;
String EXTENSION_KDS_REPORT_STATUS_ERROR_URL = "http://medizininformatik-initiative.de/fhir/StructureDefinition/extension-mii-kds-report-status-error";

String CODESYSTEM_MII_KDS_REPORT = "http://medizininformatik-initiative.de/fhir/CodeSystem/kds-report";
String CODESYSTEM_MII_KDS_REPORT_VALUE_SEARCH_BUNDLE = "search-bundle";
String CODESYSTEM_MII_KDS_REPORT_VALUE_SEARCH_BUNDLE_REFERENCE = "search-bundle-reference";
String CODESYSTEM_MII_KDS_REPORT_VALUE_SEARCH_BUNDLE_RESPONSE_REFERENCE = "search-bundle-response-reference";
String CODESYSTEM_MII_KDS_REPORT_VALUE_REPORT_STATUS = "kds-report-status";
String CODESYSTEM_MII_KDS_REPORT_VALUE_TIMER_INTERVAL = "timer-interval";

String CODESYSTEM_MII_KDS_REPORT_STATUS = "http://medizininformatik-initiative.de/fhir/CodeSystem/kds-report-status";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_NOT_ALLOWED = "not-allowed";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_NOT_REACHABLE = "not-reachable";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_RECEIPT_MISSING = "receipt-missing";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_RECEIPT_OK = "receipt-ok";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_RECEIPT_ERROR = "receipt-error";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_RECEIVE_OK = "receive-ok";
String CODESYSTEM_MII_KDS_REPORT_STATUS_VALUE_RECEIVE_ERROR = "receive-error";

String PROCESS_MII_URI_BASE = "http://medizininformatik-initiative.de/bpe/Process/";

String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START = "http://medizininformatik-initiative.de/fhir/StructureDefinition/mii-kds-report-task-autostart-start";
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START
+ "|" + VERSION;
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_PROCESS_URI = PROCESS_MII_URI_BASE
+ PROCESS_NAME_KDS_REPORT_AUTOSTART + "/";
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_PROCESS_URI_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_PROCESS_URI
+ VERSION;
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_START_MESSAGE_NAME = "kdsReportAutostartStart";

String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_STOP = "http://medizininformatik-initiative.de/fhir/StructureDefinition/mii-kds-report-task-autostart-stop";
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_STOP_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_STOP
+ "|" + VERSION;
String PROFILE_MII_KDS_REPORT_TASK_AUTOSTART_STOP_MESSAGE_NAME = "kdsReportAutostartStop";

String PROFILE_MII_KDS_REPORT_TASK_SEND_START = "http://medizininformatik-initiative.de/fhir/StructureDefinition/mii-kds-report-task-send-start";
String PROFILE_MII_KDS_REPORT_TASK_SEND_START_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_SEND_START + "|"
+ VERSION;
String PROFILE_MII_KDS_REPORT_TASK_SEND_START_PROCESS_URI = PROCESS_MII_URI_BASE + PROCESS_NAME_KDS_REPORT_SEND
+ "/";
String PROFILE_KDS_MII_REPORT_TASK_SEND_START_PROCESS_URI_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_SEND_START_PROCESS_URI
+ VERSION;
String PROFILE_MII_KDS_REPORT_TASK_SEND_START_MESSAGE_NAME = "kdsReportSendStart";

String PROFILE_MII_KDS_REPORT_TASK_SEND = "http://medizininformatik-initiative.de/fhir/StructureDefinition/mii-kds-report-task-send";
String PROFILE_MII_KDS_REPORT_TASK_SEND_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_SEND + "|" + VERSION;
String PROFILE_MII_KDS_REPORT_TASK_SEND_PROCESS_URI = PROCESS_MII_URI_BASE + PROCESS_NAME_KDS_REPORT_RECEIVE + "/";
String PROFILE_MII_KDS_REPORT_TASK_SEND_PROCESS_URI_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_SEND_PROCESS_URI
+ VERSION;
String PROFILE_MII_KDS_REPORT_TASK_SEND_MESSAGE_NAME = "kdsReportSend";

String PROFILE_MII_KDS_REPORT_TASK_RECEIVE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/mii-kds-report-task-receive";
String PROFILE_MII_KDS_REPORT_TASK_RECEIVE_AND_LATEST_VERSION = PROFILE_MII_KDS_REPORT_TASK_RECEIVE + "|" + VERSION;
String PROFILE_MII_KDS_REPORT_TASK_RECEIVE_MESSAGE_NAME = "kdsReportReceive";
}
Loading

0 comments on commit ac1c24a

Please sign in to comment.