diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..c32394f
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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
+ *
+ * http://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.5";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..0d5e649
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..fa87ad7
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 1ef1003..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-plugins {
- id 'java'
- id 'maven-publish'
-}
-
-repositories {
- mavenLocal()
- maven {
- url = uri('https://repo.maven.apache.org/maven2/')
- }
-}
-
-dependencies {
- testImplementation 'junit:junit:4.12'
-}
-
-group = 'ru.bvn13.fsm'
-version = '1.0'
-description = 'FinalStateMachine'
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-
-publishing {
- publications {
- maven(MavenPublication) {
- from(components.java)
- }
- }
-}
-
-tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
-}
diff --git a/gradlew b/gradlew
deleted file mode 100755
index 4f906e0..0000000
--- a/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed 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.
-#
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-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
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# 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
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- 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" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-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"
-
-exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 107acd3..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-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"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-: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 %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..d2f0ea3
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,310 @@
+#!/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
+#
+# http://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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 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 /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="`which 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/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.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"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..b26ab24
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,182 @@
+@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 http://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 Maven2 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 key stroke 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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+
+FOR /F "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%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
+
+exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
index 1d30cfc..f9acf57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,43 +5,42 @@
4.0.0
- ru.bvn13
+ me.bvn13
fsm
- 1.0
+ 2.0
jar
- FinalStateMachine
- Final state machine
+ Final State Machine
+ Final state machine: String-stated, custom event handling
https://github.com/bvn13/FinalStateMachine
Apache License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
- owner
- Vyacheslav Boyko
- mail4bvn@gmail.com
- UTC+3
-
-
-
- 1.8
- UTF-8
- UTF-8
+
1.8
1.8
- github
- 0.12
- https://github.com/bvn13/FinalStateMachine
+
+ UTF-8
+ UTF-8
+
+
+ https://s01.oss.sonatype.org
+
+
+ https://s01.oss.sonatype.org
+ 2.8.2
+ 3.0.0-M7
+ 1.6.13
+ 1.6
+ 1.18.0
@@ -53,19 +52,6 @@
-
-
junit
@@ -78,37 +64,152 @@
FinalStateMachine
-
-
- maven-deploy-plugin
- 2.8.2
-
- internal.repo::default::file://${project.build.directory}/mvn-repo
-
-
-
- com.github.github
- site-maven-plugin
- ${github.maven-plugin}
-
- Maven artifacts for ${project.version}
- true
- ${project.build.directory}/mvn-repo
- refs/heads/mvn-repo
- **/*
- FinalStateMachine
- bvn13
-
-
-
-
- site
-
- deploy
-
-
-
-
+
+
+
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+
+ com.amashchenko.maven.plugin
+ gitflow-maven-plugin
+ ${gitflow-maven-plugin.version}
+
+ false
+
+ develop
+
+ true
+ 2
+
+
+
+
+
+
+ bvn13
+ Vyacheslav Boyko
+ dev@bvn13.me
+
+ Developer
+
+
+
+
+
+ scm:git:git://github.com/bvn13/FinalStateMachine.git
+ scm:git:ssh://git@github.com:bvn13/FinalStateMachine.git
+ HEAD
+ https://github.com/bvn13/FinalStateMachinek.git
+
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+ verify
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
+
+ true
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ ${nexus-staging-maven-plugin.version}
+ true
+
+
+ default-deploy
+ deploy
+
+ deploy
+
+
+
+
+ ossrh
+ ${nexus.url}
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ ${maven-gpg-plugin.version}
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+
+
+
+ ossrh
+ ${nexus.url}/content/repositories/snapshots
+
+
+ ossrh
+ ${nexus.url}/service/local/staging/deploy/maven2/
+
+
+
+
+
+ jcenter
+ JCenter
+ https://jcenter.bintray.com/
+
+
+
+
+
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 9e075dc..749fdfb 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,83 @@
# Simple Final State Machine
-see an example here: https://github.com/bvn13/JIrcBot/blob/master/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorDialog.java
+Each instance of State Machine must be prepared with:
+1. Initial state
+2. Finish state - may be not several states
+3. Intermediate states - optionally
+4. All transitions needed
+
+Each State may be specified with handlers:
+
+1. Before handler - is called right before FSM changes INTO this state
+2. After handler - is called right before FSM changes FROM this state to another
+3. Processor - the method to process events
+
+Transition is the Rule providing FSM the possibility to change between states.
+
+Each transition must be determined in terms of:
+
+1. From State - mandatory
+2. To State - mandatory
+3. Condition - optionally. If specified, the FSM will check the condition in order to check the possibility
+to change from FROM State into TO State
+
+## Example
+
+Simple way to use it - to construct an inherited class specified with the type of events to be processed
+ during transitions.
+
+```java
+ SimpleFsm simpleFsm = Fsm
+ ., String>from(SimpleFsm::new)
+ .withStates()
+ .from("init")
+ .withBeforeHandler(fsm -> initBefore.set(true))
+ .withAfterHandler(fsm -> initAfter.set(true))
+ .withProcessor((fsm, event) -> initProcess.set(true))
+ .end()
+ .finish("finish")
+ .withBeforeHandler(fsm -> finishBefore.set(true))
+ .withAfterHandler(fsm -> finishAfter.set(true))
+ .withProcessor((fsm, event) -> finishProcess.set(true))
+ .end()
+ .withTransition()
+ .from("init")
+ .to("finish")
+ .checking((fsm, event) -> true)
+ .end()
+ .create();
+```
+
+## Releasing
+
+Creating a new release involves the following steps:
+
+1. `./mvnw gitflow:release-start gitflow:release-finish`
+2. `git push origin master`
+3. `git push --tags`
+4. `git push origin develop`
+
+In order to deploy the release to Maven Central, you need to create an account at https://issues.sonatype.org and
+configure your account in `~/.m2/settings.xml`:
+
+```xml
+
+
+
+ ossrh
+ your-jira-id
+ your-jira-pwd
+
+
+
+```
+
+The account also needs access to the project on Maven Central. This can be requested by another project member.
+
+Then check out the release you want to deploy (`git checkout x.y.z`) and run `./mvnw deploy -Prelease`.
+
+## Author
(c) bvn13
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 82fbccc..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-rootProject.name = 'fsm'
diff --git a/src/main/java/me/bvn13/fsm/Condition.java b/src/main/java/me/bvn13/fsm/Condition.java
new file mode 100644
index 0000000..52816d7
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/Condition.java
@@ -0,0 +1,9 @@
+package me.bvn13.fsm;
+
+/**
+ * Condition of transitions
+ */
+@FunctionalInterface
+public interface Condition {
+ boolean check(T fsm, E event);
+}
diff --git a/src/main/java/me/bvn13/fsm/ConditionBuilder.java b/src/main/java/me/bvn13/fsm/ConditionBuilder.java
new file mode 100644
index 0000000..ccdb607
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/ConditionBuilder.java
@@ -0,0 +1,34 @@
+package me.bvn13.fsm;
+
+public class ConditionBuilder {
+
+ private final FsmBuilder fsmBuilder;
+ private String from;
+ private String to;
+ private Condition condition;
+
+ ConditionBuilder(FsmBuilder fsmBuilder) {
+ this.fsmBuilder = fsmBuilder;
+ }
+
+ public ConditionBuilder from(String from) {
+ this.from = from;
+ return this;
+ }
+
+ public ConditionBuilder to(String to) {
+ this.to = to;
+ return this;
+ }
+
+ public ConditionBuilder checking(Condition condition) {
+ this.condition = condition;
+ return this;
+ }
+
+ public FsmBuilder end() {
+ fsmBuilder.addTransition(from, to, condition);
+ return fsmBuilder;
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/Fsm.java b/src/main/java/me/bvn13/fsm/Fsm.java
new file mode 100644
index 0000000..5c97aef
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/Fsm.java
@@ -0,0 +1,271 @@
+package me.bvn13.fsm;
+
+import me.bvn13.fsm.exceptions.AmbiguousTransitionException;
+import me.bvn13.fsm.exceptions.BrokenTransitionException;
+import me.bvn13.fsm.exceptions.ConditionAlreadyExistsException;
+import me.bvn13.fsm.exceptions.FsmException;
+import me.bvn13.fsm.exceptions.NotInitializedException;
+import me.bvn13.fsm.exceptions.StateAlreadyExistsException;
+import me.bvn13.fsm.exceptions.TransitionMissedException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ *
+ * Final State Machine
+ *
+ *
+ *
+ * Each state machine must be prepared with:
+ * - Initial state
+ * - Finish state - may be not several states
+ * - Intermediate states - optionally
+ * - All transitions needed
+ *
+ *
+ *
+ *
+ *
+ * Each {@link State} may be specified with handlers:
+ * - Before handler - is called right before FSM changes INTO this state
+ * - After handler - is called right before FSM changes FROM this state to another
+ * - Processor - the method to process events
+ *
+ *
+ *
+ *
+ * Transition is the Rule providing FSM the possibility to change between states.
+ *
+ * Each transition must be determined in terms of:
+ *
+ * - From State - mandatory
+ * - To State - mandatory
+ * - Condition - optionally. If specified, the FSM will check the condition in order to check the possibility
+ * to change from FROM State into TO State
+ *
+ *
+ *
+ *
+ * Simple way to use it - to construct an inherited class specified with the type of events to be processed
+ * during transitions.
+ *
+ * {@code
+ * SimpleFsm simpleFsm = Fsm
+ * ., String>from(SimpleFsm::new)
+ * .withStates()
+ * .from("init")
+ * .withBeforeHandler(fsm -> initBefore.set(true))
+ * .withAfterHandler(fsm -> initAfter.set(true))
+ * .withProcessor((fsm, event) -> initProcess.set(true))
+ * .end()
+ * .finish("finish")
+ * .withBeforeHandler(fsm -> finishBefore.set(true))
+ * .withAfterHandler(fsm -> finishAfter.set(true))
+ * .withProcessor((fsm, event) -> finishProcess.set(true))
+ * .end()
+ * .withTransition()
+ * .from("init")
+ * .to("finish")
+ * .checking((fsm, event) -> true)
+ * .end()
+ * .create();
+ *
+ *
+ * {@link SimpleFsm}
+ */
+public class Fsm {
+
+ private boolean done = false;
+ private State initialState;
+ private State currentState;
+ private State previousState;
+ private final Map> states = new HashMap<>();
+ private final Map>> transitions = new HashMap<>();
+
+ /**
+ * Initiate a builder
+ *
+ * @param supplier the original FSM inherited class constructor. You may specify '{@code () -> new SimpleFsm()}' in parameter
+ * @return FsmBuilder
+ * @param the original FSM inherited class type
+ * @param the class type of Events to be processed
+ */
+ @SuppressWarnings("unchecked")
+ public static FsmBuilderInitializer from(Supplier supplier) {
+ return new FsmBuilderInitializer<>(supplier);
+ }
+
+ /**
+ * To initialize FSM into initial state
+ * @throws NotInitializedException
+ */
+ public void init() throws NotInitializedException {
+ currentState = initialState;
+ if (currentState == null) {
+ throw new NotInitializedException();
+ }
+ done = false;
+ previousState = null;
+ currentState.beforeEvent();
+ }
+
+ /**
+ * Main method to handle every event
+ *
+ * @param event event
+ * @throws FsmException
+ */
+ @SuppressWarnings("unchecked")
+ public void process(E event) throws FsmException {
+ if (done) {
+ return;
+ }
+ currentState.process(event);
+ currentState.afterEvent();
+ if (currentState.isFinish()) {
+ done = true;
+ return;
+ }
+ switchToNextState(event);
+ }
+
+ /**
+ * Returns current state
+ *
+ * @return {@link State}
+ */
+ public State getCurrentState() {
+ return currentState;
+ }
+
+ /**
+ * Returns previous state
+ *
+ * @return {@link State}
+ */
+ public State getPreviousState() {
+ return previousState;
+ }
+
+ /**
+ * To specify initial state
+ *
+ * @param state {@link State}
+ * @throws FsmException
+ */
+ public void initState(State state) throws FsmException {
+ state.setFSM(this);
+ addState(state);
+ initialState = state;
+ }
+
+ /**
+ * To add another state
+ *
+ * @param state {@link State}
+ * @throws FsmException
+ */
+ public void addState(State state) throws FsmException {
+ checkStateExist(state.getName());
+ state.setFSM(this);
+ this.states.put(state.getName(), state);
+ }
+
+ /**
+ * To set the transition up
+ *
+ * @param fromState {@link State}
+ * @param toState {@link State}
+ * @throws FsmException
+ */
+ public void addTransition(String fromState, String toState) throws FsmException {
+ storeTransition(fromState, toState, null);
+ }
+
+ /**
+ * To set the transition up
+ *
+ * @param fromState {@link State}
+ * @param toState {@link State}
+ * @param condition {@link Condition}
+ * @throws FsmException
+ */
+ public void addTransition(String fromState, String toState, Condition condition) throws FsmException {
+ storeTransition(fromState, toState, condition);
+ }
+
+ /**
+ * To set the transition up
+ *
+ * @param fromState {@link State}
+ * @param toState {@link State}
+ * @throws FsmException
+ */
+ public void addTransition(String fromState, State toState) throws FsmException {
+ addState(toState);
+ addTransition(fromState, toState.getName());
+ }
+
+ /**
+ * To set the transition up
+ *
+ * @param fromState {@link State}
+ * @param toState {@link State}
+ * @param condition {@link Condition}
+ * @throws FsmException
+ */
+ public void addTransition(String fromState, State toState, Condition condition) throws FsmException {
+ addState(toState);
+ addTransition(fromState, toState.getName(), condition);
+ }
+
+ private void switchToNextState(E event) {
+ if (!transitions.containsKey(currentState.getName())) {
+ throw new TransitionMissedException(currentState.getName());
+ }
+ Map> conditions = transitions.get(currentState.getName());
+ List nextStates = new ArrayList<>();
+ for (String key : conditions.keySet()) {
+ if (conditions.get(key) == null) {
+ nextStates.add(key);
+ } else if(conditions.get(key).check((T) this, event)) {
+ nextStates.add(key);
+ }
+ }
+ if (nextStates.size() > 1) {
+ throw new AmbiguousTransitionException(currentState.getName(), nextStates);
+ }
+ if (nextStates.size() == 0) {
+ throw new BrokenTransitionException(currentState.getName());
+ }
+ State nextState = states.get(nextStates.get(0));
+ nextState(nextState, event);
+ }
+
+ private void nextState(State state, E event) {
+ state.beforeEvent();
+ previousState = currentState;
+ currentState = state;
+ }
+
+ private void checkStateExist(String name) throws StateAlreadyExistsException {
+ if (this.states.containsKey(name)) {
+ throw new StateAlreadyExistsException(name);
+ }
+ }
+
+ private void storeTransition(String fromState, String toState, Condition condition) throws FsmException {
+ if (!transitions.containsKey(fromState)) {
+ transitions.put(fromState, new HashMap<>());
+ }
+ if (transitions.get(fromState).containsKey(toState)) {
+ throw new ConditionAlreadyExistsException(fromState, toState);
+ }
+ transitions.get(fromState).put(toState, condition);
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/FsmBuilder.java b/src/main/java/me/bvn13/fsm/FsmBuilder.java
new file mode 100644
index 0000000..42862e1
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/FsmBuilder.java
@@ -0,0 +1,52 @@
+package me.bvn13.fsm;
+
+import java.util.function.Supplier;
+
+public class FsmBuilder {
+
+ private final T fsm;
+
+ FsmBuilder(Supplier supplier) {
+ fsm = supplier.get();
+ }
+
+ public StateBuilder from(String state) {
+ return new StateBuilder<>(this, state, true, false);
+ }
+
+ public StateBuilder state(String state) {
+ return new StateBuilder<>(this, state, false, false);
+ }
+
+ public StateBuilder finish(String state) {
+ return new StateBuilder<>(this, state, false, true);
+ }
+
+ public ConditionBuilder withTransition() {
+ return new ConditionBuilder<>(this);
+ }
+
+ public T create() {
+ fsm.init();
+ return fsm;
+ }
+
+ T getFsm() {
+ return fsm;
+ }
+
+ @SuppressWarnings("unchecked")
+ void addState(State state, boolean isInitial) {
+ if (isInitial) {
+ fsm.initState(state);
+ } else {
+ fsm.addState(state);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ void addTransition(String from, String to, Condition condition) {
+ fsm.addTransition(from, to, condition);
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/FsmBuilderInitializer.java b/src/main/java/me/bvn13/fsm/FsmBuilderInitializer.java
new file mode 100644
index 0000000..d2f87cf
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/FsmBuilderInitializer.java
@@ -0,0 +1,17 @@
+package me.bvn13.fsm;
+
+import java.util.function.Supplier;
+
+public class FsmBuilderInitializer {
+
+ final Supplier supplier;
+
+ FsmBuilderInitializer(Supplier supplier) {
+ this.supplier = supplier;
+ }
+
+ public FsmBuilder withStates() {
+ return new FsmBuilder<>(supplier);
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/SimpleFsm.java b/src/main/java/me/bvn13/fsm/SimpleFsm.java
new file mode 100644
index 0000000..300ece4
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/SimpleFsm.java
@@ -0,0 +1,9 @@
+package me.bvn13.fsm;
+
+/**
+ * Simple FSM
+ * @param the type of Events
+ */
+public class SimpleFsm extends Fsm {
+
+}
diff --git a/src/main/java/ru/bvn13/fsm/State.java b/src/main/java/me/bvn13/fsm/State.java
similarity index 63%
rename from src/main/java/ru/bvn13/fsm/State.java
rename to src/main/java/me/bvn13/fsm/State.java
index 86ab1f5..6a0c75e 100644
--- a/src/main/java/ru/bvn13/fsm/State.java
+++ b/src/main/java/me/bvn13/fsm/State.java
@@ -1,18 +1,18 @@
-package ru.bvn13.fsm;
+package me.bvn13.fsm;
/**
* Created by bvn13 on 28.12.2017.
*/
-public class State implements StateBehaviour {
+public class State implements StateBehaviour {
- private String name;
+ private final String name;
private boolean finish;
- private FSM fsm;
- protected void setFSM(FSM fsm) {
+ private Fsm fsm;
+ protected void setFSM(Fsm fsm) {
this.fsm = fsm;
}
- public FSM getFSM() {
+ public Fsm getFSM() {
return this.fsm;
}
@@ -32,4 +32,8 @@ public class State implements StateBehaviour {
return finish;
}
+ public String toString() {
+ return name;
+ }
+
}
diff --git a/src/main/java/me/bvn13/fsm/StateBehaviour.java b/src/main/java/me/bvn13/fsm/StateBehaviour.java
new file mode 100644
index 0000000..7e7f29c
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/StateBehaviour.java
@@ -0,0 +1,20 @@
+package me.bvn13.fsm;
+
+/**
+ * State behavior
+ */
+public interface StateBehaviour {
+
+ default void beforeEvent() {
+
+ }
+
+ default void afterEvent() {
+
+ }
+
+ default void process(E event) {
+
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/StateBuilder.java b/src/main/java/me/bvn13/fsm/StateBuilder.java
new file mode 100644
index 0000000..5af28a8
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/StateBuilder.java
@@ -0,0 +1,59 @@
+package me.bvn13.fsm;
+
+import me.bvn13.fsm.dummy.DummyHandler;
+import me.bvn13.fsm.dummy.DummyProcessor;
+
+public class StateBuilder {
+
+ private final FsmBuilder fsmBuilder;
+ private final String name;
+ private final boolean isInitial;
+ private final boolean isFinishing;
+ private StateHandler beforeHandler = new DummyHandler<>();
+ private StateHandler afterHandler = new DummyHandler<>();
+ private StateProcessor processor = new DummyProcessor<>();
+
+ StateBuilder(FsmBuilder fsmBuilder, String name, boolean isInitial, boolean isFinishing) {
+ assert !(isInitial && isFinishing);
+ this.fsmBuilder = fsmBuilder;
+ this.name = name;
+ this.isInitial = isInitial;
+ this.isFinishing = isFinishing;
+ }
+
+ public FsmBuilder end() {
+ fsmBuilder.addState(new State(name, isFinishing) {
+ @Override
+ public void beforeEvent() {
+ beforeHandler.handle(fsmBuilder.getFsm());
+ }
+
+ @Override
+ public void afterEvent() {
+ afterHandler.handle(fsmBuilder.getFsm());
+ }
+
+ @Override
+ public void process(E event) {
+ processor.process(fsmBuilder.getFsm(), event);
+ }
+ }, isInitial);
+ return fsmBuilder;
+ }
+
+ public StateBuilder withBeforeHandler(StateHandler handler) {
+ this.beforeHandler = handler;
+ return this;
+ }
+
+ public StateBuilder withAfterHandler(StateHandler handler) {
+ this.afterHandler = handler;
+ return this;
+ }
+
+ public StateBuilder withProcessor(StateProcessor processor) {
+ this.processor = processor;
+ return this;
+ }
+
+}
diff --git a/src/main/java/me/bvn13/fsm/StateHandler.java b/src/main/java/me/bvn13/fsm/StateHandler.java
new file mode 100644
index 0000000..38c2d72
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/StateHandler.java
@@ -0,0 +1,12 @@
+package me.bvn13.fsm;
+
+/**
+ * State handler
+ * @param
+ */
+@FunctionalInterface
+public interface StateHandler {
+
+ void handle(T fms);
+
+}
diff --git a/src/main/java/me/bvn13/fsm/StateProcessor.java b/src/main/java/me/bvn13/fsm/StateProcessor.java
new file mode 100644
index 0000000..f9fd70e
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/StateProcessor.java
@@ -0,0 +1,13 @@
+package me.bvn13.fsm;
+
+/**
+ * State processor
+ * @param the type of FSM inherited class
+ * @param the type of Events
+ */
+@FunctionalInterface
+public interface StateProcessor {
+
+ void process(T fms, E event);
+
+}
diff --git a/src/main/java/me/bvn13/fsm/dummy/DummyHandler.java b/src/main/java/me/bvn13/fsm/dummy/DummyHandler.java
new file mode 100644
index 0000000..9559db3
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/dummy/DummyHandler.java
@@ -0,0 +1,11 @@
+package me.bvn13.fsm.dummy;
+
+import me.bvn13.fsm.Fsm;
+import me.bvn13.fsm.StateHandler;
+
+public class DummyHandler implements StateHandler {
+ @Override
+ public void handle(T fms) {
+
+ }
+}
diff --git a/src/main/java/me/bvn13/fsm/dummy/DummyProcessor.java b/src/main/java/me/bvn13/fsm/dummy/DummyProcessor.java
new file mode 100644
index 0000000..d308a73
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/dummy/DummyProcessor.java
@@ -0,0 +1,11 @@
+package me.bvn13.fsm.dummy;
+
+import me.bvn13.fsm.Fsm;
+import me.bvn13.fsm.StateProcessor;
+
+public class DummyProcessor implements StateProcessor {
+ @Override
+ public void process(T fms, E event) {
+
+ }
+}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/AmbiguousTransitionException.java b/src/main/java/me/bvn13/fsm/exceptions/AmbiguousTransitionException.java
similarity index 71%
rename from src/main/java/ru/bvn13/fsm/Exceptions/AmbiguousTransitionException.java
rename to src/main/java/me/bvn13/fsm/exceptions/AmbiguousTransitionException.java
index ce2d4ac..ee6e210 100644
--- a/src/main/java/ru/bvn13/fsm/Exceptions/AmbiguousTransitionException.java
+++ b/src/main/java/me/bvn13/fsm/exceptions/AmbiguousTransitionException.java
@@ -1,11 +1,11 @@
-package ru.bvn13.fsm.Exceptions;
+package me.bvn13.fsm.exceptions;
import java.util.List;
/**
- * Created by bvn13 on 28.12.2017.
+ * is thrown if there are more than 1 appropriate transition from current state
*/
-public class AmbiguousTransitionException extends FSMException {
+public class AmbiguousTransitionException extends FsmException {
public AmbiguousTransitionException(String message) {
super(message);
}
diff --git a/src/main/java/me/bvn13/fsm/exceptions/BrokenTransitionException.java b/src/main/java/me/bvn13/fsm/exceptions/BrokenTransitionException.java
new file mode 100644
index 0000000..7669cf4
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/exceptions/BrokenTransitionException.java
@@ -0,0 +1,10 @@
+package me.bvn13.fsm.exceptions;
+
+/**
+ * is thrown if there are no further states from the current one
+ */
+public class BrokenTransitionException extends FsmException {
+ public BrokenTransitionException(String from) {
+ super("Broken transition from: "+from);
+ }
+}
diff --git a/src/main/java/me/bvn13/fsm/exceptions/ConditionAlreadyExistsException.java b/src/main/java/me/bvn13/fsm/exceptions/ConditionAlreadyExistsException.java
new file mode 100644
index 0000000..0f7cfc5
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/exceptions/ConditionAlreadyExistsException.java
@@ -0,0 +1,10 @@
+package me.bvn13.fsm.exceptions;
+
+/**
+ * is thrown in case of adding a transition FROM->TO, but it is already defined
+ */
+public class ConditionAlreadyExistsException extends FsmException {
+ public ConditionAlreadyExistsException(String from, String to) {
+ super(String.format("Condition exists: %s -> %s", from, to));
+ }
+}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/FSMException.java b/src/main/java/me/bvn13/fsm/exceptions/FsmException.java
similarity index 75%
rename from src/main/java/ru/bvn13/fsm/Exceptions/FSMException.java
rename to src/main/java/me/bvn13/fsm/exceptions/FsmException.java
index f1e4aa1..5205ae9 100644
--- a/src/main/java/ru/bvn13/fsm/Exceptions/FSMException.java
+++ b/src/main/java/me/bvn13/fsm/exceptions/FsmException.java
@@ -1,14 +1,14 @@
-package ru.bvn13.fsm.Exceptions;
+package me.bvn13.fsm.exceptions;
import java.io.PrintWriter;
import java.io.StringWriter;
/**
- * Created by bvn13 on 28.12.2017.
+ * Parent FSM exception class
*/
-public class FSMException extends Exception {
+public class FsmException extends RuntimeException {
protected String message;
- public FSMException(String message) {
+ public FsmException(String message) {
this.message = message;
}
protected String getStackTraceString() {
diff --git a/src/main/java/me/bvn13/fsm/exceptions/NotInitializedException.java b/src/main/java/me/bvn13/fsm/exceptions/NotInitializedException.java
new file mode 100644
index 0000000..a002848
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/exceptions/NotInitializedException.java
@@ -0,0 +1,13 @@
+package me.bvn13.fsm.exceptions;
+
+/**
+ * is thrown in case of using FSM before being initialized
+ */
+public class NotInitializedException extends FsmException {
+ public NotInitializedException(String message) {
+ super(message);
+ }
+ public NotInitializedException() {
+ super("FSM is not inited");
+ }
+}
diff --git a/src/main/java/me/bvn13/fsm/exceptions/StateAlreadyExistsException.java b/src/main/java/me/bvn13/fsm/exceptions/StateAlreadyExistsException.java
new file mode 100644
index 0000000..13dc360
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/exceptions/StateAlreadyExistsException.java
@@ -0,0 +1,10 @@
+package me.bvn13.fsm.exceptions;
+
+/**
+ * is thrown when trying to add the state which was already added before
+ */
+public class StateAlreadyExistsException extends FsmException {
+ public StateAlreadyExistsException(String stateName) {
+ super(String.format("State exist: %s", stateName));
+ }
+}
diff --git a/src/main/java/me/bvn13/fsm/exceptions/TransitionMissedException.java b/src/main/java/me/bvn13/fsm/exceptions/TransitionMissedException.java
new file mode 100644
index 0000000..9e81797
--- /dev/null
+++ b/src/main/java/me/bvn13/fsm/exceptions/TransitionMissedException.java
@@ -0,0 +1,10 @@
+package me.bvn13.fsm.exceptions;
+
+/**
+ * is thrown if there are no registered transitions from current state
+ */
+public class TransitionMissedException extends FsmException {
+ public TransitionMissedException(String from) {
+ super(String.format("Missed conditions from: %s", from));
+ }
+}
diff --git a/src/main/java/ru/bvn13/fsm/Condition.java b/src/main/java/ru/bvn13/fsm/Condition.java
deleted file mode 100644
index b1dbfef..0000000
--- a/src/main/java/ru/bvn13/fsm/Condition.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ru.bvn13.fsm;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class Condition implements ConditionBehaviour {
-
- private FSM fsm;
- protected void setFSM(FSM fsm) {
- this.fsm = fsm;
- }
- public FSM getFSM() {
- return this.fsm;
- }
-
- @Override
- public boolean check() {
- return false;
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/ConditionBehaviour.java b/src/main/java/ru/bvn13/fsm/ConditionBehaviour.java
deleted file mode 100644
index 3345ec3..0000000
--- a/src/main/java/ru/bvn13/fsm/ConditionBehaviour.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package ru.bvn13.fsm;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public interface ConditionBehaviour {
- boolean check();
-}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/BrokenTransitionException.java b/src/main/java/ru/bvn13/fsm/Exceptions/BrokenTransitionException.java
deleted file mode 100644
index 05fbc0d..0000000
--- a/src/main/java/ru/bvn13/fsm/Exceptions/BrokenTransitionException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ru.bvn13.fsm.Exceptions;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class BrokenTransitionException extends FSMException {
- public BrokenTransitionException(String from) {
- super("Broken transition from: "+from);
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/ConditionExistsException.java b/src/main/java/ru/bvn13/fsm/Exceptions/ConditionExistsException.java
deleted file mode 100644
index 3bff311..0000000
--- a/src/main/java/ru/bvn13/fsm/Exceptions/ConditionExistsException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ru.bvn13.fsm.Exceptions;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class ConditionExistsException extends FSMException {
- public ConditionExistsException(String from, String to) {
- super(String.format("Condition exists: %s -> %s", from, to));
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/NotInitedException.java b/src/main/java/ru/bvn13/fsm/Exceptions/NotInitedException.java
deleted file mode 100644
index 22b42b9..0000000
--- a/src/main/java/ru/bvn13/fsm/Exceptions/NotInitedException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.bvn13.fsm.Exceptions;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class NotInitedException extends FSMException {
- public NotInitedException(String message) {
- super(message);
- }
- public NotInitedException() {
- super("FSM is not inited");
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/StateExistsException.java b/src/main/java/ru/bvn13/fsm/Exceptions/StateExistsException.java
deleted file mode 100644
index 7dd24c0..0000000
--- a/src/main/java/ru/bvn13/fsm/Exceptions/StateExistsException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ru.bvn13.fsm.Exceptions;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class StateExistsException extends FSMException {
- public StateExistsException(String stateName) {
- super(String.format("State exist: %s", stateName));
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/Exceptions/TransitionMissedException.java b/src/main/java/ru/bvn13/fsm/Exceptions/TransitionMissedException.java
deleted file mode 100644
index 1c7d3b7..0000000
--- a/src/main/java/ru/bvn13/fsm/Exceptions/TransitionMissedException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package ru.bvn13.fsm.Exceptions;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class TransitionMissedException extends FSMException {
- public TransitionMissedException(String from) {
- super(String.format("Missed conditions from: %s", from));
- }
-}
diff --git a/src/main/java/ru/bvn13/fsm/FSM.java b/src/main/java/ru/bvn13/fsm/FSM.java
deleted file mode 100644
index a220ddf..0000000
--- a/src/main/java/ru/bvn13/fsm/FSM.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package ru.bvn13.fsm;
-
-import ru.bvn13.fsm.Exceptions.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class FSM {
-
- private boolean done = false;
- private State initialState;
- private State currentState;
- private State previousState;
- private Map states;
- private Map> transitions;
-
- public FSM() {
- this.states = new HashMap<>();
- this.transitions = new HashMap<>();
- }
-
- private void checkStateExist(String name) throws StateExistsException {
- if (this.states.containsKey(name)) {
- throw new StateExistsException(name);
- }
- }
-
- public void init() throws NotInitedException {
- currentState = initialState;
- if (currentState == null) {
- throw new NotInitedException();
- }
- done = false;
- previousState = null;
- currentState.beforeEvent();
- currentState.process();
- }
-
- public State getCurrentState() {
- return currentState;
- }
-
- public State getPreviousState() {
- return previousState;
- }
-
- public void next() throws FSMException {
- if (done) {
- return;
- }
- currentState.afterEvent();
- if (currentState.isFinish()) {
- done = true;
- return;
- }
- if (!transitions.containsKey(currentState.getName())) {
- throw new TransitionMissedException(currentState.getName());
- }
- Map conditions = transitions.get(currentState.getName());
- List nextStates = new ArrayList<>();
- for (String key : conditions.keySet()) {
- if (conditions.get(key) == null) {
- nextStates.add(key);
- } else if(conditions.get(key).check()) {
- nextStates.add(key);
- }
- }
- if (nextStates.size() > 1) {
- throw new AmbiguousTransitionException(currentState.getName(), nextStates);
- }
- if (nextStates.size() == 0) {
- throw new BrokenTransitionException(currentState.getName());
- }
- State nextState = states.get(nextStates.get(0));
- nextState(nextState);
- }
-
- public void prev() throws FSMException {
- if (done) {
- return;
- }
- currentState.afterEvent();
- if (getPreviousState() == null) {
- return;
- }
- nextState(getPreviousState());
- }
-
- private void nextState(State state) {
- state.beforeEvent();
- previousState = currentState;
- currentState = state;
- currentState.process();
- }
-
- public void initState(State state) throws FSMException {
- state.setFSM(this);
- addState(state);
- initialState = state;
- }
-
- public void addState(State state) throws FSMException {
- checkStateExist(state.getName());
- state.setFSM(this);
- this.states.put(state.getName(), state);
- }
-
- public void addTransition(String fromState, String toState) throws FSMException {
- storeTransition(fromState, toState, null);
- }
-
- public void addTransition(String fromState, String toState, Condition condition) throws FSMException {
- condition.setFSM(this);
- storeTransition(fromState, toState, condition);
- }
-
- public void addTransition(String fromState, State toState) throws FSMException {
- addState(toState);
- addTransition(fromState, toState.getName());
- }
-
- public void addTransition(String fromState, State toState, Condition condition) throws FSMException {
- addState(toState);
- addTransition(fromState, toState.getName(), condition);
- }
-
- private void storeTransition(String fromState, String toState, Condition condition) throws FSMException {
- if (!transitions.containsKey(fromState)) {
- transitions.put(fromState, new HashMap<>());
- }
- if (transitions.get(fromState).containsKey(toState)) {
- throw new ConditionExistsException(fromState, toState);
- }
- transitions.get(fromState).put(toState, condition);
- }
-
-}
diff --git a/src/main/java/ru/bvn13/fsm/StateBehaviour.java b/src/main/java/ru/bvn13/fsm/StateBehaviour.java
deleted file mode 100644
index 2b9597f..0000000
--- a/src/main/java/ru/bvn13/fsm/StateBehaviour.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ru.bvn13.fsm;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public interface StateBehaviour {
-
- default void beforeEvent() {
-
- }
-
- default void afterEvent() {
-
- }
-
- default void process() {
-
- }
-
-}
diff --git a/src/main/java/ru/bvn13/fsm/examples/DialogApplication.java b/src/main/java/ru/bvn13/fsm/examples/DialogApplication.java
deleted file mode 100644
index 77109a3..0000000
--- a/src/main/java/ru/bvn13/fsm/examples/DialogApplication.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package ru.bvn13.fsm.examples;
-
-import ru.bvn13.fsm.Condition;
-import ru.bvn13.fsm.Exceptions.FSMException;
-import ru.bvn13.fsm.Exceptions.NotInitedException;
-import ru.bvn13.fsm.FSM;
-import ru.bvn13.fsm.State;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class DialogApplication {
-
- public static class DialogFSM extends FSM {
- public String command;
- private BufferedReader br = null;
-
- public void readCommand() {
- System.out.print("Command: ");
- br = new BufferedReader(new InputStreamReader(System.in));
- try {
- command = br.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- System.exit(-1);
- }
- }
- }
-
- public static void main(String argc[]) {
-
- DialogFSM fsm = new DialogFSM();
-
- try {
- fsm.initState(new State("greeting") {
- @Override
- public void beforeEvent() {
- System.out.println("Welcome!");
- }
- @Override
- public void process() {
- fsm.readCommand();
- try {
- fsm.next();
- } catch (FSMException e) {
- e.printStackTrace();
- System.exit(-1);
- }
- }
- @Override
- public void afterEvent() {
- System.out.println("Your command: "+fsm.command);
- }
- });
- } catch (FSMException e) {
- e.printStackTrace();
- }
-
- try {
- fsm.addTransition("greeting", new State("hello", true) {
- @Override
- public void beforeEvent() {
- System.out.println("Hello!");
- }
- @Override
- public void process() {
-
- }
- @Override
- public void afterEvent() {
- System.out.println("DONE");
- }
- }, new Condition() {
- @Override
- public boolean check() {
- return fsm.command.equalsIgnoreCase("hello");
- }
- });
- } catch (FSMException e) {
- e.printStackTrace();
- }
-
-
- try {
- fsm.addTransition("greeting", "greeting", new Condition() {
- @Override
- public boolean check() {
- return !fsm.command.equalsIgnoreCase("hello");
- }
- });
- } catch (FSMException e) {
- e.printStackTrace();
- }
-
-
- try {
- fsm.init();
- } catch (NotInitedException e) {
- e.printStackTrace();
- }
-
- }
-
-}
diff --git a/src/test/java/me/bvn13/fsm/tests/FsmTest.java b/src/test/java/me/bvn13/fsm/tests/FsmTest.java
new file mode 100644
index 0000000..38a3140
--- /dev/null
+++ b/src/test/java/me/bvn13/fsm/tests/FsmTest.java
@@ -0,0 +1,122 @@
+package me.bvn13.fsm.tests;
+
+import me.bvn13.fsm.Fsm;
+import me.bvn13.fsm.SimpleFsm;
+import me.bvn13.fsm.State;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Created by bvn13 on 28.12.2017.
+ */
+public class FsmTest {
+
+ public static class NamedFsm extends Fsm {
+
+ public NamedFsm() {
+ super();
+ }
+
+ private String name;
+
+ public NamedFsm setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String toString() {
+ return this.name;
+ }
+ }
+
+
+ @Test
+ public void creatingFSM() {
+
+ NamedFsm namedFsm = (new NamedFsm()).setName("TEST FSM");
+
+ AtomicBoolean initStatedProcessed = new AtomicBoolean(false);
+ AtomicBoolean firstStatedProcessed = new AtomicBoolean(false);
+ AtomicBoolean anotherStatedProcessed = new AtomicBoolean(false);
+
+ namedFsm.initState(new State("init") {
+ @Override
+ public void process(String event) {
+ initStatedProcessed.set(true);
+ }
+ });
+
+ namedFsm.addTransition("init", new State("first", true) {
+ @Override
+ public void process(String event) {
+ firstStatedProcessed.set(true);
+ }
+ });
+
+ namedFsm.addTransition("init", new State("another", true) {
+ @Override
+ public void process(String event) {
+ anotherStatedProcessed.set(true);
+ }
+ }, (fsm, event) -> false);
+
+ namedFsm.init();
+ namedFsm.process(null);
+ namedFsm.process(null);
+
+ Assert.assertEquals("first", namedFsm.getCurrentState().getName());
+ Assert.assertTrue(initStatedProcessed.get());
+ Assert.assertTrue(firstStatedProcessed.get());
+ Assert.assertFalse(anotherStatedProcessed.get());
+ }
+
+ @Test
+ public void newSyntax() {
+
+ AtomicBoolean initBefore = new AtomicBoolean(false);
+ AtomicBoolean initAfter = new AtomicBoolean(false);
+ AtomicBoolean initProcess = new AtomicBoolean(false);
+ AtomicBoolean finishBefore = new AtomicBoolean(false);
+ AtomicBoolean finishAfter = new AtomicBoolean(false);
+ AtomicBoolean finishProcess = new AtomicBoolean(false);
+
+ // @formatter:off
+
+ SimpleFsm simpleFsm = Fsm
+ ., String>from(SimpleFsm::new)
+ .withStates()
+ .from("init")
+ .withBeforeHandler(fsm -> initBefore.set(true))
+ .withAfterHandler(fsm -> initAfter.set(true))
+ .withProcessor((fsm, event) -> initProcess.set(true))
+ .end()
+ .finish("finish")
+ .withBeforeHandler(fsm -> finishBefore.set(true))
+ .withAfterHandler(fsm -> finishAfter.set(true))
+ .withProcessor((fsm, event) -> finishProcess.set(true))
+ .end()
+ .withTransition()
+ .from("init")
+ .to("finish")
+ .checking((fsm, event) -> true)
+ .end()
+ .create()
+ ;
+
+ // @formatter:on
+
+ simpleFsm.process("");
+
+ //Assert.assertEquals("finish", simpleFsm.getCurrentState().getName());
+ Assert.assertTrue(initBefore.get());
+ Assert.assertTrue(initProcess.get());
+ Assert.assertTrue(initAfter.get());
+ Assert.assertTrue(finishBefore.get());
+ Assert.assertFalse(finishProcess.get());
+ Assert.assertFalse(finishAfter.get());
+
+ }
+
+}
diff --git a/src/test/java/me/bvn13/fsm/tests/examples/DialogApplication.java b/src/test/java/me/bvn13/fsm/tests/examples/DialogApplication.java
new file mode 100644
index 0000000..75b53e2
--- /dev/null
+++ b/src/test/java/me/bvn13/fsm/tests/examples/DialogApplication.java
@@ -0,0 +1,77 @@
+package me.bvn13.fsm.tests.examples;
+
+import me.bvn13.fsm.Fsm;
+import me.bvn13.fsm.State;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Created by bvn13 on 28.12.2017.
+ */
+public class DialogApplication {
+
+ public static class DialogFSM extends Fsm {
+ public String command;
+
+ public void readCommand() {
+ System.out.print("Command: ");
+ BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+ try {
+ command = br.readLine();
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.exit(-1);
+ }
+ }
+ }
+
+ public static void main(String[] argv) {
+
+ DialogFSM fsm = new DialogFSM();
+
+ fsm.initState(new State("greeting") {
+ @Override
+ public void beforeEvent() {
+ System.out.println("Welcome!");
+ }
+
+ @Override
+ public void process(String event) {
+ fsm.readCommand();
+ fsm.process(event);
+ }
+
+ @Override
+ public void afterEvent() {
+ System.out.println("Your command: " + fsm.command);
+ }
+ });
+
+ fsm.addTransition("greeting", new State("hello", true) {
+ @Override
+ public void beforeEvent() {
+ System.out.println("Hello!");
+ }
+
+ @Override
+ public void process(String event) {
+
+ }
+
+ @Override
+ public void afterEvent() {
+ System.out.println("DONE");
+ }
+ }, (fsm12, event) -> fsm12.command.equalsIgnoreCase("hello"));
+
+
+ fsm.addTransition("greeting", "greeting", (fsm1, event) -> !fsm1.command.equalsIgnoreCase("hello"));
+
+
+ fsm.init();
+
+ }
+
+}
diff --git a/src/test/java/ru/bvn13/fsm/tests/Tests.java b/src/test/java/ru/bvn13/fsm/tests/Tests.java
deleted file mode 100644
index e644e5a..0000000
--- a/src/test/java/ru/bvn13/fsm/tests/Tests.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package ru.bvn13.fsm.tests;
-
-import org.junit.Assert;
-import org.junit.Test;
-import ru.bvn13.fsm.Exceptions.FSMException;
-import ru.bvn13.fsm.Exceptions.NotInitedException;
-import ru.bvn13.fsm.FSM;
-import ru.bvn13.fsm.State;
-
-/**
- * Created by bvn13 on 28.12.2017.
- */
-public class Tests {
-
- public static class NamedFSM extends FSM {
-
- public NamedFSM() {
- super();
- }
-
- private String name;
- public NamedFSM setName(String name) {
- this.name = name;
- return this;
- }
-
- public String toString() {
- return this.name;
- }
- }
-
-
-
- @Test
- public void creatingFSM() {
-
- NamedFSM fsm = (new NamedFSM()).setName("TEST FSM");
- Assert.assertNotNull(fsm);
-
- try {
- fsm.initState(new State("init") {
- @Override
- public void process() {
- System.out.println("" + fsm + " -> " + getName() + ": processed init");
- try {
- fsm.next();
- } catch (FSMException e) {
- e.printStackTrace();
- Assert.fail();
- }
- }
- });
- } catch (FSMException e) {
- e.printStackTrace();
- Assert.fail();
- }
-
- try {
- fsm.addTransition("init", new State("first", true) {
- @Override
- public void process() {
- System.out.println("" + fsm + " -> " + getName() + ": processed first");
- try {
- fsm.next();
- } catch (FSMException e) {
- e.printStackTrace();
- Assert.fail();
- }
- }
- });
- } catch (FSMException e) {
- e.printStackTrace();
- Assert.fail();
- }
-
- try {
- fsm.init();
- } catch (NotInitedException e) {
- e.printStackTrace();
- Assert.fail();
- }
-
- Assert.assertTrue(fsm.getCurrentState().getName().equals("first"));
-
- }
-
-}