From 57ba6f8a2015a5e4eee6f1e8d76b148331b7fa1b Mon Sep 17 00:00:00 2001 From: "martin.grofcik" Date: Tue, 7 Jun 2022 22:43:02 +0200 Subject: [PATCH] sonarqube example impl --- 01-project/01-first-app/pom.xml | 2 +- .../.gitignore | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 5 +- .../org/crp/training/TrainingApplication.java | 0 .../src/main/resources/application.properties | 0 .../training/TrainingApplicationTests.java | 0 .../resources/application-test.properties | 0 .../.mvn/wrapper/maven-wrapper.properties | 0 02-test/{ => 01-spring-boot-test}/HELP.md | 0 02-test/{ => 01-spring-boot-test}/README.md | 0 02-test/{ => 01-spring-boot-test}/mvnw | 0 02-test/{ => 01-spring-boot-test}/mvnw.cmd | 0 02-test/{ => 01-spring-boot-test}/pom.xml | 5 +- .../org/crp/training/TrainingApplication.java | 0 .../src/main/resources/application.properties | 0 .../org/crp/training/MySpringBootTest.java | 2 - .../resources/application-test.properties | 0 .../org/crp/training/my-process.bpmn20.xml | 0 .../.mvn/wrapper/maven-wrapper.properties | 2 + 02-test/02-sonarqube-test-coverage/HELP.md | 9 + 02-test/02-sonarqube-test-coverage/README.md | 3 + 02-test/02-sonarqube-test-coverage/mvnw | 316 ++++++++++++++++++ 02-test/02-sonarqube-test-coverage/mvnw.cmd | 188 +++++++++++ 02-test/02-sonarqube-test-coverage/pom.xml | 108 ++++++ .../org/crp/training/TrainingApplication.java | 13 + .../src/main/resources/application.properties | 147 ++++++++ .../main/resources/processes/my-process.bpmn | 23 ++ .../processes/uncovered-process.bpmn | 21 ++ .../java/org/crp/training/MyProcessTest.java | 45 +++ .../resources/application-test.properties | 7 + 03-start-usertask-end/pom.xml | 1 + 04-servicetask/pom.xml | 1 + .../org/crp/training/ServiceTaskTest.java | 39 --- 05-gateways/pom.xml | 1 + 06-listeners/pom.xml | 1 + 07-timers/pom.xml | 1 + 08-signals-and-messages/pom.xml | 1 + 09-parsing/pom.xml | 1 + 10-behavior-factory/pom.xml | 1 + 11-queries/pom.xml | 1 + 12-migration/pom.xml | 1 + .../src/main/resources/application.properties | 4 +- pom.xml | 5 +- 47 files changed, 903 insertions(+), 51 deletions(-) rename 01-project/{01-springboot-app => 02-spring-boot-app}/.gitignore (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/.mvn/wrapper/maven-wrapper.jar (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/.mvn/wrapper/maven-wrapper.properties (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/mvnw (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/mvnw.cmd (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/pom.xml (95%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/src/main/java/org/crp/training/TrainingApplication.java (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/src/main/resources/application.properties (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/src/test/java/org/crp/training/TrainingApplicationTests.java (100%) rename 01-project/{01-springboot-app => 02-spring-boot-app}/src/test/resources/application-test.properties (100%) rename 02-test/{ => 01-spring-boot-test}/.mvn/wrapper/maven-wrapper.properties (100%) rename 02-test/{ => 01-spring-boot-test}/HELP.md (100%) rename 02-test/{ => 01-spring-boot-test}/README.md (100%) rename 02-test/{ => 01-spring-boot-test}/mvnw (100%) rename 02-test/{ => 01-spring-boot-test}/mvnw.cmd (100%) rename 02-test/{ => 01-spring-boot-test}/pom.xml (94%) rename 02-test/{ => 01-spring-boot-test}/src/main/java/org/crp/training/TrainingApplication.java (100%) rename 02-test/{ => 01-spring-boot-test}/src/main/resources/application.properties (100%) rename 02-test/{ => 01-spring-boot-test}/src/test/java/org/crp/training/MySpringBootTest.java (90%) rename 02-test/{ => 01-spring-boot-test}/src/test/resources/application-test.properties (100%) rename 02-test/{ => 01-spring-boot-test}/src/test/resources/org/crp/training/my-process.bpmn20.xml (100%) create mode 100644 02-test/02-sonarqube-test-coverage/.mvn/wrapper/maven-wrapper.properties create mode 100644 02-test/02-sonarqube-test-coverage/HELP.md create mode 100644 02-test/02-sonarqube-test-coverage/README.md create mode 100644 02-test/02-sonarqube-test-coverage/mvnw create mode 100644 02-test/02-sonarqube-test-coverage/mvnw.cmd create mode 100644 02-test/02-sonarqube-test-coverage/pom.xml create mode 100644 02-test/02-sonarqube-test-coverage/src/main/java/org/crp/training/TrainingApplication.java create mode 100644 02-test/02-sonarqube-test-coverage/src/main/resources/application.properties create mode 100644 02-test/02-sonarqube-test-coverage/src/main/resources/processes/my-process.bpmn create mode 100644 02-test/02-sonarqube-test-coverage/src/main/resources/processes/uncovered-process.bpmn create mode 100644 02-test/02-sonarqube-test-coverage/src/test/java/org/crp/training/MyProcessTest.java create mode 100644 02-test/02-sonarqube-test-coverage/src/test/resources/application-test.properties diff --git a/01-project/01-first-app/pom.xml b/01-project/01-first-app/pom.xml index aba2bc3..53bf337 100644 --- a/01-project/01-first-app/pom.xml +++ b/01-project/01-first-app/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.crp.training - 01-first-app + 01.01-first-app 1.0-SNAPSHOT diff --git a/01-project/01-springboot-app/.gitignore b/01-project/02-spring-boot-app/.gitignore similarity index 100% rename from 01-project/01-springboot-app/.gitignore rename to 01-project/02-spring-boot-app/.gitignore diff --git a/01-project/01-springboot-app/.mvn/wrapper/maven-wrapper.jar b/01-project/02-spring-boot-app/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from 01-project/01-springboot-app/.mvn/wrapper/maven-wrapper.jar rename to 01-project/02-spring-boot-app/.mvn/wrapper/maven-wrapper.jar diff --git a/01-project/01-springboot-app/.mvn/wrapper/maven-wrapper.properties b/01-project/02-spring-boot-app/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from 01-project/01-springboot-app/.mvn/wrapper/maven-wrapper.properties rename to 01-project/02-spring-boot-app/.mvn/wrapper/maven-wrapper.properties diff --git a/01-project/01-springboot-app/mvnw b/01-project/02-spring-boot-app/mvnw similarity index 100% rename from 01-project/01-springboot-app/mvnw rename to 01-project/02-spring-boot-app/mvnw diff --git a/01-project/01-springboot-app/mvnw.cmd b/01-project/02-spring-boot-app/mvnw.cmd similarity index 100% rename from 01-project/01-springboot-app/mvnw.cmd rename to 01-project/02-spring-boot-app/mvnw.cmd diff --git a/01-project/01-springboot-app/pom.xml b/01-project/02-spring-boot-app/pom.xml similarity index 95% rename from 01-project/01-springboot-app/pom.xml rename to 01-project/02-spring-boot-app/pom.xml index 1644255..37ba2c5 100644 --- a/01-project/01-springboot-app/pom.xml +++ b/01-project/02-spring-boot-app/pom.xml @@ -10,9 +10,9 @@ org.crp.training - 01-springboot-app + 01.02-spring-boot-app 1.0-SNAPSHOT - 01-springboot-app + 01.02-spring-boot-app Flowable training project 1.8 @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/01-project/01-springboot-app/src/main/java/org/crp/training/TrainingApplication.java b/01-project/02-spring-boot-app/src/main/java/org/crp/training/TrainingApplication.java similarity index 100% rename from 01-project/01-springboot-app/src/main/java/org/crp/training/TrainingApplication.java rename to 01-project/02-spring-boot-app/src/main/java/org/crp/training/TrainingApplication.java diff --git a/01-project/01-springboot-app/src/main/resources/application.properties b/01-project/02-spring-boot-app/src/main/resources/application.properties similarity index 100% rename from 01-project/01-springboot-app/src/main/resources/application.properties rename to 01-project/02-spring-boot-app/src/main/resources/application.properties diff --git a/01-project/01-springboot-app/src/test/java/org/crp/training/TrainingApplicationTests.java b/01-project/02-spring-boot-app/src/test/java/org/crp/training/TrainingApplicationTests.java similarity index 100% rename from 01-project/01-springboot-app/src/test/java/org/crp/training/TrainingApplicationTests.java rename to 01-project/02-spring-boot-app/src/test/java/org/crp/training/TrainingApplicationTests.java diff --git a/01-project/01-springboot-app/src/test/resources/application-test.properties b/01-project/02-spring-boot-app/src/test/resources/application-test.properties similarity index 100% rename from 01-project/01-springboot-app/src/test/resources/application-test.properties rename to 01-project/02-spring-boot-app/src/test/resources/application-test.properties diff --git a/02-test/.mvn/wrapper/maven-wrapper.properties b/02-test/01-spring-boot-test/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from 02-test/.mvn/wrapper/maven-wrapper.properties rename to 02-test/01-spring-boot-test/.mvn/wrapper/maven-wrapper.properties diff --git a/02-test/HELP.md b/02-test/01-spring-boot-test/HELP.md similarity index 100% rename from 02-test/HELP.md rename to 02-test/01-spring-boot-test/HELP.md diff --git a/02-test/README.md b/02-test/01-spring-boot-test/README.md similarity index 100% rename from 02-test/README.md rename to 02-test/01-spring-boot-test/README.md diff --git a/02-test/mvnw b/02-test/01-spring-boot-test/mvnw similarity index 100% rename from 02-test/mvnw rename to 02-test/01-spring-boot-test/mvnw diff --git a/02-test/mvnw.cmd b/02-test/01-spring-boot-test/mvnw.cmd similarity index 100% rename from 02-test/mvnw.cmd rename to 02-test/01-spring-boot-test/mvnw.cmd diff --git a/02-test/pom.xml b/02-test/01-spring-boot-test/pom.xml similarity index 94% rename from 02-test/pom.xml rename to 02-test/01-spring-boot-test/pom.xml index b1ec8a8..76ecd0b 100644 --- a/02-test/pom.xml +++ b/02-test/01-spring-boot-test/pom.xml @@ -10,9 +10,9 @@ org.crp.training - 02-test + 02.01-spring-boot-test 1.0-SNAPSHOT - 02-test + 02.01-spring-boot-test Flowable training project 1.8 @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/02-test/src/main/java/org/crp/training/TrainingApplication.java b/02-test/01-spring-boot-test/src/main/java/org/crp/training/TrainingApplication.java similarity index 100% rename from 02-test/src/main/java/org/crp/training/TrainingApplication.java rename to 02-test/01-spring-boot-test/src/main/java/org/crp/training/TrainingApplication.java diff --git a/02-test/src/main/resources/application.properties b/02-test/01-spring-boot-test/src/main/resources/application.properties similarity index 100% rename from 02-test/src/main/resources/application.properties rename to 02-test/01-spring-boot-test/src/main/resources/application.properties diff --git a/02-test/src/test/java/org/crp/training/MySpringBootTest.java b/02-test/01-spring-boot-test/src/test/java/org/crp/training/MySpringBootTest.java similarity index 90% rename from 02-test/src/test/java/org/crp/training/MySpringBootTest.java rename to 02-test/01-spring-boot-test/src/test/java/org/crp/training/MySpringBootTest.java index a64d9d8..7b82f46 100644 --- a/02-test/src/test/java/org/crp/training/MySpringBootTest.java +++ b/02-test/01-spring-boot-test/src/test/java/org/crp/training/MySpringBootTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.flowable.cmmn.spring.impl.test.FlowableCmmnSpringExtension; -import org.flowable.engine.RepositoryService; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.runtime.ProcessInstance; diff --git a/02-test/src/test/resources/application-test.properties b/02-test/01-spring-boot-test/src/test/resources/application-test.properties similarity index 100% rename from 02-test/src/test/resources/application-test.properties rename to 02-test/01-spring-boot-test/src/test/resources/application-test.properties diff --git a/02-test/src/test/resources/org/crp/training/my-process.bpmn20.xml b/02-test/01-spring-boot-test/src/test/resources/org/crp/training/my-process.bpmn20.xml similarity index 100% rename from 02-test/src/test/resources/org/crp/training/my-process.bpmn20.xml rename to 02-test/01-spring-boot-test/src/test/resources/org/crp/training/my-process.bpmn20.xml diff --git a/02-test/02-sonarqube-test-coverage/.mvn/wrapper/maven-wrapper.properties b/02-test/02-sonarqube-test-coverage/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d8bc321 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/02-test/02-sonarqube-test-coverage/HELP.md b/02-test/02-sonarqube-test-coverage/HELP.md new file mode 100644 index 0000000..80cbfba --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/HELP.md @@ -0,0 +1,9 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.6.2/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.6.2/maven-plugin/reference/html/#build-image) + diff --git a/02-test/02-sonarqube-test-coverage/README.md b/02-test/02-sonarqube-test-coverage/README.md new file mode 100644 index 0000000..878dd27 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/README.md @@ -0,0 +1,3 @@ +Sample project for sonarqube bpm plugin. + + diff --git a/02-test/02-sonarqube-test-coverage/mvnw b/02-test/02-sonarqube-test-coverage/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/02-test/02-sonarqube-test-coverage/mvnw.cmd b/02-test/02-sonarqube-test-coverage/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/02-test/02-sonarqube-test-coverage/pom.xml b/02-test/02-sonarqube-test-coverage/pom.xml new file mode 100644 index 0000000..51186f0 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/pom.xml @@ -0,0 +1,108 @@ + + + 4.0.0 + + crp-flowable-training + org.crp.training + 1.0-SNAPSHOT + ../.. + + + org.crp.training + 02.02-sonarqube-test-coverage + 1.0-SNAPSHOT + 02.02 Sonarqube test coverage + Flowable training project + + 1.8 + src/main/resources,src/main/java + PUT_YOUR_SONARQUBE_LOGIN_HERE + target/bpmn-coverage-report.csv + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + org.flowable + flowable-spring-boot-starter-ui-task + ${flowable.version} + + + org.flowable + flowable-spring-boot-starter-ui-idm + ${flowable.version} + + + org.postgresql + postgresql + + + + com.h2database + h2 + test + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-test + test + + + + io.github.crystal-processes + crp-flowable-coverage + 0.0.4 + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.6.6 + + + + + + + + + + + + + + + + + + + + + + diff --git a/02-test/02-sonarqube-test-coverage/src/main/java/org/crp/training/TrainingApplication.java b/02-test/02-sonarqube-test-coverage/src/main/java/org/crp/training/TrainingApplication.java new file mode 100644 index 0000000..a888b4e --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/main/java/org/crp/training/TrainingApplication.java @@ -0,0 +1,13 @@ +package org.crp.training; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TrainingApplication { + + public static void main(String[] args) { + SpringApplication.run(TrainingApplication.class, args); + } + +} diff --git a/02-test/02-sonarqube-test-coverage/src/main/resources/application.properties b/02-test/02-sonarqube-test-coverage/src/main/resources/application.properties new file mode 100644 index 0000000..536dee5 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/main/resources/application.properties @@ -0,0 +1,147 @@ +server.port=8080 +server.servlet.context-path=/flowable-ui +spring.jmx.unique-names=true +# This is needed to force use of JDK proxies instead of using CGLIB +spring.aop.proxy-target-class=false +spring.aop.auto=false +spring.application.name=flowable-ui +spring.banner.location=classpath:/org/flowable/spring/boot/flowable-banner.txt +# The default domain for generating ObjectNames must be specified. Otherwise when multiple Spring Boot applications start in the same servlet container +# all would be created with the same name (com.zaxxer.hikari:name=dataSource,type=HikariDataSource) for example +spring.jmx.default-domain=${spring.application.name} +# +# SECURITY +# +spring.security.filter.dispatcher-types=REQUEST,FORWARD,ASYNC + +# Expose all actuator endpoints to the web +# They are exposed, but only authenticated users can see /info and /health abd users with access-admin can see the others +management.endpoints.web.exposure.include=* +# Full health details should only be displayed when a user is authorized +management.endpoint.health.show-details=when_authorized +# Only users with role access-admin can access full health details +management.endpoint.health.roles=access-admin +# Spring prefixes the roles with ROLE_. However, Flowable does not have that concept yet, so we need to override that with an empty string +flowable.common.app.role-prefix= + +# +# DATABASE +# + +#spring.datasource.driver-class-name=org.h2.Driver +#spring.datasource.url=jdbc:h2:~/flowable-db/engine-db;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9093;DB_CLOSE_DELAY=-1 + +#spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/flowable?characterEncoding=UTF-8 + +#spring.datasource.driver-class-name=org.postgresql.Driver +#spring.datasource.url=jdbc:postgresql://localhost:5432/flowable + +#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +#spring.datasource.url=jdbc:sqlserver://localhost:1433;databaseName=flowablea + +#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver +#spring.datasource.url=jdbc:oracle:thin:@localhost:1521:FLOWABLE + +#spring.datasource.driver-class-name=com.ibm.db2.jcc.DB2Driver +#spring.datasource.url=jdbc:db2://localhost:50000/flowable + +spring.datasource.username=flowable +spring.datasource.password=flowable + +# +# Connection pool (see https://github.com/brettwooldridge/HikariCP#configuration-knobs-baby) +# + +spring.datasource.hikari.poolName=${spring.application.name} +# 10 minutes +spring.datasource.hikari.maxLifetime=600000 +# 5 minutes +spring.datasource.hikari.idleTimeout=300000 +spring.datasource.hikari.minimumIdle=10 +spring.datasource.hikari.maximumPoolSize=50 +# test query for H2, MySQL, PostgreSQL and Microsoft SQL Server +#spring.datasource.hikari.connection-test-query=select 1 +# test query for Oracle +#spring.datasource.hikari.connection-test-query=SELECT 1 FROM DUAL +# test query for DB2 +#spring.datasource.hikari.connection-test-query=SELECT current date FROM sysibm.sysdummy1 + +# +# Default Task Executor (will be used for @Async) +# +spring.task.execution.pool.core-size=2 +spring.task.execution.pool.max-size=50 +spring.task.execution.pool.queue-capacity=10000 +spring.task.execution.thread-name-prefix=flowable-ui-task-Executor- + +# +# Task scheduling +# +spring.task.scheduling.pool.size=5 + +# +# EMAIL +# + +#flowable.mail.server.host=localhost +#flowable.mail.server.port=1025 +#flowable.mail.server.username= +#flowable.mail.server.password= + +# +# FLOWABLE +# + +flowable.process.definition-cache-limit=512 +#flowable.dmn.strict-mode=false +flowable.process.async.executor.default-async-job-acquire-wait-time=PT5S +flowable.process.async.executor.default-timer-job-acquire-wait-time=PT5S + +flowable.cmmn.async.executor.default-async-job-acquire-wait-time=PT5S +flowable.cmmn.async.executor.default-timer-job-acquire-wait-time=PT5S + +# The maximum file upload limit. Set to -1 to set to 'no limit'. Expressed in bytes +spring.servlet.multipart.max-file-size=10MB +# The maximum request size limit. Set to -1 to set to 'no limit'. +# When multiple files can be uploaded this needs to be more than the 'max-file-size'. +spring.servlet.multipart.max-request-size=10MB + +# For development purposes, data folder is created inside the sources ./data folder +flowable.content.storage.root-folder=data/ +flowable.content.storage.create-root=true + +flowable.common.app.idm-admin.user=admin +flowable.common.app.idm-admin.password=test + +flowable.experimental.debugger.enabled=false + +# Rest API in task application + +# If false, disables the rest api in the task app +flowable.task.app.rest-enabled=true + +# Configures the way user credentials are verified when doing a REST API call: +# 'any-user' : the user needs to exist and the password need to match. Any user is allowed to do the call (this is the pre 6.3.0 behavior) +# 'verify-privilege' : the user needs to exist, the password needs to match and the user needs to have the 'rest-api' privilege +# If nothing set, defaults to 'verify-privilege' +flowable.rest.app.authentication-mode=verify-privilege + +# Enable form field validation after form submission on the engine side +flowable.form-field-validation-enabled=false + +# Flowable IDM Properties + +# +# DEFAULT ADMINISTRATOR ACCOUNT +# + +flowable.idm.app.admin.user-id=admin +flowable.idm.app.admin.password=test +flowable.idm.app.admin.first-name=Test +flowable.idm.app.admin.last-name=Administrator +flowable.idm.app.admin.email=test-admin@example-domain.tld + + +#flowable.history-level=none +flowable.history-level=FULL \ No newline at end of file diff --git a/02-test/02-sonarqube-test-coverage/src/main/resources/processes/my-process.bpmn b/02-test/02-sonarqube-test-coverage/src/main/resources/processes/my-process.bpmn new file mode 100644 index 0000000..4df7cc1 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/main/resources/processes/my-process.bpmn @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/02-test/02-sonarqube-test-coverage/src/main/resources/processes/uncovered-process.bpmn b/02-test/02-sonarqube-test-coverage/src/main/resources/processes/uncovered-process.bpmn new file mode 100644 index 0000000..dfd1a6b --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/main/resources/processes/uncovered-process.bpmn @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/02-test/02-sonarqube-test-coverage/src/test/java/org/crp/training/MyProcessTest.java b/02-test/02-sonarqube-test-coverage/src/test/java/org/crp/training/MyProcessTest.java new file mode 100644 index 0000000..8d2fd77 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/test/java/org/crp/training/MyProcessTest.java @@ -0,0 +1,45 @@ +package org.crp.training; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.flowable.engine.RepositoryService; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; +import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.spring.impl.test.FlowableSpringExtension; +import org.flowable.task.api.Task; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest +@ExtendWith(FlowableSpringExtension.class) +@ActiveProfiles("test") +class MyProcessTest { + + @Autowired + RuntimeService runtimeService; + + @Autowired + TaskService taskService; + + @Autowired + RepositoryService repositoryService; + + @Test + void startToEndEvent() { + ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("my-process"); + assertThat(processInstance).isNotNull(); + + assertThat(runtimeService.createProcessInstanceQuery().processInstanceId(processInstance.getId()).count()).isEqualTo(1); + Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); + assertThat(task).isNotNull(); + + taskService.complete(task.getId()); + + assertThat(runtimeService.createProcessInstanceQuery().processInstanceId(processInstance.getId()).count()).isZero(); + } + +} diff --git a/02-test/02-sonarqube-test-coverage/src/test/resources/application-test.properties b/02-test/02-sonarqube-test-coverage/src/test/resources/application-test.properties new file mode 100644 index 0000000..553c7d9 --- /dev/null +++ b/02-test/02-sonarqube-test-coverage/src/test/resources/application-test.properties @@ -0,0 +1,7 @@ +# +# DATABASE +# +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:flowable-test;DB_CLOSE_DELAY=-1 +spring.datasource.username=flowable +spring.datasource.password=flowable diff --git a/03-start-usertask-end/pom.xml b/03-start-usertask-end/pom.xml index 87226d4..ca5ede5 100644 --- a/03-start-usertask-end/pom.xml +++ b/03-start-usertask-end/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/04-servicetask/pom.xml b/04-servicetask/pom.xml index 93b9510..fc7c03c 100644 --- a/04-servicetask/pom.xml +++ b/04-servicetask/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/04-servicetask/src/test/java/org/crp/training/ServiceTaskTest.java b/04-servicetask/src/test/java/org/crp/training/ServiceTaskTest.java index 4f00aaf..0b1cdc4 100644 --- a/04-servicetask/src/test/java/org/crp/training/ServiceTaskTest.java +++ b/04-servicetask/src/test/java/org/crp/training/ServiceTaskTest.java @@ -46,45 +46,6 @@ void increaseCounter() { assertThat(historicProcessInstance).isNotNull().extracting(p -> p.getProcessVariables().get("counter")).isEqualTo(3L); } - @Test - @Deployment(resources = "org/crp/training/my-process.bpmn20.xml") - void async() { - ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder().processDefinitionKey("my-process").start(); - - Task task1 = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); - taskService.complete(task1.getId()); - - assertThat(taskService.createTaskQuery().processInstanceId(processInstance.getId()).count()).isZero(); - - JobTestHelper.waitForJobExecutorToProcessAllJobs(processEngineConfiguration, processEngineConfiguration.getManagementService(), 7000, 500); - - Task task2 = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); - assertThat(task2.getName()).isEqualTo("User task 2"); - - taskService.complete(task2.getId()); - assertThatProcessIsFinished(processInstance); - } - - @Test - @Deployment(resources = "org/crp/training/triggerable.bpmn20.xml") - void triggerable() { - // What is wrong with this test? - ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder().processDefinitionKey("triggerable-process").start(); - - assertThatProcessIsFinished(processInstance); - } - - @Test - @Deployment - void asyncTriggerable() { - ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder().processDefinitionKey("wait-triggerable-process").start(); - - JobTestHelper.waitForJobExecutorToProcessAllJobs(processEngineConfiguration, processEngineConfiguration.getManagementService(), 7000, 200); - - assertThatProcessIsFinished(processInstance); - assertThat(ReceiveAndWaitJavaDelegate.counter.get()).isEqualTo(1).describedAs("DelegateClass must be triggered only one"); - } - private void assertThatProcessIsFinished(ProcessInstance processInstance) { assertThat(runtimeService.createProcessInstanceQuery().processInstanceId(processInstance.getId()).count()).isZero(); } diff --git a/05-gateways/pom.xml b/05-gateways/pom.xml index 5c94f06..0f5d49b 100644 --- a/05-gateways/pom.xml +++ b/05-gateways/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/06-listeners/pom.xml b/06-listeners/pom.xml index f26dd90..3d077da 100644 --- a/06-listeners/pom.xml +++ b/06-listeners/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/07-timers/pom.xml b/07-timers/pom.xml index 658e6a9..52e27a0 100644 --- a/07-timers/pom.xml +++ b/07-timers/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/08-signals-and-messages/pom.xml b/08-signals-and-messages/pom.xml index f805a0f..a0347fe 100644 --- a/08-signals-and-messages/pom.xml +++ b/08-signals-and-messages/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/09-parsing/pom.xml b/09-parsing/pom.xml index 929c611..1c2ba16 100644 --- a/09-parsing/pom.xml +++ b/09-parsing/pom.xml @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/10-behavior-factory/pom.xml b/10-behavior-factory/pom.xml index c02ceae..215914c 100644 --- a/10-behavior-factory/pom.xml +++ b/10-behavior-factory/pom.xml @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/11-queries/pom.xml b/11-queries/pom.xml index a4314cc..ed7ebbb 100644 --- a/11-queries/pom.xml +++ b/11-queries/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/12-migration/pom.xml b/12-migration/pom.xml index 28fad65..b3a80e6 100644 --- a/12-migration/pom.xml +++ b/12-migration/pom.xml @@ -73,6 +73,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/12-migration/src/main/resources/application.properties b/12-migration/src/main/resources/application.properties index 1241845..1f8c2a1 100644 --- a/12-migration/src/main/resources/application.properties +++ b/12-migration/src/main/resources/application.properties @@ -144,6 +144,4 @@ flowable.idm.app.admin.email=test-admin@example-domain.tld #flowable.history-level=none -flowable.history-level=FULL - -flowable.customMybatisMappers = org.crp.training.mapper.ExecutionContentMapper \ No newline at end of file +flowable.history-level=FULL \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6191e17..c17de1d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,9 @@ 01-project/01-first-app - 01-project/01-springboot-app - 02-test + 01-project/02-spring-boot-app + 02-test/01-spring-boot-test + 02-test/02-sonarqube-test-coverage 03-start-usertask-end 04-servicetask 05-gateways