diff --git a/README.md b/README.md
index 22c9053..666f9ec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# STOMP over WebSocket implementation in Java
-This is a [STOMP](http://stomp.github.io/) protocol implementation.
+This is a [STOMP](http://eu.mivrenik.stomp.github.io/) protocol implementation.
## Example backend using Spring Boot
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..0e47bae
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,10 @@
+group 'eu.mivrenik'
+version '0.1'
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.7
+
+repositories {
+ mavenCentral()
+}
diff --git a/example/build.gradle b/example/build.gradle
new file mode 100644
index 0000000..758e49c
--- /dev/null
+++ b/example/build.gradle
@@ -0,0 +1,14 @@
+group 'eu.mivrenik'
+version '0.1'
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile project(':stomp-client-ws')
+}
diff --git a/example/src/main/java/eu/mivrenik/stomp/example/StompClientExample.java b/example/src/main/java/eu/mivrenik/stomp/example/StompClientExample.java
new file mode 100644
index 0000000..8f33082
--- /dev/null
+++ b/example/src/main/java/eu/mivrenik/stomp/example/StompClientExample.java
@@ -0,0 +1,34 @@
+package eu.mivrenik.stomp.example;
+
+import com.neovisionaries.ws.client.WebSocketException;
+import eu.mivrenik.stomp.StompMessageListener;
+import eu.mivrenik.stomp.client.StompClient;
+
+import java.io.IOException;
+
+public class StompClientExample {
+
+ public static void main(String[] args) {
+ StompClient stompClient;
+ try {
+ stompClient = new StompClient("ws://localhost:7777/hello");
+ stompClient.connect();
+ } catch (WebSocketException | IOException e) {
+ e.printStackTrace();
+ return;
+ }
+
+ // Subscribing to a topic
+ stompClient.subscribe("/topic/greetings", new StompMessageListener() {
+
+ @Override
+ public void onMessage(String message) {
+ System.out.println("Server message: " + message);
+ }
+ });
+
+ // Sending JSON message to a server
+ String message = "Jack";
+ stompClient.send("/app/hello", message);
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..6b6ea3a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..109206e
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Nov 27 19:58:17 EET 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## 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=""
+
+# 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, switch paths to Windows format before running java
+if $cygwin ; 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=$((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"
+
+# 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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@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 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=
+
+@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 init
+
+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 init
+
+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
+
+: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%
+
+: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/pom.xml b/pom.xml
deleted file mode 100644
index cd0d0f7..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
- 4.0.0
- eu.mivrenik
- java-stomp-ws
- 0.1
-
- 1.7
- 1.7
-
-
-
- com.neovisionaries
- nv-websocket-client
- 1.30
-
-
-
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..8d75405
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include 'example', 'stomp', 'stomp-client-ws'
diff --git a/stomp-client-ws/build.gradle b/stomp-client-ws/build.gradle
new file mode 100644
index 0000000..40b0e99
--- /dev/null
+++ b/stomp-client-ws/build.gradle
@@ -0,0 +1,15 @@
+group 'eu.mivrenik'
+version '0.1'
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile project(':stomp')
+ compile 'com.neovisionaries:nv-websocket-client:1.30'
+}
diff --git a/src/main/java/eu/mivrenik/stomp/StompClient.java b/stomp-client-ws/src/main/java/eu/mivrenik/stomp/client/StompClient.java
similarity index 87%
rename from src/main/java/eu/mivrenik/stomp/StompClient.java
rename to stomp-client-ws/src/main/java/eu/mivrenik/stomp/client/StompClient.java
index dd51540..47ba97e 100644
--- a/src/main/java/eu/mivrenik/stomp/StompClient.java
+++ b/stomp-client-ws/src/main/java/eu/mivrenik/stomp/client/StompClient.java
@@ -19,13 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package eu.mivrenik.stomp;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+package eu.mivrenik.stomp.client;
import com.neovisionaries.ws.client.WebSocket;
import com.neovisionaries.ws.client.WebSocketException;
@@ -33,14 +27,24 @@ import com.neovisionaries.ws.client.WebSocketFactory;
import com.neovisionaries.ws.client.WebSocketFrame;
import com.neovisionaries.ws.client.WebSocketListener;
import com.neovisionaries.ws.client.WebSocketState;
+import eu.mivrenik.stomp.StompCommand;
+import eu.mivrenik.stomp.StompFrame;
+import eu.mivrenik.stomp.StompHeader;
+import eu.mivrenik.stomp.StompMessageListener;
+import eu.mivrenik.stomp.StompSubscription;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
/**
* STOMP v1.2 client using `nv-websocket-client` WebSocket client
* implementation.
*
- * @see https://stomp.github.io/stomp-specification-1.2.html
+ * @see https://eu.mivrenik.stomp.github.io/eu.mivrenik.stomp-specification-1.2.html
* @see https://github.com/TakahikoKawasaki/nv-websocket-client
- *
*/
public class StompClient {
private static final String STOMP_VERSION = "1.2";
@@ -62,8 +66,9 @@ public class StompClient {
}
protected void connectStomp() {
- if (stompConnected)
+ if (stompConnected) {
return;
+ }
Map headers = new HashMap<>();
headers.put(StompHeader.ACCEPT_VERSION.toString(), STOMP_VERSION);
headers.put(StompHeader.HOST.toString(), webSocket.getURI().getHost());
@@ -76,9 +81,9 @@ public class StompClient {
}
protected void disconnectStomp() {
- if (!stompConnected)
+ if (!stompConnected) {
return;
-
+ }
webSocket.sendText(new StompFrame(StompCommand.DISCONNECT).toString());
}
@@ -91,9 +96,9 @@ public class StompClient {
}
public void send(String destination, String message, Map headers) {
- if (headers == null)
+ if (headers == null) {
headers = new HashMap<>();
-
+ }
headers.put(StompHeader.DESTINATION.toString(), destination);
webSocket.sendText(new StompFrame(StompCommand.SEND, headers, message).toString());
}
@@ -117,9 +122,11 @@ public class StompClient {
}
public void unsubscribeAll(String destination) {
- for (StompSubscription s : subscriptions.values())
- if (s.getDestination().equals(destination))
+ for (StompSubscription s : subscriptions.values()) {
+ if (s.getDestination().equals(destination)) {
unsubscribe(s);
+ }
+ }
}
private final WebSocketListener webSocketListener = new WebSocketListener() {
@@ -154,7 +161,7 @@ public class StompClient {
@Override
public void onDisconnected(WebSocket websocket, WebSocketFrame serverCloseFrame,
- WebSocketFrame clientCloseFrame, boolean closedByServer) throws Exception {
+ WebSocketFrame clientCloseFrame, boolean closedByServer) throws Exception {
stompConnected = false;
}
@@ -220,17 +227,17 @@ public class StompClient {
StompFrame stompFrame = StompFrame.fromString(frame.getPayloadText());
switch (stompFrame.getCommand()) {
- case CONNECTED:
- stompConnected = true;
- break;
- case MESSAGE:
- Integer subscriptionId = Integer
- .valueOf(stompFrame.getHeaders().get(StompHeader.SUBSCRIPTION.toString()));
+ case CONNECTED:
+ stompConnected = true;
+ break;
+ case MESSAGE:
+ Integer subscriptionId = Integer
+ .valueOf(stompFrame.getHeaders().get(StompHeader.SUBSCRIPTION.toString()));
- subscriptions.get(subscriptionId).getListener().onMessage(stompFrame.getBody());
- break;
- default:
- break;
+ subscriptions.get(subscriptionId).getListener().onMessage(stompFrame.getBody());
+ break;
+ default:
+ break;
}
}
diff --git a/stomp/build.gradle b/stomp/build.gradle
new file mode 100644
index 0000000..a0ca31b
--- /dev/null
+++ b/stomp/build.gradle
@@ -0,0 +1,10 @@
+group 'eu.mivrenik'
+version '0.1'
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
diff --git a/src/main/java/eu/mivrenik/stomp/StompCommand.java b/stomp/src/main/java/eu/mivrenik/stomp/StompCommand.java
similarity index 91%
rename from src/main/java/eu/mivrenik/stomp/StompCommand.java
rename to stomp/src/main/java/eu/mivrenik/stomp/StompCommand.java
index 8b7a5f2..57d89b2 100644
--- a/src/main/java/eu/mivrenik/stomp/StompCommand.java
+++ b/stomp/src/main/java/eu/mivrenik/stomp/StompCommand.java
@@ -23,9 +23,8 @@ package eu.mivrenik.stomp;
/**
* STOMP commands.
- *
*/
-enum StompCommand {
+public enum StompCommand {
CONNECT("CONNECT"),
CONNECTED("CONNECTED"),
DISCONNECT("DISCONNECT"),
@@ -39,11 +38,12 @@ enum StompCommand {
private final String value;
public static StompCommand fromValue(String value) {
- for (StompCommand c : StompCommand.values())
- if (c.value.equals(value))
+ for (StompCommand c : StompCommand.values()) {
+ if (c.value.equals(value)) {
return c;
-
- throw new IllegalArgumentException("Unknown STOMP command:" + value);
+ }
+ }
+ throw new IllegalArgumentException("Unknown STOMP command: " + value);
}
private StompCommand(String value) {
diff --git a/src/main/java/eu/mivrenik/stomp/StompFrame.java b/stomp/src/main/java/eu/mivrenik/stomp/StompFrame.java
similarity index 90%
rename from src/main/java/eu/mivrenik/stomp/StompFrame.java
rename to stomp/src/main/java/eu/mivrenik/stomp/StompFrame.java
index f90891d..1808f1d 100644
--- a/src/main/java/eu/mivrenik/stomp/StompFrame.java
+++ b/stomp/src/main/java/eu/mivrenik/stomp/StompFrame.java
@@ -27,10 +27,9 @@ import java.util.Map;
/**
* STOMP Frame.
*
- * @link https://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames
- *
+ * @link https://eu.mivrenik.stomp.github.io/eu.mivrenik.stomp-specification-1.2.html#STOMP_Frames
*/
-class StompFrame {
+public class StompFrame {
private StompCommand command;
private Map headers = new HashMap<>();
private String body;
@@ -47,9 +46,11 @@ class StompFrame {
this.command = command;
this.body = body;
- if (headers != null)
- for (String k : headers.keySet())
+ if (headers != null) {
+ for (String k : headers.keySet()) {
this.headers.put(k, headers.get(k));
+ }
+ }
}
public StompCommand getCommand() {
@@ -67,20 +68,24 @@ class StompFrame {
public static StompFrame fromString(String data) {
String[] lines = data.split("\n");
int pos = 0;
+
// Ignore empty lines
- while (pos < lines.length && lines[pos].isEmpty())
+ while (pos < lines.length && lines[pos].isEmpty()) {
pos++;
+ }
+
// Command
StompCommand command = StompCommand.fromValue(lines[pos++]);
+
// Headers
Map headers = new HashMap<>();
while (!lines[pos].isEmpty()) {
String[] keyValue = lines[pos].split(":");
headers.put(keyValue[0], keyValue[1]);
-
pos++;
}
pos++;
+
// Body
StringBuilder body = new StringBuilder();
for (; pos < lines.length; pos++) {
@@ -109,8 +114,9 @@ class StompFrame {
}
sb.append('\n');
// Body
- if (body != null)
+ if (body != null) {
sb.append(body);
+ }
sb.append('\0');
return sb.toString();
diff --git a/src/main/java/eu/mivrenik/stomp/StompHeader.java b/stomp/src/main/java/eu/mivrenik/stomp/StompHeader.java
similarity index 98%
rename from src/main/java/eu/mivrenik/stomp/StompHeader.java
rename to stomp/src/main/java/eu/mivrenik/stomp/StompHeader.java
index c3551c9..a5321cb 100644
--- a/src/main/java/eu/mivrenik/stomp/StompHeader.java
+++ b/stomp/src/main/java/eu/mivrenik/stomp/StompHeader.java
@@ -23,9 +23,8 @@ package eu.mivrenik.stomp;
/**
* STOMP headers.
- *
*/
-enum StompHeader {
+public enum StompHeader {
ACCEPT_VERSION("accept-version"),
CONTENT_LENGTH("content-length"),
CONTENT_TYPE("content-type"),
diff --git a/src/main/java/eu/mivrenik/stomp/StompMessageListener.java b/stomp/src/main/java/eu/mivrenik/stomp/StompMessageListener.java
similarity index 99%
rename from src/main/java/eu/mivrenik/stomp/StompMessageListener.java
rename to stomp/src/main/java/eu/mivrenik/stomp/StompMessageListener.java
index bd9205b..64a80d3 100644
--- a/src/main/java/eu/mivrenik/stomp/StompMessageListener.java
+++ b/stomp/src/main/java/eu/mivrenik/stomp/StompMessageListener.java
@@ -23,7 +23,6 @@ package eu.mivrenik.stomp;
/**
* STOMP message subscription listener interface.
- *
*/
public interface StompMessageListener {
void onMessage(String message);
diff --git a/src/main/java/eu/mivrenik/stomp/StompSubscription.java b/stomp/src/main/java/eu/mivrenik/stomp/StompSubscription.java
similarity index 99%
rename from src/main/java/eu/mivrenik/stomp/StompSubscription.java
rename to stomp/src/main/java/eu/mivrenik/stomp/StompSubscription.java
index b92d4f2..1ffbf3d 100644
--- a/src/main/java/eu/mivrenik/stomp/StompSubscription.java
+++ b/stomp/src/main/java/eu/mivrenik/stomp/StompSubscription.java
@@ -23,7 +23,6 @@ package eu.mivrenik.stomp;
/**
* STOMP subscription POJO
- *
*/
public class StompSubscription {
private final Integer id;