Recreated Spring Boot (Java) Gradle examples and added Maven examples (…

…#431)

* Recreate and move Gradle bare-minimum example to dedicated directory

* Add maven bare-minimum example

* Recreate and move full-stack example to dedicated directory

* Add maven full-stack example

* Update Wiki page version number when making a release

* Update nflow-examples version numbers after release and check that their build works

nflow-examples/build_examples.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+cd spring-boot/bare-minimum/maven
+
+if mvn install; then
+  echo "Spring Boot bare minimum Maven builds ok"
+else
+  echo "Spring Boot bare minimum Maven build failed"
+  exit 1
+fi
+
+cd ../gradle
+
+if ./gradlew build; then
+  echo "Spring Boot bare minimum Gradle builds ok"
+else
+  echo "Spring Boot bare minimum Gradle build failed"
+  exit 1
+fi
+
+cd ../../full-stack/maven
+
+if mvn install; then
+  echo "Spring Boot full stack Maven builds ok"
+else
+  echo "Spring Boot full stack Maven build failed"
+  exit 1
+fi
+
+cd ../gradle
+
+if ./gradlew build; then
+  echo "Spring Boot full stack Gradle builds ok"
+else
+  echo "Spring Boot full stack Gradle build failed"
+  exit 1
+fi
+
+cd ../../full-stack-kotlin
+
+if ./gradlew build; then
+  echo "Spring Boot Kotlin Gradle builds ok"
+else
+  echo "Spring Boot Kotlin Gradle build failed"
+  exit 1
+fi

nflow-examples/spring-boot/bare-minimum/gradle/.gitignore

@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

nflow-examples/spring-boot/bare-minimum/gradle/build.gradle

@@ -0,0 +1,24 @@
+plugins {
+	id 'org.springframework.boot' version '2.4.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'java'
+}
+
+group = 'io.nflow.springboot.bareminimum.gradle'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '1.8'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	compile("io.nflow:nflow-engine:7.2.2")
+	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+	runtimeOnly 'com.h2database:h2'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+test {
+	useJUnitPlatform()
+}

nflow-examples/spring-boot/full-stack/gradle/wrapper/gradle-wrapper.properties → nflow-examples/spring-boot/bare-minimum/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

nflow-examples/spring-boot/bare-minimum/gradlew → nflow-examples/spring-boot/bare-minimum/gradle/gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

nflow-examples/spring-boot/bare-minimum/gradlew.bat → nflow-examples/spring-boot/bare-minimum/gradle/gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

nflow-examples/spring-boot/bare-minimum/gradle/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'demo'

nflow-examples/spring-boot/bare-minimum/gradle/src/main/java/io/nflow/springboot/bareminimum/gradle/DemoApplication.java

@@ -0,0 +1,43 @@
+package io.nflow.springboot.bareminimum.gradle;
+
+import javax.inject.Inject;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.event.EventListener;
+
+import io.nflow.engine.config.EngineConfiguration;
+import io.nflow.engine.service.WorkflowInstanceService;
+import io.nflow.engine.workflow.instance.WorkflowInstanceFactory;
+
+@SpringBootApplication
+@Import(EngineConfiguration.class)
+public class DemoApplication {
+
+	@Inject
+	private WorkflowInstanceService workflowInstances;
+
+	@Inject
+	private WorkflowInstanceFactory workflowInstanceFactory;
+
+	@EventListener(ApplicationReadyEvent.class)
+	public void insertWorkflowInstance() {
+	  workflowInstances.insertWorkflowInstance(workflowInstanceFactory.newWorkflowInstanceBuilder()
+		  .setType(ExampleWorkflow.TYPE)
+		  .setExternalId("example")
+		  .putStateVariable(ExampleWorkflow.VAR_COUNTER, 0)
+		  .build());
+	}
+
+	@Bean
+	public ExampleWorkflow exampleWorkflow() {
+		return new ExampleWorkflow();
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+}

nflow-examples/spring-boot/bare-minimum/gradle/src/main/java/io/nflow/springboot/bareminimum/gradle/ExampleWorkflow.java

@@ -0,0 +1,51 @@
+package io.nflow.springboot.bareminimum.gradle;
+
+import org.joda.time.DateTime;
+
+import io.nflow.engine.workflow.definition.NextAction;
+import io.nflow.engine.workflow.definition.StateExecution;
+import io.nflow.engine.workflow.definition.WorkflowDefinition;
+import io.nflow.engine.workflow.definition.WorkflowStateType;
+
+import static io.nflow.engine.workflow.definition.WorkflowStateType.manual;
+import static io.nflow.engine.workflow.definition.WorkflowStateType.start;
+
+public class ExampleWorkflow extends WorkflowDefinition<ExampleWorkflow.State> {
+
+	public static final String TYPE = "repeatingWorkflow";
+	public static final String VAR_COUNTER = "VAR_COUNTER";
+
+	public enum State implements io.nflow.engine.workflow.definition.WorkflowState {
+		repeat(start, "Repeating state"),
+		error(manual, "Error state");
+
+		private WorkflowStateType type;
+		private String description;
+
+		State(WorkflowStateType type, String description) {
+			this.type = type;
+			this.description = description;
+		}
+
+		@Override
+		public WorkflowStateType getType() {
+			return type;
+		}
+
+		@Override
+		public String getDescription() {
+			return description;
+		}
+	}
+
+	public ExampleWorkflow() {
+		super(TYPE, State.repeat, State.error);
+		permit(State.repeat, State.repeat);
+	}
+
+	public NextAction repeat(StateExecution execution) {
+		System.out.println("Counter: " + execution.getVariable(VAR_COUNTER));
+		execution.setVariable(VAR_COUNTER, execution.getVariable(VAR_COUNTER, Integer.class) + 1);
+		return NextAction.moveToStateAfter(State.repeat, DateTime.now().plusSeconds(10), "Next iteration");
+	}
+}

nflow-examples/spring-boot/bare-minimum/gradle/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.profiles.active=nflow.db.h2
+logging.level.root=WARN