diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 51d61e9ad..8fde8b8e6 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -430,9 +430,9 @@ jobs: - name: Generate Javadoc run: ./mvnw -B clean javadoc:jar -pl :taskana-core,:taskana-cdi,:taskana-spring - name: Generate Rest Documentation - run: ./mvnw -B test asciidoctor:process-asciidoc -Dtest=*DocTest -pl :taskana-rest-spring,:taskana-simplehistory-rest-spring -Dcheckstyle.skip -Djacoco.skip + run: ./mvnw -B test asciidoctor:process-asciidoc -Dtest=*DocTest -pl :taskana-rest-spring,:taskana-simplehistory-rest-spring,:taskana-routing-rest -Dcheckstyle.skip -Djacoco.skip - name: Build Example Application - run: ./mvnw -B install -P history.plugin -pl :taskana-rest-spring-example-boot -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Djacoco.skip + run: ./mvnw -B install -P history.plugin -P dmn-routing.plugin -pl :taskana-rest-spring-example-boot -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Djacoco.skip - name: Verify Example Application contains documentation run: ci/verify_docs_jar.sh - name: Deploy to IBM Cloud Foundry diff --git a/ci/ibm_cf_manifest.yml b/ci/ibm_cf_manifest.yml index 354a22d69..84b0a3e67 100644 --- a/ci/ibm_cf_manifest.yml +++ b/ci/ibm_cf_manifest.yml @@ -4,5 +4,5 @@ applications: path: ../rest/taskana-rest-spring-example-boot/target/taskana-rest-spring-example-boot.jar buildpacks: - https://github.com/cloudfoundry/java-buildpack.git - memory: 640M - disk_quota: 256M + memory: 1G + disk_quota: 512M diff --git a/rest/taskana-rest-spring-example-boot/pom.xml b/rest/taskana-rest-spring-example-boot/pom.xml index aba75ab80..99fba1e80 100644 --- a/rest/taskana-rest-spring-example-boot/pom.xml +++ b/rest/taskana-rest-spring-example-boot/pom.xml @@ -128,6 +128,51 @@ + + dmn-routing.plugin + + + pro.taskana + taskana-spi-routing-dmn-router + ${project.version} + + + pro.taskana + taskana-routing-rest + ${project.version} + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.maven.resources} + + + copy-routing-rest-documentation-to-static-folder + prepare-package + + copy-resources + + + + ${project.build.outputDirectory}/static/docs/rest + + + + + ../../routing/taskana-routing-rest/target/generated-docs + + + + + + + + + + diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties index 0ae497957..5eb96124b 100644 --- a/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties +++ b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties @@ -3,6 +3,8 @@ logging.level.org.springframework.security=INFO server.servlet.context-path=/taskana +taskana.routing.dmn.upload.path=/tmp/routing.dmn + ######## Taskana DB ####### ######## h2 configuration ######## spring.datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_MODE=0 diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/dmn-table.dmn b/rest/taskana-rest-spring-example-boot/src/main/resources/dmn-table.dmn new file mode 100644 index 000000000..725027c9f --- /dev/null +++ b/rest/taskana-rest-spring-example-boot/src/main/resources/dmn-table.dmn @@ -0,0 +1,19 @@ + + + + + + + task.primaryObjRef.value + + + + + task.classificationSummary.key + task.note + + + + + + + diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties index 886dc957a..45b7a54a3 100644 --- a/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties +++ b/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties @@ -23,3 +23,5 @@ taskana.jobs.user.refresh.firstRunAt=2018-07-25T23:00:00Z taskana.german.holidays.enabled=true taskana.german.holidays.corpus-christi.enabled=true taskana.historylogger.name=AUDIT + +taskana.routing.dmn=/dmn-table.dmn diff --git a/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/DmnUploadController.java b/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/DmnUploadController.java index 1095885b5..6a5417738 100644 --- a/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/DmnUploadController.java +++ b/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/DmnUploadController.java @@ -13,7 +13,6 @@ import org.springframework.web.multipart.MultipartFile; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.routing.dmn.service.DmnConverterService; -import pro.taskana.routing.dmn.spi.internal.DmnValidatorManager; /** Controller for all DMN upload related endpoints. */ @RestController @@ -59,6 +58,6 @@ public class DmnUploadController { */ @GetMapping(path = RoutingRestEndpoints.ROUTING_REST_ENABLED) public ResponseEntity getIsRoutingRestEnabled() { - return ResponseEntity.ok(DmnValidatorManager.isDmnUploadProviderEnabled()); + return ResponseEntity.ok(true); } } diff --git a/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/RoutingRestEndpoints.java b/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/RoutingRestEndpoints.java index f086c343f..00bfe114d 100644 --- a/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/RoutingRestEndpoints.java +++ b/routing/taskana-routing-rest/src/main/java/pro/taskana/routing/dmn/rest/RoutingRestEndpoints.java @@ -6,7 +6,7 @@ public class RoutingRestEndpoints { public static final String URL_ROUTING_RULES = API_V1 + "routing-rules"; public static final String URL_ROUTING_RULES_DEFAULT = URL_ROUTING_RULES + "/default"; - public static final String ROUTING_REST_ENABLED = URL_ROUTING_RULES + "routing-rest-enabled"; + public static final String ROUTING_REST_ENABLED = URL_ROUTING_RULES + "/routing-rest-enabled"; private RoutingRestEndpoints() {} }