From 1aa837ea98b6b1f4d74ddc9b807d5afb7563a132 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 6 Apr 2017 16:02:51 +0300 Subject: [PATCH 01/69] Add IDEA project and basic functionallity. --- simple-ftp/.idea/compiler.xml | 9 + simple-ftp/.idea/gradle.xml | 18 ++ .../Gradle__com_intellij_annotations_12_0.xml | 11 ++ .../libraries/Gradle__junit_junit_4_11.xml | 11 ++ ...Gradle__org_hamcrest_hamcrest_core_1_3.xml | 11 ++ simple-ftp/.idea/misc.xml | 6 + simple-ftp/.idea/modules.xml | 10 ++ simple-ftp/.idea/modules/simple-ftp.iml | 12 ++ simple-ftp/.idea/modules/simple-ftp_main.iml | 14 ++ simple-ftp/.idea/modules/simple-ftp_test.iml | 18 ++ simple-ftp/build.gradle | 15 ++ simple-ftp/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52928 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + simple-ftp/gradlew | 169 ++++++++++++++++++ simple-ftp/gradlew.bat | 84 +++++++++ simple-ftp/settings.gradle | 2 + .../bachelor2015/veselov/hw04/Server.java | 51 ++++++ 17 files changed, 447 insertions(+) create mode 100644 simple-ftp/.idea/compiler.xml create mode 100644 simple-ftp/.idea/gradle.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 simple-ftp/.idea/misc.xml create mode 100644 simple-ftp/.idea/modules.xml create mode 100644 simple-ftp/.idea/modules/simple-ftp.iml create mode 100644 simple-ftp/.idea/modules/simple-ftp_main.iml create mode 100644 simple-ftp/.idea/modules/simple-ftp_test.iml create mode 100644 simple-ftp/build.gradle create mode 100644 simple-ftp/gradle/wrapper/gradle-wrapper.jar create mode 100644 simple-ftp/gradle/wrapper/gradle-wrapper.properties create mode 100755 simple-ftp/gradlew create mode 100644 simple-ftp/gradlew.bat create mode 100644 simple-ftp/settings.gradle create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java diff --git a/simple-ftp/.idea/compiler.xml b/simple-ftp/.idea/compiler.xml new file mode 100644 index 0000000..3f8a10e --- /dev/null +++ b/simple-ftp/.idea/compiler.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/gradle.xml b/simple-ftp/.idea/gradle.xml new file mode 100644 index 0000000..ab6e46d --- /dev/null +++ b/simple-ftp/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml b/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml new file mode 100644 index 0000000..55f6be3 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml b/simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/misc.xml b/simple-ftp/.idea/misc.xml new file mode 100644 index 0000000..0548357 --- /dev/null +++ b/simple-ftp/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules.xml b/simple-ftp/.idea/modules.xml new file mode 100644 index 0000000..96510b6 --- /dev/null +++ b/simple-ftp/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp.iml b/simple-ftp/.idea/modules/simple-ftp.iml new file mode 100644 index 0000000..2855e58 --- /dev/null +++ b/simple-ftp/.idea/modules/simple-ftp.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_main.iml b/simple-ftp/.idea/modules/simple-ftp_main.iml new file mode 100644 index 0000000..451c61e --- /dev/null +++ b/simple-ftp/.idea/modules/simple-ftp_main.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_test.iml b/simple-ftp/.idea/modules/simple-ftp_test.iml new file mode 100644 index 0000000..3f69633 --- /dev/null +++ b/simple-ftp/.idea/modules/simple-ftp_test.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/build.gradle b/simple-ftp/build.gradle new file mode 100644 index 0000000..2fdd19f --- /dev/null +++ b/simple-ftp/build.gradle @@ -0,0 +1,15 @@ +group 'ru.spbau.bachelor2015.veselov.hw04' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'com.intellij', name: 'annotations', version: '12.0' +} diff --git a/simple-ftp/gradle/wrapper/gradle-wrapper.jar b/simple-ftp/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..6ffa237849ef3607e39c3b334a92a65367962071 GIT binary patch literal 52928 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 \(.*\)$'` + 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/simple-ftp/gradlew.bat b/simple-ftp/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/simple-ftp/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/simple-ftp/settings.gradle b/simple-ftp/settings.gradle new file mode 100644 index 0000000..afa2437 --- /dev/null +++ b/simple-ftp/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'simple-ftp' + diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java new file mode 100644 index 0000000..372f195 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -0,0 +1,51 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; + +public class Server { + private final static int port = 10000; + + private final static @NotNull byte[] data = new byte[] {1, 2, 3}; + + // TODO: handle exceptions + public Server() throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(1024); + buffer.put(data); + buffer.rewind(); + + Selector selector = Selector.open(); + + ServerSocketChannel serverChannel = ServerSocketChannel.open(); + serverChannel.socket().bind(new InetSocketAddress(port)); + serverChannel.configureBlocking(false); + serverChannel.register(selector, SelectionKey.OP_ACCEPT); + + while (true) { + selector.select(); + + for (SelectionKey key : selector.selectedKeys()) { + if (key.channel().equals(serverChannel)) { + SocketChannel channel = serverChannel.accept(); + channel.configureBlocking(false); + channel.register(selector, SelectionKey.OP_WRITE); + continue; + } + + SocketChannel channel = (SocketChannel) key.channel(); + channel.write(buffer); + buffer.rewind(); + channel.close(); + } + + selector.selectedKeys().clear(); + } + } +} From 323987ae440810607250f6d9ef0db514cebf7239 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 7 Apr 2017 21:28:17 +0300 Subject: [PATCH 02/69] Add Main class. --- .../java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java new file mode 100644 index 0000000..6757399 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -0,0 +1,9 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import java.io.IOException; + +public class Main { + public static void main(String[] args) throws IOException { + new Server(); + } +} From f748e58576d0225da95f1daa43e7de57ed44b3c1 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 7 Apr 2017 21:28:34 +0300 Subject: [PATCH 03/69] Add TODO comment. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 372f195..ca00d07 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -40,7 +40,7 @@ public Server() throws IOException { } SocketChannel channel = (SocketChannel) key.channel(); - channel.write(buffer); + channel.write(buffer); // TODO: add while cycle buffer.rewind(); channel.close(); } From f3e1320106ed646c3f6e86aad0568ec0b98cdf44 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 15:36:26 +0300 Subject: [PATCH 04/69] Clean code. --- simple-ftp/.idea/preferred-vcs.xml | 6 +++ .../bachelor2015/veselov/hw04/Server.java | 52 +++++++++---------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 simple-ftp/.idea/preferred-vcs.xml diff --git a/simple-ftp/.idea/preferred-vcs.xml b/simple-ftp/.idea/preferred-vcs.xml new file mode 100644 index 0000000..848cfc4 --- /dev/null +++ b/simple-ftp/.idea/preferred-vcs.xml @@ -0,0 +1,6 @@ + + + + ApexVCS + + \ No newline at end of file diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index ca00d07..db63679 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; @@ -17,35 +16,34 @@ public class Server { // TODO: handle exceptions public Server() throws IOException { - ByteBuffer buffer = ByteBuffer.allocate(1024); - buffer.put(data); - buffer.rewind(); - - Selector selector = Selector.open(); - - ServerSocketChannel serverChannel = ServerSocketChannel.open(); - serverChannel.socket().bind(new InetSocketAddress(port)); - serverChannel.configureBlocking(false); - serverChannel.register(selector, SelectionKey.OP_ACCEPT); - - while (true) { - selector.select(); - - for (SelectionKey key : selector.selectedKeys()) { - if (key.channel().equals(serverChannel)) { - SocketChannel channel = serverChannel.accept(); - channel.configureBlocking(false); - channel.register(selector, SelectionKey.OP_WRITE); - continue; + try (Selector selector = Selector.open(); + ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { + serverSocketChannel.socket().bind(new InetSocketAddress(port)); + serverSocketChannel.configureBlocking(false); + serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); + + while (true) { + selector.select(); + + for (SelectionKey key : selector.selectedKeys()) { + if (key.channel().equals(serverSocketChannel)) { + if (!key.isAcceptable()) { + continue; + } + + SocketChannel socketChannel = serverSocketChannel.accept(); + if (socketChannel == null) { + continue; + } + + socketChannel.configureBlocking(false); + socketChannel.register(selector, SelectionKey.OP_READ); + continue; + } } - SocketChannel channel = (SocketChannel) key.channel(); - channel.write(buffer); // TODO: add while cycle - buffer.rewind(); - channel.close(); + selector.selectedKeys().clear(); } - - selector.selectedKeys().clear(); } } } From 8b2008b3b64957837a5392c7f3e30b734ecaa73a Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 18:14:09 +0300 Subject: [PATCH 05/69] Add MessageReader class. --- .../Gradle__com_intellij_annotations_12_0.xml | 11 -- ...radle__net_bytebuddy_byte_buddy_1_6_11.xml | 11 ++ ..._net_bytebuddy_byte_buddy_agent_1_6_11.xml | 11 ++ ...__org_apache_commons_commons_lang3_3_5.xml | 11 ++ ...dle__org_hamcrest_hamcrest_library_1_3.xml | 11 ++ ...Gradle__org_jetbrains_annotations_15_0.xml | 11 ++ ...radle__org_mockito_mockito_core_2_7_17.xml | 11 ++ .../Gradle__org_objenesis_objenesis_2_5.xml | 11 ++ simple-ftp/.idea/modules/simple-ftp_main.iml | 9 +- simple-ftp/.idea/modules/simple-ftp_test.iml | 8 +- simple-ftp/.idea/uiDesigner.xml | 124 ++++++++++++++++ simple-ftp/build.gradle | 5 +- .../veselov/hw04/MessageReader.java | 78 ++++++++++ .../exceptions/MessageNotReadException.java | 3 + .../MessageWithNegativeLengthException.java | 3 + .../veselov/hw04/MessageReaderTest.java | 138 ++++++++++++++++++ 16 files changed, 442 insertions(+), 14 deletions(-) delete mode 100644 simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml create mode 100644 simple-ftp/.idea/uiDesigner.xml create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java create mode 100644 simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java diff --git a/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml b/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml deleted file mode 100644 index 55f6be3..0000000 --- a/simple-ftp/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml b/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml new file mode 100644 index 0000000..7acb1fe --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml b/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml new file mode 100644 index 0000000..c532004 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml b/simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml new file mode 100644 index 0000000..fed9b56 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml b/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 0000000..59eb8d5 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml b/simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml new file mode 100644 index 0000000..ca78bcd --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml b/simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml new file mode 100644 index 0000000..0699da7 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml b/simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml new file mode 100644 index 0000000..a3418a6 --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_main.iml b/simple-ftp/.idea/modules/simple-ftp_main.iml index 451c61e..a8c722f 100644 --- a/simple-ftp/.idea/modules/simple-ftp_main.iml +++ b/simple-ftp/.idea/modules/simple-ftp_main.iml @@ -9,6 +9,13 @@ - + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_test.iml b/simple-ftp/.idea/modules/simple-ftp_test.iml index 3f69633..7ee58b2 100644 --- a/simple-ftp/.idea/modules/simple-ftp_test.iml +++ b/simple-ftp/.idea/modules/simple-ftp_test.iml @@ -10,9 +10,15 @@ - + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/uiDesigner.xml b/simple-ftp/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/simple-ftp/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/build.gradle b/simple-ftp/build.gradle index 2fdd19f..b77f012 100644 --- a/simple-ftp/build.gradle +++ b/simple-ftp/build.gradle @@ -10,6 +10,9 @@ repositories { } dependencies { + compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' - compile group: 'com.intellij', name: 'annotations', version: '12.0' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' + compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' + compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java new file mode 100644 index 0000000..98548e8 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java @@ -0,0 +1,78 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.ReadableByteChannel; + +/** + * A reader object must be created for reading messages of specific format from a ReadableByteChannel. Message format + * is: four bytes denoting the length of the message, a sequence of bytes which amount is equal to the length denoted by + * first four bytes. + */ +public class MessageReader { + private final @NotNull ReadableByteChannel channel; + + private boolean isLengthRead = false; + + private @Nullable ByteBuffer lengthBuffer = ByteBuffer.allocate(4); + + private @Nullable ByteBuffer messageBuffer; + + /** + * Creates a new MessageReader which will read from a specified channel. + * + * @param channel a channel to read from. + */ + public MessageReader(final @NotNull ReadableByteChannel channel) { + this.channel = channel; + } + + /** + * Makes an attempt to read a message from a channel. + * + * @return true if the message was fully read, false otherwise. + * @throws IOException if any IO exception occurs during reading. + * @throws MessageWithNegativeLengthException if the length of the message is negative. + */ + public boolean read() throws IOException, MessageWithNegativeLengthException { + if (!isLengthRead) { + channel.read(lengthBuffer); + if (lengthBuffer.hasRemaining()) { + return false; + } + + isLengthRead = true; + + lengthBuffer.flip(); + int length = lengthBuffer.getInt(); + lengthBuffer = null; + + if (length < 0) { + throw new MessageWithNegativeLengthException(); + } + + messageBuffer = ByteBuffer.allocate(length); + } + + channel.read(messageBuffer); + return !messageBuffer.hasRemaining(); + } + + /** + * Returns the content of the read message. + * + * @throws MessageNotReadException if message hasn't been read. + */ + public @NotNull byte[] getMessage() throws MessageNotReadException { + if (messageBuffer == null || messageBuffer.hasRemaining()) { + throw new MessageNotReadException(); + } + + return messageBuffer.array().clone(); + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java new file mode 100644 index 0000000..acefbab --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class MessageNotReadException extends Exception {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java new file mode 100644 index 0000000..60da255 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class MessageWithNegativeLengthException extends Exception {} diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java new file mode 100644 index 0000000..d059b82 --- /dev/null +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java @@ -0,0 +1,138 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; + +import java.nio.ByteBuffer; +import java.nio.channels.ReadableByteChannel; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static org.apache.commons.lang3.ArrayUtils.addAll; +import static org.apache.commons.lang3.ArrayUtils.toObject; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class MessageReaderTest { + @Test + public void testZeroLengthMessage() throws Exception { + ReadableByteChannel channel = mock(ReadableByteChannel.class); + when(channel.read(any())).thenAnswer(write(toByteArray(0))); + + MessageReader reader = new MessageReader(channel); + + assertThat(reader.read(), is(true)); + assertThat(toObject(reader.getMessage()), is(emptyArray())); + } + + @Test(expected = MessageWithNegativeLengthException.class) + public void testNegativeLengthMessage() throws Exception { + ReadableByteChannel channel = mock(ReadableByteChannel.class); + when(channel.read(any())).thenAnswer(write(toByteArray(-1))); + + MessageReader reader = new MessageReader(channel); + + reader.read(); + } + + @Test(expected = MessageNotReadException.class) + public void testGettingOfUnreadMessage() throws Exception { + ReadableByteChannel channel = mock(ReadableByteChannel.class); + + MessageReader reader = new MessageReader(channel); + + reader.getMessage(); + } + + @Test + public void testCorrectnessOneReading() throws Exception { + final byte[] data = new byte[] {1, 2, 3}; + + ReadableByteChannel channel = mock(ReadableByteChannel.class); + when(channel.read(any())).thenAnswer(write(addAll(toByteArray(3), data))); + + MessageReader reader = new MessageReader(channel); + + assertThat(reader.read(), is(true)); + assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); + } + + @Test + public void testCorrectnessMultipleReading() throws Exception { + final byte[] data = new byte[] {1, 2, 3}; + + ReadableByteChannel channel = mock(ReadableByteChannel.class); + when(channel.read(any())).thenAnswer(write(extend(addAll(toByteArray(3), data)))); + + MessageReader reader = new MessageReader(channel); + while (!reader.read()); + + assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); + } + + private @NotNull byte[][] extend(final @NotNull byte[] array) { + byte[][] result = new byte[array.length][1]; + for (int i = 0; i < array.length; i++) { + result[i][0] = array[i]; + } + + return result; + } + + private @NotNull byte[] toByteArray(int integer) { + return ByteBuffer.allocate(4).putInt(integer).array().clone(); + } + + private Writer write(final @NotNull byte[]... dataToWrite) { + return new Writer(dataToWrite); + } + + private static class Writer implements Answer { + private final @NotNull List dataToWrite; + + public Writer(final @NotNull byte[][] dataToWrite) { + this.dataToWrite = Arrays.stream(dataToWrite) + .map(bytes -> (ByteBuffer) ByteBuffer.allocate(bytes.length).put(bytes).flip()) + .collect(Collectors.toList()); + } + + @Override + public @NotNull Integer answer(final @NotNull InvocationOnMock invocation) throws Throwable { + ByteBuffer buffer = invocation.getArgument(0); + + if (dataToWrite.isEmpty()) { + return 0; + } + + ByteBuffer currentDataBuffer = dataToWrite.get(0); + if (!currentDataBuffer.hasRemaining()) { + if (buffer.hasRemaining()) { + return 0; + } + + dataToWrite.remove(0); + return 0; + } + + int bytesToWrite = Math.min(currentDataBuffer.remaining(), buffer.remaining()); + + byte[] data = new byte[bytesToWrite]; + currentDataBuffer.get(data); + if (!currentDataBuffer.hasRemaining()) { + dataToWrite.remove(0); + } + + buffer.put(data); + + return bytesToWrite; + } + } +} \ No newline at end of file From d5da803cc88565e64c814fccbe2ade9ca211c715 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 18:37:44 +0300 Subject: [PATCH 06/69] Add handling of readable connections. --- .../inspectionProfiles/Project_Default.xml | 10 ++++++ .../veselov/hw04/MessageReader.java | 12 +++++-- .../bachelor2015/veselov/hw04/Server.java | 33 ++++++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 simple-ftp/.idea/inspectionProfiles/Project_Default.xml diff --git a/simple-ftp/.idea/inspectionProfiles/Project_Default.xml b/simple-ftp/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..a3e7ede --- /dev/null +++ b/simple-ftp/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java index 98548e8..a2cc4e9 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java @@ -19,7 +19,7 @@ public class MessageReader { private boolean isLengthRead = false; - private @Nullable ByteBuffer lengthBuffer = ByteBuffer.allocate(4); + private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(4); private @Nullable ByteBuffer messageBuffer; @@ -50,7 +50,6 @@ public boolean read() throws IOException, MessageWithNegativeLengthException { lengthBuffer.flip(); int length = lengthBuffer.getInt(); - lengthBuffer = null; if (length < 0) { throw new MessageWithNegativeLengthException(); @@ -75,4 +74,13 @@ public boolean read() throws IOException, MessageWithNegativeLengthException { return messageBuffer.array().clone(); } + + /** + * Resets message reader so that it can be used to read a new message. + */ + public void reset() { + isLengthRead = false; + lengthBuffer.clear(); + messageBuffer = null; + } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index db63679..fc35695 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -1,6 +1,8 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; import java.io.IOException; import java.net.InetSocketAddress; @@ -8,12 +10,19 @@ import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; +import java.util.HashMap; +import java.util.Map; +/** + * TODO: handle connections which were closed. + */ public class Server { private final static int port = 10000; private final static @NotNull byte[] data = new byte[] {1, 2, 3}; + private final @NotNull Map messageReaders = new HashMap<>(); + // TODO: handle exceptions public Server() throws IOException { try (Selector selector = Selector.open(); @@ -37,9 +46,31 @@ public Server() throws IOException { } socketChannel.configureBlocking(false); - socketChannel.register(selector, SelectionKey.OP_READ); + SelectionKey socketChannelKey = socketChannel.register(selector, SelectionKey.OP_READ); + messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); continue; } + + if (key.isReadable()) { + MessageReader reader = messageReaders.get(key); + + try { + if (!reader.read()) { + continue; + } + } catch (MessageWithNegativeLengthException e) { + // TODO: send an answer + } + + try { + reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + reader.reset(); + // TODO: send an answer + } } selector.selectedKeys().clear(); From 29866af9dbe5879a816720dcc43488238de696a8 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 19:00:52 +0300 Subject: [PATCH 07/69] Add MessageWriter class. --- .../veselov/hw04/MessageReader.java | 2 +- .../veselov/hw04/MessageWriter.java | 43 +++++++++++++++++++ .../bachelor2015/veselov/hw04/Server.java | 7 ++- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java index a2cc4e9..b17bf75 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java @@ -19,7 +19,7 @@ public class MessageReader { private boolean isLengthRead = false; - private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(4); + private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(Integer.BYTES); private @Nullable ByteBuffer messageBuffer; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java new file mode 100644 index 0000000..d4c59cc --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java @@ -0,0 +1,43 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; + +/** + * A writer object must be created for writing messages of specific format to a WritableByteChannel. Message format is + * the same as in MessageReader class. + */ +public class MessageWriter { + private final @NotNull WritableByteChannel channel; + + private final @NotNull ByteBuffer buffer; + + /** + * Creates a new MessageWriter which will write to a specified channel. + * + * @param channel a channel to write to. + * @param data a data which will be written. + */ + public MessageWriter(final @NotNull WritableByteChannel channel, final @NotNull byte[] data) { + this.channel = channel; + + buffer = ByteBuffer.allocate(Integer.BYTES + data.length); + buffer.putInt(data.length); + buffer.put(data); + buffer.flip(); + } + + /** + * Makes an attempt to write a message to a channel. + * + * @return true if the message was fully written, false otherwise. + * @throws IOException if any IO exception occurs during writing. + */ + public boolean write() throws IOException { + channel.write(buffer); + return !buffer.hasRemaining(); + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index fc35695..8572094 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -15,6 +15,8 @@ /** * TODO: handle connections which were closed. + * TODO: queue of message writers + * TODO: more accurate writing (only when it is required) */ public class Server { private final static int port = 10000; @@ -46,7 +48,8 @@ public Server() throws IOException { } socketChannel.configureBlocking(false); - SelectionKey socketChannelKey = socketChannel.register(selector, SelectionKey.OP_READ); + SelectionKey socketChannelKey = socketChannel.register(selector, + SelectionKey.OP_READ | SelectionKey.OP_WRITE); messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); continue; } @@ -67,7 +70,7 @@ public Server() throws IOException { } catch (MessageNotReadException e) { throw new RuntimeException(e); } - + reader.reset(); // TODO: send an answer } From fa7cccfe4e2ed143edc64bf5c2afaed87b36194e Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 20:44:44 +0300 Subject: [PATCH 08/69] Add MessageTransmitter class. --- .../spbau/bachelor2015/veselov/hw04/Main.java | 2 +- .../veselov/hw04/MessageTransmitter.java | 50 +++++++++++ .../bachelor2015/veselov/hw04/Server.java | 83 ++++++++++++------- 3 files changed, 105 insertions(+), 30 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 6757399..cae5da6 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -4,6 +4,6 @@ public class Main { public static void main(String[] args) throws IOException { - new Server(); + new Server().start(); } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java new file mode 100644 index 0000000..8a626ab --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java @@ -0,0 +1,50 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.nio.channels.WritableByteChannel; +import java.util.LinkedList; + +/** + * Transmitter can write a queued sequence of messages to a specified channel. + */ +public class MessageTransmitter { + private final @NotNull WritableByteChannel channel; + + private final @NotNull LinkedList writers = new LinkedList<>(); + + /** + * Creates a new transmitter. + * + * @param channel a channel to which new transmitter will be writing messages. + */ + public MessageTransmitter(final @NotNull WritableByteChannel channel) { + this.channel = channel; + } + + /** + * Adds a new message to the queue. + * + * @param data a message content. + */ + public void addMessage(final @NotNull byte[] data) { + writers.add(new MessageWriter(channel, data)); + } + + /** + * Makes an attempt to write a message to a channel. + * + * @throws IOException if any IO exception occurs during writing. + */ + public void write() throws IOException { + if (writers.isEmpty()) { + return; + } + + MessageWriter writer = writers.getFirst(); + if (writer.write()) { + writers.poll(); + } + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 8572094..aad58ca 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -1,6 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; @@ -21,12 +22,21 @@ public class Server { private final static int port = 10000; - private final static @NotNull byte[] data = new byte[] {1, 2, 3}; + private final static @NotNull byte[] data = new byte[] {'H', 'i', '!'}; + + private @Nullable Selector selector; + + private @Nullable ServerSocketChannel serverSocketChannel; private final @NotNull Map messageReaders = new HashMap<>(); + private final @NotNull Map messageTransmitters = new HashMap<>(); + // TODO: handle exceptions - public Server() throws IOException { + public Server() { + } + + public void start() throws IOException { try (Selector selector = Selector.open(); ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { serverSocketChannel.socket().bind(new InetSocketAddress(port)); @@ -39,40 +49,18 @@ public Server() throws IOException { for (SelectionKey key : selector.selectedKeys()) { if (key.channel().equals(serverSocketChannel)) { if (!key.isAcceptable()) { - continue; - } - - SocketChannel socketChannel = serverSocketChannel.accept(); - if (socketChannel == null) { - continue; + acceptNewConnection(); } - socketChannel.configureBlocking(false); - SelectionKey socketChannelKey = socketChannel.register(selector, - SelectionKey.OP_READ | SelectionKey.OP_WRITE); - messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); continue; } if (key.isReadable()) { - MessageReader reader = messageReaders.get(key); - - try { - if (!reader.read()) { - continue; - } - } catch (MessageWithNegativeLengthException e) { - // TODO: send an answer - } - - try { - reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } + readMessage(key); + } - reader.reset(); - // TODO: send an answer + if (key.isWritable()) { + messageTransmitters.get(key).write(); } } @@ -80,4 +68,41 @@ public Server() throws IOException { } } } + + private void acceptNewConnection() throws IOException { + SocketChannel socketChannel = serverSocketChannel.accept(); + if (socketChannel == null) { + return; + } + + socketChannel.configureBlocking(false); + + // TODO: only SelectionKey.OP_READ required + SelectionKey socketChannelKey = socketChannel.register(selector, + SelectionKey.OP_READ | SelectionKey.OP_WRITE); + messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); + messageTransmitters.put(socketChannelKey, new MessageTransmitter(socketChannel)); + } + + private void readMessage(final @NotNull SelectionKey key) throws IOException { + MessageReader reader = messageReaders.get(key); + + try { + if (!reader.read()) { + return; + } + } catch (MessageWithNegativeLengthException e) { + return; + } + + try { + reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + reader.reset(); + + messageTransmitters.get(key).addMessage(data); + } } From ca5082827ed0a9b60bde800670bf2bae9a6d4ae7 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 16 Apr 2017 21:15:36 +0300 Subject: [PATCH 09/69] Add logging and fix a bug with different variables for selector and socket. --- ...g_apache_logging_log4j_log4j_api_2_8_2.xml | 11 +++++++ ..._apache_logging_log4j_log4j_core_2_8_2.xml | 11 +++++++ simple-ftp/.idea/modules/simple-ftp_main.iml | 2 ++ simple-ftp/.idea/modules/simple-ftp_test.iml | 2 ++ simple-ftp/build.gradle | 1 + .../veselov/hw04/MessageTransmitter.java | 10 +++++++ .../bachelor2015/veselov/hw04/Server.java | 29 +++++++++++++++---- simple-ftp/src/main/resources/log4j2.xml | 15 ++++++++++ 8 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml create mode 100644 simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml create mode 100644 simple-ftp/src/main/resources/log4j2.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml b/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml new file mode 100644 index 0000000..a183c4e --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml b/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml new file mode 100644 index 0000000..a2162fa --- /dev/null +++ b/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_main.iml b/simple-ftp/.idea/modules/simple-ftp_main.iml index a8c722f..c05f42d 100644 --- a/simple-ftp/.idea/modules/simple-ftp_main.iml +++ b/simple-ftp/.idea/modules/simple-ftp_main.iml @@ -13,9 +13,11 @@ + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_test.iml b/simple-ftp/.idea/modules/simple-ftp_test.iml index 7ee58b2..3337c26 100644 --- a/simple-ftp/.idea/modules/simple-ftp_test.iml +++ b/simple-ftp/.idea/modules/simple-ftp_test.iml @@ -14,11 +14,13 @@ + + \ No newline at end of file diff --git a/simple-ftp/build.gradle b/simple-ftp/build.gradle index b77f012..e25280f 100644 --- a/simple-ftp/build.gradle +++ b/simple-ftp/build.gradle @@ -15,4 +15,5 @@ dependencies { compile group: 'org.jetbrains', name: 'annotations', version: '15.0' compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java index 8a626ab..4666420 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java @@ -1,5 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -10,6 +12,8 @@ * Transmitter can write a queued sequence of messages to a specified channel. */ public class MessageTransmitter { + private final static @NotNull Logger logger = LogManager.getLogger(MessageTransmitter.class.getCanonicalName()); + private final @NotNull WritableByteChannel channel; private final @NotNull LinkedList writers = new LinkedList<>(); @@ -20,6 +24,8 @@ public class MessageTransmitter { * @param channel a channel to which new transmitter will be writing messages. */ public MessageTransmitter(final @NotNull WritableByteChannel channel) { + logger.info("New MessageTransmitter ({}) is created", this); + this.channel = channel; } @@ -29,6 +35,8 @@ public MessageTransmitter(final @NotNull WritableByteChannel channel) { * @param data a message content. */ public void addMessage(final @NotNull byte[] data) { + logger.info("New message is added to MessageTransmitter ({})", this); + writers.add(new MessageWriter(channel, data)); } @@ -38,6 +46,8 @@ public void addMessage(final @NotNull byte[] data) { * @throws IOException if any IO exception occurs during writing. */ public void write() throws IOException { + logger.debug("Write method of MessageTransmitter ({}) is called", this); + if (writers.isEmpty()) { return; } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index aad58ca..f657647 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -1,5 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; @@ -16,14 +18,16 @@ /** * TODO: handle connections which were closed. - * TODO: queue of message writers * TODO: more accurate writing (only when it is required) + * TODO: limit a length of a message */ public class Server { private final static int port = 10000; private final static @NotNull byte[] data = new byte[] {'H', 'i', '!'}; + private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); + private @Nullable Selector selector; private @Nullable ServerSocketChannel serverSocketChannel; @@ -32,13 +36,18 @@ public class Server { private final @NotNull Map messageTransmitters = new HashMap<>(); - // TODO: handle exceptions public Server() { + logger.info("New Server ({}) is created", this); } + // TODO: handle exceptions public void start() throws IOException { - try (Selector selector = Selector.open(); - ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { + logger.info("Server ({}) is started", this); + + try { + selector = Selector.open(); + serverSocketChannel = ServerSocketChannel.open(); + serverSocketChannel.socket().bind(new InetSocketAddress(port)); serverSocketChannel.configureBlocking(false); serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); @@ -48,7 +57,7 @@ public void start() throws IOException { for (SelectionKey key : selector.selectedKeys()) { if (key.channel().equals(serverSocketChannel)) { - if (!key.isAcceptable()) { + if (key.isAcceptable()) { acceptNewConnection(); } @@ -66,6 +75,14 @@ public void start() throws IOException { selector.selectedKeys().clear(); } + } finally { + if (serverSocketChannel != null) { + serverSocketChannel.close(); + } + + if (selector != null) { + selector.close(); + } } } @@ -75,6 +92,8 @@ private void acceptNewConnection() throws IOException { return; } + logger.info("Server ({}) accepted new connection", this); + socketChannel.configureBlocking(false); // TODO: only SelectionKey.OP_READ required diff --git a/simple-ftp/src/main/resources/log4j2.xml b/simple-ftp/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b8f1cce --- /dev/null +++ b/simple-ftp/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 42bd47e1d6cff21b3345b0f266fec3f857e42908 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 19:27:50 +0300 Subject: [PATCH 10/69] Rename util method. --- .../ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java index d059b82..1510b31 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java @@ -70,7 +70,7 @@ public void testCorrectnessMultipleReading() throws Exception { final byte[] data = new byte[] {1, 2, 3}; ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(extend(addAll(toByteArray(3), data)))); + when(channel.read(any())).thenAnswer(write(extrude(addAll(toByteArray(3), data)))); MessageReader reader = new MessageReader(channel); while (!reader.read()); @@ -78,7 +78,7 @@ public void testCorrectnessMultipleReading() throws Exception { assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); } - private @NotNull byte[][] extend(final @NotNull byte[] array) { + private @NotNull byte[][] extrude(final @NotNull byte[] array) { byte[][] result = new byte[array.length][1]; for (int i = 0; i < array.length; i++) { result[i][0] = array[i]; From 6247e284c593171684861a0109c2d01f5530b1e0 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 19:56:44 +0300 Subject: [PATCH 11/69] Add MessageWriterTest. --- .../veselov/hw04/MessageReaderTest.java | 2 +- .../veselov/hw04/MessageWriterTest.java | 89 +++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java index 1510b31..b2771b2 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java @@ -91,7 +91,7 @@ public void testCorrectnessMultipleReading() throws Exception { return ByteBuffer.allocate(4).putInt(integer).array().clone(); } - private Writer write(final @NotNull byte[]... dataToWrite) { + private @NotNull Writer write(final @NotNull byte[]... dataToWrite) { return new Writer(dataToWrite); } diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java new file mode 100644 index 0000000..f993b99 --- /dev/null +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java @@ -0,0 +1,89 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class MessageWriterTest { + @Test + public void testSingleWriting() throws Exception { + final byte[] data = new byte[] {1, 2, 3}; + + WritableByteChannel channel = mock(WritableByteChannel.class); + when(channel.write(any())).thenAnswer(read(data.length + Integer.BYTES)); + + MessageWriter writer = new MessageWriter(channel, data); + + assertThat(writer.write(), is(true)); + } + + @Test + public void testMultipleWritings() throws Exception { + final byte[] data = new byte[] {1, 2, 3}; + + WritableByteChannel channel = mock(WritableByteChannel.class); + when(channel.write(any())).thenAnswer(read(1, 1, 1, 1, 1, 1, 1)); + + MessageWriter writer = new MessageWriter(channel, data); + + while (!writer.write()); + } + + private @NotNull Reader read(final @NotNull int... bytesToRead) { + return new Reader(bytesToRead); + } + + private static class Reader implements Answer { + private final @NotNull List bytesToReadList; + + public Reader(final @NotNull int[] bytesToRead) { + this.bytesToReadList = Arrays.stream(bytesToRead) + .mapToObj(n -> n) + .collect(Collectors.toList()); + } + + @Override + public @NotNull Integer answer(final @NotNull InvocationOnMock invocation) throws Throwable { + ByteBuffer buffer = invocation.getArgument(0); + + if (bytesToReadList.isEmpty()) { + return 0; + } + + int currentBytesToRead = bytesToReadList.get(0); + if (currentBytesToRead == 0) { + if (buffer.hasRemaining()) { + return 0; + } + + bytesToReadList.remove(0); + return 0; + } + + int bytesToRead = Math.min(currentBytesToRead, buffer.remaining()); + + if (currentBytesToRead == bytesToRead) { + bytesToReadList.remove(0); + } + + for (int i = 0; i < bytesToRead; i++) { + buffer.get(); + } + + return bytesToRead; + } + } +} \ No newline at end of file From 5b4b2f69fabd34b7f1ece577fa934b76443bc049 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 19:59:38 +0300 Subject: [PATCH 12/69] Fix log message. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index f657647..ccd2674 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -92,7 +92,7 @@ private void acceptNewConnection() throws IOException { return; } - logger.info("Server ({}) accepted new connection", this); + logger.info("Server ({}) accept new connection", this); socketChannel.configureBlocking(false); From 61e825e7d95489cb2added04f2d193a4c908efe8 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 21:02:22 +0300 Subject: [PATCH 13/69] Add ftp messages. --- .../veselov/hw04/FTPMessageTransmitter.java | 69 ++++++++++++++++ .../spbau/bachelor2015/veselov/hw04/Main.java | 3 +- .../veselov/hw04/MessageTransmitter.java | 60 -------------- .../bachelor2015/veselov/hw04/Server.java | 78 +++++++++++++++++-- .../hw04/messages/FTPListAnswerMessage.java | 65 ++++++++++++++++ .../veselov/hw04/messages/FTPListMessage.java | 26 +++++++ .../veselov/hw04/messages/FTPMessage.java | 8 ++ 7 files changed, 240 insertions(+), 69 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java delete mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java new file mode 100644 index 0000000..ec1eec1 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -0,0 +1,69 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.nio.channels.WritableByteChannel; +import java.util.LinkedList; + +/** + * Ftp transmitter can write a queued sequence of ftp messages to a specified channel. + */ +public class FTPMessageTransmitter { + private final static @NotNull Logger logger = LogManager.getLogger(FTPMessageTransmitter.class.getCanonicalName()); + + private final @NotNull WritableByteChannel channel; + + private final @NotNull LinkedList writers = new LinkedList<>(); + + /** + * Creates a new transmitter. + * + * @param channel a channel to which new transmitter will be writing messages. + */ + public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { + logger.info("New FTPMessageTransmitter ({}) is created", this); + + this.channel = channel; + } + + /** + * Adds a new message to the queue. + * + * @param message a message to add. + */ + public void addMessage(final @NotNull FTPMessage message) throws IOException { + logger.info("New message is added to FTPMessageTransmitter ({})", this); + + try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) { + objectOutputStream.writeObject(message); + objectOutputStream.flush(); + + writers.add(new MessageWriter(channel, byteArrayOutputStream.toByteArray())); + } + } + + /** + * Makes an attempt to write a message to a channel. + * + * @throws IOException if any IO exception occurs during writing. + */ + public void write() throws IOException { + logger.debug("Write method of FTPMessageTransmitter ({}) is called", this); + + if (writers.isEmpty()) { + return; + } + + MessageWriter writer = writers.getFirst(); + if (writer.write()) { + writers.poll(); + } + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index cae5da6..48b47c0 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,9 +1,10 @@ package ru.spbau.bachelor2015.veselov.hw04; import java.io.IOException; +import java.nio.file.Paths; public class Main { public static void main(String[] args) throws IOException { - new Server().start(); + new Server(Paths.get("")).start(); } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java deleted file mode 100644 index 4666420..0000000 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageTransmitter.java +++ /dev/null @@ -1,60 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.nio.channels.WritableByteChannel; -import java.util.LinkedList; - -/** - * Transmitter can write a queued sequence of messages to a specified channel. - */ -public class MessageTransmitter { - private final static @NotNull Logger logger = LogManager.getLogger(MessageTransmitter.class.getCanonicalName()); - - private final @NotNull WritableByteChannel channel; - - private final @NotNull LinkedList writers = new LinkedList<>(); - - /** - * Creates a new transmitter. - * - * @param channel a channel to which new transmitter will be writing messages. - */ - public MessageTransmitter(final @NotNull WritableByteChannel channel) { - logger.info("New MessageTransmitter ({}) is created", this); - - this.channel = channel; - } - - /** - * Adds a new message to the queue. - * - * @param data a message content. - */ - public void addMessage(final @NotNull byte[] data) { - logger.info("New message is added to MessageTransmitter ({})", this); - - writers.add(new MessageWriter(channel, data)); - } - - /** - * Makes an attempt to write a message to a channel. - * - * @throws IOException if any IO exception occurs during writing. - */ - public void write() throws IOException { - logger.debug("Write method of MessageTransmitter ({}) is called", this); - - if (writers.isEmpty()) { - return; - } - - MessageWriter writer = writers.getFirst(); - if (writer.write()) { - writers.poll(); - } - } -} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index ccd2674..4e42f15 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -6,20 +6,35 @@ import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; +import java.io.ObjectInputStream; import java.net.InetSocketAddress; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.List; /** - * TODO: handle connections which were closed. + * TODO: handle connections which were closed + * TODO: close connections which sent incorrect messages * TODO: more accurate writing (only when it is required) - * TODO: limit a length of a message + * TODO: limit a length of an incoming message + * TODO: add javadocs + * TODO: add server thread + * TODO: implement main + * TODO: add list message test */ public class Server { private final static int port = 10000; @@ -28,16 +43,20 @@ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); + private final @NotNull Path trackedFolder; + private @Nullable Selector selector; private @Nullable ServerSocketChannel serverSocketChannel; private final @NotNull Map messageReaders = new HashMap<>(); - private final @NotNull Map messageTransmitters = new HashMap<>(); + private final @NotNull Map messageTransmitters = new HashMap<>(); - public Server() { + public Server(final @NotNull Path trackedFolder) { logger.info("New Server ({}) is created", this); + + this.trackedFolder = trackedFolder; } // TODO: handle exceptions @@ -92,7 +111,7 @@ private void acceptNewConnection() throws IOException { return; } - logger.info("Server ({}) accept new connection", this); + logger.info("Server ({}) accepted new connection", this); socketChannel.configureBlocking(false); @@ -100,7 +119,7 @@ private void acceptNewConnection() throws IOException { SelectionKey socketChannelKey = socketChannel.register(selector, SelectionKey.OP_READ | SelectionKey.OP_WRITE); messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); - messageTransmitters.put(socketChannelKey, new MessageTransmitter(socketChannel)); + messageTransmitters.put(socketChannelKey, new FTPMessageTransmitter(socketChannel)); } private void readMessage(final @NotNull SelectionKey key) throws IOException { @@ -111,17 +130,60 @@ private void readMessage(final @NotNull SelectionKey key) throws IOException { return; } } catch (MessageWithNegativeLengthException e) { + logger.error("Server ({}) received a message with negative length", this); return; } + byte[] message; try { - reader.getMessage(); + message = reader.getMessage(); } catch (MessageNotReadException e) { throw new RuntimeException(e); } reader.reset(); - messageTransmitters.get(key).addMessage(data); + handleMessage(key, message); + } + + private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) throws IOException { + FTPMessage message; + try(ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(rawMessage); + ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream)) { + + message = (FTPMessage) objectInputStream.readObject(); + } catch (ClassNotFoundException e) { + logger.error("Server ({}) received a message with class which can't be deserialized", this); + return; + } + + // TODO: use double dispatch + if (message instanceof FTPListMessage) { + handleMessage(key, (FTPListMessage) message); + } else { + logger.error("Server ({}) received an unknown message", this); + } + } + + private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) + throws IOException { + Path path = Paths.get(message.getPath()); + + if (path.isAbsolute()) { + logger.error("Server ({}) received a message with incorrect trackedFolder", this); + return; + } + + File[] files = trackedFolder.resolve(path).toFile().listFiles(); + + List entries = new ArrayList<>(); + + if (files != null) { + for (File file : files) { + entries.add(new FTPListAnswerMessage.Entry(file.getPath(), file.isDirectory())); + } + } + + messageTransmitters.get(key).addMessage(new FTPListAnswerMessage(entries)); } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java new file mode 100644 index 0000000..e955d93 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java @@ -0,0 +1,65 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import org.jetbrains.annotations.NotNull; + +import java.io.Serializable; + +import java.util.ArrayList; +import java.util.List; + +/** + * An ftp message which represents an answer on list request message. + */ +public class FTPListAnswerMessage implements FTPMessage { + private final @NotNull List content; + + /** + * Creates a message. + * + * @param content a list of entries which this message stores. + */ + public FTPListAnswerMessage(final @NotNull List content) { + this.content = new ArrayList<>(content); + } + + /** + * Returns a list of entries which this message stores. + */ + public @NotNull List getContent() { + return new ArrayList<>(content); + } + + /** + * An entry of a file in a filesystem. + */ + public static class Entry implements Serializable { + private final @NotNull String path; + + private final boolean isDirectory; + + /** + * Creates an entry. + * + * @param path a string representation of a file. + * @param isDirectory a flag which tells whether or not this entry represents a directory. + */ + public Entry(final @NotNull String path, final boolean isDirectory) { + this.path = path; + this.isDirectory = isDirectory; + } + + /** + * Returns a string representation of a file. + */ + public @NotNull String getPath() { + return path; + } + + /** + * Returns true if this entry represents a directory, false otherwise. + */ + public boolean isDirectory() { + return isDirectory; + } + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java new file mode 100644 index 0000000..3166dda --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java @@ -0,0 +1,26 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import org.jetbrains.annotations.NotNull; + +/** + * A request ftp message. This message asks server to list the content of a specified folder. + */ +public class FTPListMessage implements FTPMessage { + private final @NotNull String path; + + /** + * Creates a message. + * + * @param path a string representation of a path to a folder which content will be requested. + */ + public FTPListMessage(final @NotNull String path) { + this.path = path; + } + + /** + * Returns string representation of a path to a folder. + */ + public @NotNull String getPath() { + return path; + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java new file mode 100644 index 0000000..037d305 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java @@ -0,0 +1,8 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import java.io.Serializable; + +/** + * An interface which represents an abstract message which ftp server can use to interact on its' connections. + */ +public interface FTPMessage extends Serializable {} From 39cc50a5ea719f212d97754b3beaf864f415d5c4 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 22:40:47 +0300 Subject: [PATCH 14/69] Implement Main class. --- .../spbau/bachelor2015/veselov/hw04/Main.java | 30 +++++- .../bachelor2015/veselov/hw04/Server.java | 93 ++++++++++--------- 2 files changed, 80 insertions(+), 43 deletions(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 48b47c0..5817fb1 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,10 +1,38 @@ package ru.spbau.bachelor2015.veselov.hw04; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.nio.file.Paths; public class Main { public static void main(String[] args) throws IOException { - new Server(Paths.get("")).start(); + Server server = new Server(Paths.get("")); + + boolean shouldRun = true; + + while (shouldRun) { + try (InputStreamReader inputStreamReader = new InputStreamReader(System.in); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { + String command = bufferedReader.readLine(); + + switch (command) { + case "start": + server.start(); + break; + + case "stop": + server.stop(); + break; + + case "exit": + shouldRun = false; + break; + + default: + System.out.println("Unknown command"); + } + } + } } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 4e42f15..c5e19f4 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -23,8 +23,8 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; /** * TODO: handle connections which were closed @@ -32,9 +32,11 @@ * TODO: more accurate writing (only when it is required) * TODO: limit a length of an incoming message * TODO: add javadocs - * TODO: add server thread - * TODO: implement main * TODO: add list message test + * TODO: add FTPMessageTransmitter test + * TODO: add bytes for message length constant + * TODO: fix multiple 1 in MessageWriterTest + * TODO: add javadocs to Main */ public class Server { private final static int port = 10000; @@ -43,15 +45,13 @@ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); - private final @NotNull Path trackedFolder; + private volatile boolean shouldRun; - private @Nullable Selector selector; - - private @Nullable ServerSocketChannel serverSocketChannel; + private final @NotNull Path trackedFolder; - private final @NotNull Map messageReaders = new HashMap<>(); + private @Nullable Map messageReaders = new HashMap<>(); - private final @NotNull Map messageTransmitters = new HashMap<>(); + private @Nullable Map messageTransmitters = new HashMap<>(); public Server(final @NotNull Path trackedFolder) { logger.info("New Server ({}) is created", this); @@ -59,53 +59,62 @@ public Server(final @NotNull Path trackedFolder) { this.trackedFolder = trackedFolder; } - // TODO: handle exceptions - public void start() throws IOException { + public void start() { logger.info("Server ({}) is started", this); - try { - selector = Selector.open(); - serverSocketChannel = ServerSocketChannel.open(); + shouldRun = true; - serverSocketChannel.socket().bind(new InetSocketAddress(port)); - serverSocketChannel.configureBlocking(false); - serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); + messageReaders = new HashMap<>(); + messageTransmitters = new HashMap<>(); - while (true) { - selector.select(); + new Thread( + () -> { + // TODO: handle exceptions + try (Selector selector = Selector.open(); + ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { + serverSocketChannel.socket().bind(new InetSocketAddress(port)); + serverSocketChannel.configureBlocking(false); + serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); - for (SelectionKey key : selector.selectedKeys()) { - if (key.channel().equals(serverSocketChannel)) { - if (key.isAcceptable()) { - acceptNewConnection(); - } + while (shouldRun) { + selector.select(); - continue; - } + for (SelectionKey key : selector.selectedKeys()) { + if (key.channel().equals(serverSocketChannel)) { + if (key.isAcceptable()) { + acceptNewConnection(selector, serverSocketChannel); + } - if (key.isReadable()) { - readMessage(key); - } + continue; + } - if (key.isWritable()) { - messageTransmitters.get(key).write(); + if (key.isReadable()) { + readMessage(key); + } + + if (key.isWritable()) { + messageTransmitters.get(key).write(); + } + } + + selector.selectedKeys().clear(); } + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + messageReaders = null; + messageTransmitters = null; } - - selector.selectedKeys().clear(); - } - } finally { - if (serverSocketChannel != null) { - serverSocketChannel.close(); } + ).start(); + } - if (selector != null) { - selector.close(); - } - } + public void stop() { + shouldRun = false; } - private void acceptNewConnection() throws IOException { + private void acceptNewConnection(final @NotNull Selector selector, + final @NotNull ServerSocketChannel serverSocketChannel) throws IOException { SocketChannel socketChannel = serverSocketChannel.accept(); if (socketChannel == null) { return; From 160bbbfd7747edc7430f62e57f97b8c2483c279e Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 22:51:04 +0300 Subject: [PATCH 15/69] Add constant for message length in a low-level message. --- .../veselov/hw04/FTPMessageTransmitter.java | 3 ++- .../ru/spbau/bachelor2015/veselov/hw04/Server.java | 13 ++++++------- .../hw04/exceptions/MessageNotReadException.java | 3 --- .../FTPListAnswerMessage.java | 2 +- .../{messages => ftpmessages}/FTPListMessage.java | 2 +- .../hw04/{messages => ftpmessages}/FTPMessage.java | 2 +- .../bachelor2015/veselov/hw04/messages/Message.java | 5 +++++ .../veselov/hw04/{ => messages}/MessageReader.java | 8 ++++---- .../veselov/hw04/{ => messages}/MessageWriter.java | 4 ++-- .../exceptions/MessageNotReadException.java | 3 +++ .../MessageWithNegativeLengthException.java | 2 +- .../veselov/hw04/MessageReaderTest.java | 5 +++-- .../veselov/hw04/MessageWriterTest.java | 13 +++++++++++-- 13 files changed, 40 insertions(+), 25 deletions(-) delete mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{messages => ftpmessages}/FTPListAnswerMessage.java (96%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{messages => ftpmessages}/FTPListMessage.java (91%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{messages => ftpmessages}/FTPMessage.java (78%) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/MessageReader.java (90%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/MessageWriter.java (90%) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/exceptions/MessageWithNegativeLengthException.java (52%) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index ec1eec1..e5b7dce 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -3,7 +3,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index c5e19f4..bf1a353 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -4,11 +4,12 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; -import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import java.io.ByteArrayInputStream; import java.io.File; @@ -34,8 +35,6 @@ * TODO: add javadocs * TODO: add list message test * TODO: add FTPMessageTransmitter test - * TODO: add bytes for message length constant - * TODO: fix multiple 1 in MessageWriterTest * TODO: add javadocs to Main */ public class Server { diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java deleted file mode 100644 index acefbab..0000000 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageNotReadException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; - -public class MessageNotReadException extends Exception {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java similarity index 96% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java index e955d93..c848c9c 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; import org.jetbrains.annotations.NotNull; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java similarity index 91% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java index 3166dda..9afc2b9 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; import org.jetbrains.annotations.NotNull; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java similarity index 78% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java index 037d305..b01ac9a 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; import java.io.Serializable; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java new file mode 100644 index 0000000..e0ec2ca --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java @@ -0,0 +1,5 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +public final class Message { + public static final int LENGTH_BYTES = Integer.BYTES; +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java similarity index 90% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java index b17bf75..11afd87 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageReader.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java @@ -1,9 +1,9 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import java.io.IOException; import java.nio.ByteBuffer; @@ -19,7 +19,7 @@ public class MessageReader { private boolean isLengthRead = false; - private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(Integer.BYTES); + private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(Message.LENGTH_BYTES); private @Nullable ByteBuffer messageBuffer; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java similarity index 90% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java index d4c59cc..d129960 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriter.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; @@ -24,7 +24,7 @@ public class MessageWriter { public MessageWriter(final @NotNull WritableByteChannel channel, final @NotNull byte[] data) { this.channel = channel; - buffer = ByteBuffer.allocate(Integer.BYTES + data.length); + buffer = ByteBuffer.allocate(Message.LENGTH_BYTES + data.length); buffer.putInt(data.length); buffer.put(data); buffer.flip(); diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java new file mode 100644 index 0000000..dbb0734 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; + +public class MessageNotReadException extends Exception {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java similarity index 52% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java index 60da255..b6c8d82 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/MessageWithNegativeLengthException.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; public class MessageWithNegativeLengthException extends Exception {} diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java index b2771b2..24a323f 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java @@ -4,8 +4,9 @@ import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java index f993b99..1eec7f9 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import ru.spbau.bachelor2015.veselov.hw04.messages.Message; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; @@ -23,7 +25,7 @@ public void testSingleWriting() throws Exception { final byte[] data = new byte[] {1, 2, 3}; WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())).thenAnswer(read(data.length + Integer.BYTES)); + when(channel.write(any())).thenAnswer(read(data.length + Message.LENGTH_BYTES)); MessageWriter writer = new MessageWriter(channel, data); @@ -35,13 +37,20 @@ public void testMultipleWritings() throws Exception { final byte[] data = new byte[] {1, 2, 3}; WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())).thenAnswer(read(1, 1, 1, 1, 1, 1, 1)); + when(channel.write(any())).thenAnswer(read(intArrayOfOnes(data.length + Message.LENGTH_BYTES))); MessageWriter writer = new MessageWriter(channel, data); while (!writer.write()); } + private @NotNull int[] intArrayOfOnes(final int size) { + int[] array = new int[size]; + Arrays.fill(array, 1); + + return array; + } + private @NotNull Reader read(final @NotNull int... bytesToRead) { return new Reader(bytesToRead); } From 41bf92d47d796fd995a6eeab01704207e9dcf9c9 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Fri, 21 Apr 2017 22:56:24 +0300 Subject: [PATCH 16/69] Remove unnecessary field in Server class. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index bf1a353..d6ee762 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -40,8 +40,6 @@ public class Server { private final static int port = 10000; - private final static @NotNull byte[] data = new byte[] {'H', 'i', '!'}; - private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); private volatile boolean shouldRun; From 1a7f80e760d2cdfac549d2fb2daf49bb6a7b185c Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 22 Apr 2017 00:47:43 +0300 Subject: [PATCH 17/69] Add list message test. --- .../veselov/hw04/FTPMessageTransmitter.java | 11 +- .../spbau/bachelor2015/veselov/hw04/Main.java | 2 +- .../bachelor2015/veselov/hw04/Server.java | 28 ++--- .../ftpmessages/FTPListAnswerMessage.java | 7 ++ .../veselov/hw04/MessageReaderTest.java | 13 +- .../veselov/hw04/MessageWriterTest.java | 8 +- .../bachelor2015/veselov/hw04/ServerTest.java | 117 ++++++++++++++++++ .../bachelor2015/veselov/hw04/TestUtils.java | 20 +++ 8 files changed, 163 insertions(+), 43 deletions(-) create mode 100644 simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java create mode 100644 simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index e5b7dce..23151f6 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -1,14 +1,13 @@ package ru.spbau.bachelor2015.veselov.hw04; +import org.apache.commons.lang3.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ObjectOutputStream; import java.nio.channels.WritableByteChannel; import java.util.LinkedList; @@ -41,13 +40,7 @@ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { public void addMessage(final @NotNull FTPMessage message) throws IOException { logger.info("New message is added to FTPMessageTransmitter ({})", this); - try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) { - objectOutputStream.writeObject(message); - objectOutputStream.flush(); - - writers.add(new MessageWriter(channel, byteArrayOutputStream.toByteArray())); - } + writers.add(new MessageWriter(channel, SerializationUtils.serialize(message))); } /** diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 5817fb1..ee55359 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -7,7 +7,7 @@ public class Main { public static void main(String[] args) throws IOException { - Server server = new Server(Paths.get("")); + Server server = new Server(Paths.get(""), 10000); boolean shouldRun = true; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index d6ee762..ac30ff9 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -1,20 +1,19 @@ package ru.spbau.bachelor2015.veselov.hw04; +import org.apache.commons.lang3.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.io.ObjectInputStream; import java.net.InetSocketAddress; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; @@ -33,27 +32,27 @@ * TODO: more accurate writing (only when it is required) * TODO: limit a length of an incoming message * TODO: add javadocs - * TODO: add list message test * TODO: add FTPMessageTransmitter test * TODO: add javadocs to Main */ public class Server { - private final static int port = 10000; - private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); private volatile boolean shouldRun; + private final int port; + private final @NotNull Path trackedFolder; private @Nullable Map messageReaders = new HashMap<>(); private @Nullable Map messageTransmitters = new HashMap<>(); - public Server(final @NotNull Path trackedFolder) { + public Server(final @NotNull Path trackedFolder, final int port) { logger.info("New Server ({}) is created", this); this.trackedFolder = trackedFolder; + this.port = port; } public void start() { @@ -153,15 +152,7 @@ private void readMessage(final @NotNull SelectionKey key) throws IOException { } private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) throws IOException { - FTPMessage message; - try(ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(rawMessage); - ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream)) { - - message = (FTPMessage) objectInputStream.readObject(); - } catch (ClassNotFoundException e) { - logger.error("Server ({}) received a message with class which can't be deserialized", this); - return; - } + FTPMessage message = SerializationUtils.deserialize(rawMessage); // TODO: use double dispatch if (message instanceof FTPListMessage) { @@ -186,7 +177,8 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi if (files != null) { for (File file : files) { - entries.add(new FTPListAnswerMessage.Entry(file.getPath(), file.isDirectory())); + entries.add(new FTPListAnswerMessage.Entry(trackedFolder.relativize(file.toPath()).toString(), + file.isDirectory())); } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java index c848c9c..d13f233 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java @@ -61,5 +61,12 @@ public Entry(final @NotNull String path, final boolean isDirectory) { public boolean isDirectory() { return isDirectory; } + + /** + * Returns a string representation of this file entry. + */ + public @NotNull String toString() { + return path + "[" + Boolean.toString(isDirectory) + "]"; + } } } diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java index 24a323f..50786a8 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java @@ -21,12 +21,13 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.toLengthByteArray; public class MessageReaderTest { @Test public void testZeroLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(toByteArray(0))); + when(channel.read(any())).thenAnswer(write(toLengthByteArray(0))); MessageReader reader = new MessageReader(channel); @@ -37,7 +38,7 @@ public void testZeroLengthMessage() throws Exception { @Test(expected = MessageWithNegativeLengthException.class) public void testNegativeLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(toByteArray(-1))); + when(channel.read(any())).thenAnswer(write(toLengthByteArray(-1))); MessageReader reader = new MessageReader(channel); @@ -58,7 +59,7 @@ public void testCorrectnessOneReading() throws Exception { final byte[] data = new byte[] {1, 2, 3}; ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(addAll(toByteArray(3), data))); + when(channel.read(any())).thenAnswer(write(addAll(toLengthByteArray(3), data))); MessageReader reader = new MessageReader(channel); @@ -71,7 +72,7 @@ public void testCorrectnessMultipleReading() throws Exception { final byte[] data = new byte[] {1, 2, 3}; ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(extrude(addAll(toByteArray(3), data)))); + when(channel.read(any())).thenAnswer(write(extrude(addAll(toLengthByteArray(3), data)))); MessageReader reader = new MessageReader(channel); while (!reader.read()); @@ -88,10 +89,6 @@ public void testCorrectnessMultipleReading() throws Exception { return result; } - private @NotNull byte[] toByteArray(int integer) { - return ByteBuffer.allocate(4).putInt(integer).array().clone(); - } - private @NotNull Writer write(final @NotNull byte[]... dataToWrite) { return new Writer(dataToWrite); } diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java index 1eec7f9..011c234 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java @@ -18,6 +18,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.intArrayOfOnes; public class MessageWriterTest { @Test @@ -44,13 +45,6 @@ public void testMultipleWritings() throws Exception { while (!writer.write()); } - private @NotNull int[] intArrayOfOnes(final int size) { - int[] array = new int[size]; - Arrays.fill(array, 1); - - return array; - } - private @NotNull Reader read(final @NotNull int... bytesToRead) { return new Reader(bytesToRead); } diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java new file mode 100644 index 0000000..0103ddf --- /dev/null +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -0,0 +1,117 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.apache.commons.lang3.SerializationUtils; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.jetbrains.annotations.NotNull; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.Message; + +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.nio.ByteBuffer; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static org.apache.commons.lang3.ArrayUtils.addAll; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.is; +import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.toLengthByteArray; + +public class ServerTest { + @Rule + public TemporaryFolder serverFolder = new TemporaryFolder(); + + @Test + public void testFTPListMessage() throws Exception { + Path pathToRoot = serverFolder.getRoot().toPath(); + + final String fileName = "file"; + Path pathToFile = serverFolder.newFile(fileName).toPath(); + + final int port = 10000; + Server server = new Server(pathToRoot, port); + server.start(); + + Socket socket = null; + while (socket == null) { + try { + socket = new Socket((String) null, port); + } catch (IOException e) { + } + } + + FTPListMessage message = new FTPListMessage(Paths.get("").toString()); + + socket.getOutputStream().write(prepareMessage(message)); + + FTPListAnswerMessage answer = SerializationUtils.deserialize(readMessage(socket.getInputStream())); + + assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), + false)))); + } + + private @NotNull byte[] prepareMessage(final @NotNull FTPMessage message) { + byte[] content = SerializationUtils.serialize(message); + + return addAll(toLengthByteArray(content.length), content); + } + + private @NotNull byte[] readMessage(final @NotNull InputStream inputStream) throws IOException { + byte[] rawLength = new byte[Message.LENGTH_BYTES]; + if (inputStream.read(rawLength) != rawLength.length) { + throw new RuntimeException(); + } + + ByteBuffer buffer = ByteBuffer.allocate(rawLength.length); + buffer.put(rawLength).flip(); + int length = buffer.getInt(); + + byte[] message = new byte[length]; + if (inputStream.read(message) != message.length) { + throw new RuntimeException(); + } + + return message; + } + + private @NotNull FileEntryMatcher fileEntry(final @NotNull Path path, + final boolean isDirectory) { + return new FileEntryMatcher(path, isDirectory); + } + + private static class FileEntryMatcher extends BaseMatcher { + private final @NotNull Path path; + + private final boolean isDirectory; + + public FileEntryMatcher(final @NotNull Path path, final boolean isDirectory) { + this.path = path; + this.isDirectory = isDirectory; + } + + @Override + public boolean matches(final @NotNull Object item) { + if (!(item instanceof FTPListAnswerMessage.Entry)) { + return false; + } + + FTPListAnswerMessage.Entry entry = (FTPListAnswerMessage.Entry) item; + + return Paths.get(entry.getPath()).equals(path) && entry.isDirectory() == isDirectory; + } + + @Override + public void describeTo(final @NotNull Description description) { + description.appendText("expected path: ").appendValue(path) + .appendText(", expected isDirectory: ").appendValue(isDirectory); + } + } +} \ No newline at end of file diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java new file mode 100644 index 0000000..95428ae --- /dev/null +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java @@ -0,0 +1,20 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.Message; + +import java.nio.ByteBuffer; +import java.util.Arrays; + +public final class TestUtils { + public static @NotNull byte[] toLengthByteArray(int integer) { + return ByteBuffer.allocate(Message.LENGTH_BYTES).putInt(integer).array().clone(); + } + + public static @NotNull int[] intArrayOfOnes(final int size) { + int[] array = new int[size]; + Arrays.fill(array, 1); + + return array; + } +} From 272fd4b1d8fc6b9024ae389bb0e6837cda16d942 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 22 Apr 2017 00:55:32 +0300 Subject: [PATCH 18/69] Add javadocs to Main class. --- .../java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 9 +++++++++ .../java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index ee55359..90ac1ed 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -5,7 +5,16 @@ import java.io.InputStreamReader; import java.nio.file.Paths; +/** + * Entry point of a program. This class allows to start and stop server through a console. + */ public class Main { + /** + * Entry method. + * + * @param args arguments are ignored. + * @throws IOException any IO exception which may occur during reading of commands. + */ public static void main(String[] args) throws IOException { Server server = new Server(Paths.get(""), 10000); diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index ac30ff9..e8c5648 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -31,9 +31,8 @@ * TODO: close connections which sent incorrect messages * TODO: more accurate writing (only when it is required) * TODO: limit a length of an incoming message - * TODO: add javadocs + * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test - * TODO: add javadocs to Main */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From d3be52108d4715694be0c145f612864dbee71e15 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 22 Apr 2017 11:04:45 +0300 Subject: [PATCH 19/69] Add logging of server stopping. --- .../java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index e8c5648..ba18430 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -33,6 +33,7 @@ * TODO: limit a length of an incoming message * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test + * TODO: add server test with multiple messages */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -55,8 +56,6 @@ public Server(final @NotNull Path trackedFolder, final int port) { } public void start() { - logger.info("Server ({}) is started", this); - shouldRun = true; messageReaders = new HashMap<>(); @@ -71,6 +70,8 @@ public void start() { serverSocketChannel.configureBlocking(false); serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); + logger.info("Server ({}) is started", this); + while (shouldRun) { selector.select(); @@ -99,6 +100,8 @@ public void start() { } finally { messageReaders = null; messageTransmitters = null; + + logger.info("Server ({}) is stopped", this); } } ).start(); From 70a930bd4bee9451f22249ebce7f9df2b9c60d3c Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 11:54:11 +0300 Subject: [PATCH 20/69] Add exception handling to Server class. --- .../bachelor2015/veselov/hw04/Server.java | 42 +++++++++---------- .../exceptions/InvalidMessageException.java | 4 ++ .../MessageWithNegativeLengthException.java | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index ba18430..2b36a46 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -9,8 +9,8 @@ import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import java.io.File; import java.io.IOException; @@ -27,8 +27,6 @@ import java.util.Map; /** - * TODO: handle connections which were closed - * TODO: close connections which sent incorrect messages * TODO: more accurate writing (only when it is required) * TODO: limit a length of an incoming message * TODO: add javadocs to Server @@ -63,7 +61,6 @@ public void start() { new Thread( () -> { - // TODO: handle exceptions try (Selector selector = Selector.open(); ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { serverSocketChannel.socket().bind(new InetSocketAddress(port)); @@ -76,20 +73,23 @@ public void start() { selector.select(); for (SelectionKey key : selector.selectedKeys()) { - if (key.channel().equals(serverSocketChannel)) { + try { if (key.isAcceptable()) { acceptNewConnection(selector, serverSocketChannel); } - continue; - } - - if (key.isReadable()) { - readMessage(key); - } + if (key.isReadable()) { + readMessage(key); + } - if (key.isWritable()) { - messageTransmitters.get(key).write(); + if (key.isWritable()) { + messageTransmitters.get(key).write(); + } + } catch (InvalidMessageException e) { + logger.error("Server ({}) received an invalid message", this); + } catch (IOException ignored) { + } finally { + key.channel().close(); } } @@ -124,20 +124,15 @@ private void acceptNewConnection(final @NotNull Selector selector, // TODO: only SelectionKey.OP_READ required SelectionKey socketChannelKey = socketChannel.register(selector, - SelectionKey.OP_READ | SelectionKey.OP_WRITE); + SelectionKey.OP_READ | SelectionKey.OP_WRITE); messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); messageTransmitters.put(socketChannelKey, new FTPMessageTransmitter(socketChannel)); } - private void readMessage(final @NotNull SelectionKey key) throws IOException { + private void readMessage(final @NotNull SelectionKey key) throws IOException, InvalidMessageException { MessageReader reader = messageReaders.get(key); - try { - if (!reader.read()) { - return; - } - } catch (MessageWithNegativeLengthException e) { - logger.error("Server ({}) received a message with negative length", this); + if (!reader.read()) { return; } @@ -153,14 +148,15 @@ private void readMessage(final @NotNull SelectionKey key) throws IOException { handleMessage(key, message); } - private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) throws IOException { + private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) + throws IOException, InvalidMessageException { FTPMessage message = SerializationUtils.deserialize(rawMessage); // TODO: use double dispatch if (message instanceof FTPListMessage) { handleMessage(key, (FTPListMessage) message); } else { - logger.error("Server ({}) received an unknown message", this); + throw new InvalidMessageException(); } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java new file mode 100644 index 0000000..24d9611 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java @@ -0,0 +1,4 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; + +public class InvalidMessageException extends Exception { +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java index b6c8d82..fae272e 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java @@ -1,3 +1,3 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; -public class MessageWithNegativeLengthException extends Exception {} +public class MessageWithNegativeLengthException extends InvalidMessageException {} From 89a0b22fe2bbe76f6268a74c5a13fa1f6bd3ebe9 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 12:22:18 +0300 Subject: [PATCH 21/69] Improve Server testing. --- .../bachelor2015/veselov/hw04/Server.java | 19 +++++- .../bachelor2015/veselov/hw04/ServerTest.java | 67 ++++++++++++++++--- 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 2b36a46..0bc1cb1 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -31,7 +31,8 @@ * TODO: limit a length of an incoming message * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test - * TODO: add server test with multiple messages + * TODO: add javadocs to exceptions + * TODO: use special field instead of maps */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -87,9 +88,14 @@ public void start() { } } catch (InvalidMessageException e) { logger.error("Server ({}) received an invalid message", this); + + closeConnection(key); } catch (IOException ignored) { - } finally { - key.channel().close(); + logger.error( + "IOException occurred during interaction of Server ({}) with a connection", + this); + + closeConnection(key); } } @@ -129,6 +135,13 @@ private void acceptNewConnection(final @NotNull Selector selector, messageTransmitters.put(socketChannelKey, new FTPMessageTransmitter(socketChannel)); } + private void closeConnection(final @NotNull SelectionKey key) throws IOException { + messageTransmitters.remove(key); + messageReaders.remove(key); + + key.channel().close(); + } + private void readMessage(final @NotNull SelectionKey key) throws IOException, InvalidMessageException { MessageReader reader = messageReaders.get(key); diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 0103ddf..686aa74 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -4,6 +4,7 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.jetbrains.annotations.NotNull; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -29,13 +30,47 @@ public class ServerTest { @Rule public TemporaryFolder serverFolder = new TemporaryFolder(); + private final String fileName = "file"; + + private Path pathToRoot; + + private Path pathToFile; + + @Before + public void folderInitialization() throws Exception { + pathToRoot = serverFolder.getRoot().toPath(); + pathToFile = serverFolder.newFile(fileName).toPath(); + } + + private final TestMessage listTestMessage = + new TestMessage(new FTPListMessage(Paths.get("").toString())) { + @Override + public void check(@NotNull FTPMessage message) throws Exception { + FTPListAnswerMessage answer = (FTPListAnswerMessage) message; + + assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), + false)))); + } + }; + @Test public void testFTPListMessage() throws Exception { - Path pathToRoot = serverFolder.getRoot().toPath(); + processMessages(new TestMessage[] { listTestMessage }); + } - final String fileName = "file"; - Path pathToFile = serverFolder.newFile(fileName).toPath(); + @Test + public void testFTPListMessages() throws Exception { + final int numberOfMessages = 10; + + TestMessage[] messages = new TestMessage[numberOfMessages]; + for (int i = 0; i < numberOfMessages; i++) { + messages[i] = listTestMessage; + } + processMessages(messages); + } + + private void processMessages(final @NotNull TestMessage[] messages) throws Exception { final int port = 10000; Server server = new Server(pathToRoot, port); server.start(); @@ -48,14 +83,15 @@ public void testFTPListMessage() throws Exception { } } - FTPListMessage message = new FTPListMessage(Paths.get("").toString()); + for (TestMessage testMessage : messages) { + socket.getOutputStream().write(prepareMessage(testMessage.getMessage())); - socket.getOutputStream().write(prepareMessage(message)); + FTPMessage answer = SerializationUtils.deserialize(readMessage(socket.getInputStream())); - FTPListAnswerMessage answer = SerializationUtils.deserialize(readMessage(socket.getInputStream())); + testMessage.check(answer); + } - assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), - false)))); + socket.close(); } private @NotNull byte[] prepareMessage(final @NotNull FTPMessage message) { @@ -66,6 +102,7 @@ public void testFTPListMessage() throws Exception { private @NotNull byte[] readMessage(final @NotNull InputStream inputStream) throws IOException { byte[] rawLength = new byte[Message.LENGTH_BYTES]; + if (inputStream.read(rawLength) != rawLength.length) { throw new RuntimeException(); } @@ -87,6 +124,20 @@ public void testFTPListMessage() throws Exception { return new FileEntryMatcher(path, isDirectory); } + private static abstract class TestMessage { + private final @NotNull FTPMessage message; + + public TestMessage(final @NotNull FTPMessage message) { + this.message = message; + } + + public @NotNull FTPMessage getMessage() { + return message; + } + + public abstract void check(final @NotNull FTPMessage answer) throws Exception; + } + private static class FileEntryMatcher extends BaseMatcher { private final @NotNull Path path; From bce3e8d85b01afc8234dcb61ea3f2e55b88d33ca Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 12:47:49 +0300 Subject: [PATCH 22/69] Replace maps with SelectionKey attachment. --- .../veselov/hw04/FTPChannelAttachment.java | 23 +++++++++++++ .../bachelor2015/veselov/hw04/Server.java | 33 ++++--------------- .../bachelor2015/veselov/hw04/ServerTest.java | 2 ++ 3 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java new file mode 100644 index 0000000..b152230 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java @@ -0,0 +1,23 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; + +public class FTPChannelAttachment { + private final @NotNull MessageReader reader; + + private final @NotNull FTPMessageTransmitter transmitter; + + public FTPChannelAttachment(final @NotNull MessageReader reader, final @NotNull FTPMessageTransmitter transmitter) { + this.reader = reader; + this.transmitter = transmitter; + } + + public @NotNull MessageReader getReader() { + return reader; + } + + public @NotNull FTPMessageTransmitter getTransmitter() { + return transmitter; + } +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 0bc1cb1..66abdbb 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -4,7 +4,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; @@ -22,17 +21,13 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** - * TODO: more accurate writing (only when it is required) * TODO: limit a length of an incoming message * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test * TODO: add javadocs to exceptions - * TODO: use special field instead of maps */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -43,10 +38,6 @@ public class Server { private final @NotNull Path trackedFolder; - private @Nullable Map messageReaders = new HashMap<>(); - - private @Nullable Map messageTransmitters = new HashMap<>(); - public Server(final @NotNull Path trackedFolder, final int port) { logger.info("New Server ({}) is created", this); @@ -57,9 +48,6 @@ public Server(final @NotNull Path trackedFolder, final int port) { public void start() { shouldRun = true; - messageReaders = new HashMap<>(); - messageTransmitters = new HashMap<>(); - new Thread( () -> { try (Selector selector = Selector.open(); @@ -84,7 +72,7 @@ public void start() { } if (key.isWritable()) { - messageTransmitters.get(key).write(); + ((FTPChannelAttachment) key.attachment()).getTransmitter().write(); } } catch (InvalidMessageException e) { logger.error("Server ({}) received an invalid message", this); @@ -104,9 +92,6 @@ public void start() { } catch (IOException e) { throw new RuntimeException(e); } finally { - messageReaders = null; - messageTransmitters = null; - logger.info("Server ({}) is stopped", this); } } @@ -128,22 +113,18 @@ private void acceptNewConnection(final @NotNull Selector selector, socketChannel.configureBlocking(false); - // TODO: only SelectionKey.OP_READ required - SelectionKey socketChannelKey = socketChannel.register(selector, - SelectionKey.OP_READ | SelectionKey.OP_WRITE); - messageReaders.put(socketChannelKey, new MessageReader(socketChannel)); - messageTransmitters.put(socketChannelKey, new FTPMessageTransmitter(socketChannel)); + socketChannel.register( + selector, + SelectionKey.OP_READ | SelectionKey.OP_WRITE, + new FTPChannelAttachment(new MessageReader(socketChannel), new FTPMessageTransmitter(socketChannel))); } private void closeConnection(final @NotNull SelectionKey key) throws IOException { - messageTransmitters.remove(key); - messageReaders.remove(key); - key.channel().close(); } private void readMessage(final @NotNull SelectionKey key) throws IOException, InvalidMessageException { - MessageReader reader = messageReaders.get(key); + MessageReader reader = ((FTPChannelAttachment) key.attachment()).getReader(); if (!reader.read()) { return; @@ -193,6 +174,6 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi } } - messageTransmitters.get(key).addMessage(new FTPListAnswerMessage(entries)); + ((FTPChannelAttachment) key.attachment()).getTransmitter().addMessage(new FTPListAnswerMessage(entries)); } } diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 686aa74..3b244a7 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -92,6 +92,8 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep } socket.close(); + + server.stop(); } private @NotNull byte[] prepareMessage(final @NotNull FTPMessage message) { From d75e26326566c0534bd1e6b4cb1d5e7d3e8c9ec5 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 12:53:41 +0300 Subject: [PATCH 23/69] Imporve exceptions system. --- .../bachelor2015/veselov/hw04/Server.java | 25 +++++++++---------- .../InvalidFTPMessageException.java | 3 +++ .../exceptions/InvalidPathException.java | 3 +++ .../exceptions/NoSuchMessageException.java | 3 +++ 4 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 66abdbb..8ea0244 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -7,6 +7,9 @@ import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.InvalidFTPMessageException; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.InvalidPathException; +import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.NoSuchMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; @@ -74,16 +77,16 @@ public void start() { if (key.isWritable()) { ((FTPChannelAttachment) key.attachment()).getTransmitter().write(); } - } catch (InvalidMessageException e) { + } catch (InvalidMessageException | InvalidFTPMessageException e) { logger.error("Server ({}) received an invalid message", this); - closeConnection(key); + key.channel().close(); } catch (IOException ignored) { logger.error( "IOException occurred during interaction of Server ({}) with a connection", this); - closeConnection(key); + key.channel().close(); } } @@ -119,11 +122,8 @@ private void acceptNewConnection(final @NotNull Selector selector, new FTPChannelAttachment(new MessageReader(socketChannel), new FTPMessageTransmitter(socketChannel))); } - private void closeConnection(final @NotNull SelectionKey key) throws IOException { - key.channel().close(); - } - - private void readMessage(final @NotNull SelectionKey key) throws IOException, InvalidMessageException { + private void readMessage(final @NotNull SelectionKey key) + throws IOException, InvalidMessageException, InvalidFTPMessageException { MessageReader reader = ((FTPChannelAttachment) key.attachment()).getReader(); if (!reader.read()) { @@ -143,24 +143,23 @@ private void readMessage(final @NotNull SelectionKey key) throws IOException, In } private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) - throws IOException, InvalidMessageException { + throws IOException, InvalidFTPMessageException { FTPMessage message = SerializationUtils.deserialize(rawMessage); // TODO: use double dispatch if (message instanceof FTPListMessage) { handleMessage(key, (FTPListMessage) message); } else { - throw new InvalidMessageException(); + throw new NoSuchMessageException(); } } private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) - throws IOException { + throws IOException, InvalidFTPMessageException { Path path = Paths.get(message.getPath()); if (path.isAbsolute()) { - logger.error("Server ({}) received a message with incorrect trackedFolder", this); - return; + throw new InvalidPathException(); } File[] files = trackedFolder.resolve(path).toFile().listFiles(); diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java new file mode 100644 index 0000000..8e054f2 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; + +public class InvalidFTPMessageException extends Exception {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java new file mode 100644 index 0000000..21ddb93 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; + +public class InvalidPathException extends InvalidFTPMessageException {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java new file mode 100644 index 0000000..9043ae7 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; + +public class NoSuchMessageException extends InvalidFTPMessageException {} From 928f14c40f1cac37fcd51b51cd6d7430a26adfc2 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 13:11:36 +0300 Subject: [PATCH 24/69] Add double dispatch. --- .../FTPListAnswerMessage.java | 2 +- .../{ftpmessages => }/FTPListMessage.java | 17 ++++++++++++-- .../hw04/{ftpmessages => }/FTPMessage.java | 2 +- .../veselov/hw04/FTPMessageTransmitter.java | 1 - .../veselov/hw04/FTPRequestMessage.java | 23 +++++++++++++++++++ .../bachelor2015/veselov/hw04/Server.java | 16 +++++-------- .../InvalidFTPMessageException.java | 3 +++ .../exceptions/InvalidPathException.java | 2 +- .../exceptions/NoSuchMessageException.java | 2 +- .../InvalidFTPMessageException.java | 3 --- .../bachelor2015/veselov/hw04/ServerTest.java | 3 --- 11 files changed, 51 insertions(+), 23 deletions(-) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ftpmessages => }/FTPListAnswerMessage.java (97%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ftpmessages => }/FTPListMessage.java (51%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ftpmessages => }/FTPMessage.java (78%) create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java create mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ftpmessages => }/exceptions/InvalidPathException.java (52%) rename simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ftpmessages => }/exceptions/NoSuchMessageException.java (52%) delete mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java similarity index 97% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java index d13f233..0a1b49f 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListAnswerMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; +package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java similarity index 51% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java index 9afc2b9..e625ede 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPListMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java @@ -1,11 +1,15 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; +package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; + +import java.io.IOException; +import java.nio.channels.SelectionKey; /** * A request ftp message. This message asks server to list the content of a specified folder. */ -public class FTPListMessage implements FTPMessage { +public class FTPListMessage implements FTPRequestMessage { private final @NotNull String path; /** @@ -23,4 +27,13 @@ public FTPListMessage(final @NotNull String path) { public @NotNull String getPath() { return path; } + + /** + * @see FTPRequestMessage#accept(Server, SelectionKey) + */ + @Override + public void accept(final @NotNull Server server, final @NotNull SelectionKey key) + throws IOException, InvalidFTPMessageException { + server.handleMessage(key, this); + } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java similarity index 78% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java index b01ac9a..4bbb69e 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/FTPMessage.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages; +package ru.spbau.bachelor2015.veselov.hw04; import java.io.Serializable; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index 23151f6..e193a69 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -4,7 +4,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; import java.io.IOException; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java new file mode 100644 index 0000000..8b2b5b8 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java @@ -0,0 +1,23 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; + +import java.io.IOException; +import java.nio.channels.SelectionKey; + +/** + * An interface which represents a request message to a server. + */ +public interface FTPRequestMessage extends FTPMessage { + /** + * Method to implement double dispatch pattern. This method should call handleMessage method of given server. + * + * @param server a server which will handle this message. + * @param key a selection key of a channel which produced this message. This key should be passed to handleMessage + * method of a server. + * @throws IOException if any IO exception occurs while server handles this message. + * @throws InvalidFTPMessageException if this message is invalid. + */ + void accept(@NotNull Server server, @NotNull SelectionKey key) throws IOException, InvalidFTPMessageException; +} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 8ea0244..715e754 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -4,12 +4,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.InvalidFTPMessageException; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.InvalidPathException; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions.NoSuchMessageException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidPathException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoSuchMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; @@ -146,15 +143,14 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[ throws IOException, InvalidFTPMessageException { FTPMessage message = SerializationUtils.deserialize(rawMessage); - // TODO: use double dispatch - if (message instanceof FTPListMessage) { - handleMessage(key, (FTPListMessage) message); + if (message instanceof FTPRequestMessage) { + ((FTPRequestMessage) message).accept(this, key); } else { throw new NoSuchMessageException(); } } - private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) + void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) throws IOException, InvalidFTPMessageException { Path path = Paths.get(message.getPath()); diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java new file mode 100644 index 0000000..f8e1045 --- /dev/null +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class InvalidFTPMessageException extends Exception {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java similarity index 52% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java index 21ddb93..6b0f514 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidPathException.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.exceptions; public class InvalidPathException extends InvalidFTPMessageException {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java similarity index 52% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java rename to simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java index 9043ae7..8a14ffb 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/NoSuchMessageException.java +++ b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.exceptions; public class NoSuchMessageException extends InvalidFTPMessageException {} diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java deleted file mode 100644 index 8e054f2..0000000 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/ftpmessages/exceptions/InvalidFTPMessageException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.ftpmessages.exceptions; - -public class InvalidFTPMessageException extends Exception {} diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 3b244a7..5c2b15c 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -8,9 +8,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPListMessage; -import ru.spbau.bachelor2015.veselov.hw04.ftpmessages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.Message; import java.io.IOException; From e40e1f2441ec92b5767edd07055c8cc9953ff376 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 15:29:06 +0300 Subject: [PATCH 25/69] Change structure of project. --- 04-SimpleFTP/.idea/compiler.xml | 13 ++ 04-SimpleFTP/.idea/gradle.xml | 40 +++++ .../inspectionProfiles/Project_Default.xml | 0 .../libraries/Gradle__junit_junit_4_11.xml | 0 ...radle__net_bytebuddy_byte_buddy_1_6_11.xml | 0 ..._net_bytebuddy_byte_buddy_agent_1_6_11.xml | 0 ...__org_apache_commons_commons_lang3_3_5.xml | 0 ...g_apache_logging_log4j_log4j_api_2_8_2.xml | 0 ..._apache_logging_log4j_log4j_core_2_8_2.xml | 0 ...Gradle__org_hamcrest_hamcrest_core_1_3.xml | 0 ...dle__org_hamcrest_hamcrest_library_1_3.xml | 0 ...Gradle__org_jetbrains_annotations_15_0.xml | 0 ...radle__org_mockito_mockito_core_2_7_17.xml | 0 .../Gradle__org_objenesis_objenesis_2_5.xml | 0 {simple-ftp => 04-SimpleFTP}/.idea/misc.xml | 2 +- 04-SimpleFTP/.idea/modules.xml | 16 ++ 04-SimpleFTP/.idea/modules/console-client.iml | 13 ++ .../.idea/modules/console-client_main.iml | 23 +++ .../.idea/modules/console-client_test.iml | 26 +++ 04-SimpleFTP/.idea/modules/messages.iml | 12 ++ .../.idea/modules/messages_main.iml | 10 +- .../.idea/modules/messages_test.iml | 14 +- 04-SimpleFTP/.idea/modules/server.iml | 13 ++ 04-SimpleFTP/.idea/modules/server_main.iml | 24 +++ 04-SimpleFTP/.idea/modules/server_test.iml | 27 +++ .../.idea/preferred-vcs.xml | 3 +- .../.idea/uiDesigner.xml | 0 04-SimpleFTP/.idea/vcs.xml | 8 + .../3.1/taskArtifacts/cache.properties | 1 + .../3.1/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 0 -> 18697 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 0 -> 19275 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 0 -> 19557 bytes .../console-client}/build.gradle | 2 +- .../bachelor2015/veselov/hw04/Client.class | Bin 0 -> 313 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../console-client}/gradlew | 0 .../console-client}/gradlew.bat | 0 04-SimpleFTP/console-client/settings.gradle | 2 + .../bachelor2015/veselov/hw04/Client.java | 4 + .../3.1/taskArtifacts/cache.properties | 1 + .../3.1/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 0 -> 18697 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 0 -> 19227 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 0 -> 19533 bytes 04-SimpleFTP/messages/build.gradle | 19 ++ .../hw04/FTPListAnswerMessage$Entry.class | Bin 0 -> 2331 bytes .../veselov/hw04/FTPListAnswerMessage.class | Bin 0 -> 2256 bytes .../veselov/hw04/FTPListMessage.class | Bin 0 -> 1695 bytes .../veselov/hw04/FTPMessage.class | Bin 0 -> 164 bytes .../veselov/hw04/FTPMessageTransmitter.class | Bin 0 -> 3161 bytes .../veselov/hw04/messages/Message.class | Bin 0 -> 413 bytes .../veselov/hw04/messages/MessageReader.class | Bin 0 -> 2989 bytes .../veselov/hw04/messages/MessageWriter.class | Bin 0 -> 1856 bytes .../exceptions/InvalidMessageException.class | Bin 0 -> 407 bytes .../exceptions/MessageNotReadException.class | Bin 0 -> 407 bytes .../MessageWithNegativeLengthException.class | Bin 0 -> 499 bytes .../bachelor2015/veselov/hw04/TestUtils.class | Bin 0 -> 1492 bytes .../messages/MessageReaderTest$Writer.class | Bin 0 -> 4414 bytes .../hw04/messages/MessageReaderTest.class | Bin 0 -> 5131 bytes .../messages/MessageWriterTest$Reader.class | Bin 0 -> 4267 bytes .../hw04/messages/MessageWriterTest.class | Bin 0 -> 3579 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52928 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + 04-SimpleFTP/messages/gradlew | 169 ++++++++++++++++++ 04-SimpleFTP/messages/gradlew.bat | 84 +++++++++ 04-SimpleFTP/messages/settings.gradle | 2 + .../veselov/hw04/FTPListAnswerMessage.java | 0 .../veselov/hw04/FTPListMessage.java | 15 +- .../bachelor2015/veselov/hw04/FTPMessage.java | 0 .../veselov/hw04/FTPMessageTransmitter.java | 6 +- .../veselov/hw04/messages/Message.java | 0 .../veselov/hw04/messages/MessageReader.java | 0 .../veselov/hw04/messages/MessageWriter.java | 0 .../exceptions/InvalidMessageException.java | 0 .../exceptions/MessageNotReadException.java | 0 .../MessageWithNegativeLengthException.java | 0 .../bachelor2015/veselov/hw04/TestUtils.java | 0 .../hw04/messages}/MessageReaderTest.java | 15 +- .../hw04/messages}/MessageWriterTest.java | 8 +- .../3.1/taskArtifacts/cache.properties | 1 + .../3.1/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 0 -> 18697 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 0 -> 19211 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 0 -> 19525 bytes 04-SimpleFTP/server/build.gradle | 19 ++ .../veselov/hw04/FTPChannelAttachment.class | Bin 0 -> 2439 bytes .../bachelor2015/veselov/hw04/Main.class | Bin 0 -> 2282 bytes .../bachelor2015/veselov/hw04/Server.class | Bin 0 -> 9882 bytes .../InvalidFTPMessageException.class | Bin 0 -> 398 bytes .../exceptions/InvalidPathException.class | Bin 0 -> 433 bytes .../exceptions/NoSuchMessageException.class | Bin 0 -> 439 bytes .../veselov/hw04/ServerTest$1.class | Bin 0 -> 2392 bytes .../hw04/ServerTest$FileEntryMatcher.class | Bin 0 -> 2806 bytes .../veselov/hw04/ServerTest$TestMessage.class | Bin 0 -> 2010 bytes .../veselov/hw04/ServerTest.class | Bin 0 -> 7236 bytes .../server/build/resources/main}/log4j2.xml | 0 .../server/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52928 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + 04-SimpleFTP/server/gradlew | 169 ++++++++++++++++++ 04-SimpleFTP/server/gradlew.bat | 84 +++++++++ 04-SimpleFTP/server/settings.gradle | 2 + .../veselov/hw04/FTPChannelAttachment.java | 0 .../spbau/bachelor2015/veselov/hw04/Main.java | 0 .../bachelor2015/veselov/hw04/Server.java | 9 +- .../InvalidFTPMessageException.java | 0 .../hw04/exceptions/InvalidPathException.java | 0 .../exceptions/NoSuchMessageException.java | 0 .../server/src/main/resources/log4j2.xml | 15 ++ .../bachelor2015/veselov/hw04/ServerTest.java | 5 +- simple-ftp/.idea/compiler.xml | 9 - simple-ftp/.idea/gradle.xml | 18 -- simple-ftp/.idea/modules.xml | 10 -- simple-ftp/.idea/modules/simple-ftp.iml | 12 -- simple-ftp/settings.gradle | 2 - .../veselov/hw04/FTPRequestMessage.java | 23 --- 117 files changed, 839 insertions(+), 125 deletions(-) create mode 100644 04-SimpleFTP/.idea/compiler.xml create mode 100644 04-SimpleFTP/.idea/gradle.xml rename {simple-ftp => 04-SimpleFTP}/.idea/inspectionProfiles/Project_Default.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__junit_junit_4_11.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml (100%) rename {simple-ftp => 04-SimpleFTP}/.idea/misc.xml (71%) create mode 100644 04-SimpleFTP/.idea/modules.xml create mode 100644 04-SimpleFTP/.idea/modules/console-client.iml create mode 100644 04-SimpleFTP/.idea/modules/console-client_main.iml create mode 100644 04-SimpleFTP/.idea/modules/console-client_test.iml create mode 100644 04-SimpleFTP/.idea/modules/messages.iml rename simple-ftp/.idea/modules/simple-ftp_main.iml => 04-SimpleFTP/.idea/modules/messages_main.iml (64%) rename simple-ftp/.idea/modules/simple-ftp_test.iml => 04-SimpleFTP/.idea/modules/messages_test.iml (61%) create mode 100644 04-SimpleFTP/.idea/modules/server.iml create mode 100644 04-SimpleFTP/.idea/modules/server_main.iml create mode 100644 04-SimpleFTP/.idea/modules/server_test.iml rename {simple-ftp => 04-SimpleFTP}/.idea/preferred-vcs.xml (59%) rename {simple-ftp => 04-SimpleFTP}/.idea/uiDesigner.xml (100%) create mode 100644 04-SimpleFTP/.idea/vcs.xml create mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties create mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock create mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin create mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin create mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/taskArtifacts.bin rename {simple-ftp => 04-SimpleFTP/console-client}/build.gradle (99%) create mode 100644 04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class rename {simple-ftp => 04-SimpleFTP/console-client}/gradle/wrapper/gradle-wrapper.jar (100%) rename {simple-ftp => 04-SimpleFTP/console-client}/gradle/wrapper/gradle-wrapper.properties (86%) rename {simple-ftp => 04-SimpleFTP/console-client}/gradlew (100%) rename {simple-ftp => 04-SimpleFTP/console-client}/gradlew.bat (100%) create mode 100644 04-SimpleFTP/console-client/settings.gradle create mode 100644 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java create mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties create mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties.lock create mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin create mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin create mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/taskArtifacts.bin create mode 100644 04-SimpleFTP/messages/build.gradle create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.class create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class create mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class create mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest$Writer.class create mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class create mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest$Reader.class create mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class create mode 100644 04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.jar create mode 100644 04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.properties create mode 100755 04-SimpleFTP/messages/gradlew create mode 100644 04-SimpleFTP/messages/gradlew.bat create mode 100644 04-SimpleFTP/messages/settings.gradle rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java (55%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java (83%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java (100%) rename {simple-ftp => 04-SimpleFTP/messages}/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java (100%) rename {simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04 => 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages}/MessageReaderTest.java (87%) rename {simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04 => 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages}/MessageWriterTest.java (88%) create mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties create mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock create mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin create mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin create mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/taskArtifacts.bin create mode 100644 04-SimpleFTP/server/build.gradle create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Server.class create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.class create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class create mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.class create mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class create mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$FileEntryMatcher.class create mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class create mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest.class rename {simple-ftp/src/main/resources => 04-SimpleFTP/server/build/resources/main}/log4j2.xml (100%) create mode 100644 04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.jar create mode 100644 04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.properties create mode 100755 04-SimpleFTP/server/gradlew create mode 100644 04-SimpleFTP/server/gradlew.bat create mode 100644 04-SimpleFTP/server/settings.gradle rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java (100%) rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java (100%) rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java (94%) rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java (100%) rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java (100%) rename {simple-ftp => 04-SimpleFTP/server}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java (100%) create mode 100644 04-SimpleFTP/server/src/main/resources/log4j2.xml rename {simple-ftp => 04-SimpleFTP/server}/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java (97%) delete mode 100644 simple-ftp/.idea/compiler.xml delete mode 100644 simple-ftp/.idea/gradle.xml delete mode 100644 simple-ftp/.idea/modules.xml delete mode 100644 simple-ftp/.idea/modules/simple-ftp.iml delete mode 100644 simple-ftp/settings.gradle delete mode 100644 simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java diff --git a/04-SimpleFTP/.idea/compiler.xml b/04-SimpleFTP/.idea/compiler.xml new file mode 100644 index 0000000..34af4f7 --- /dev/null +++ b/04-SimpleFTP/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/gradle.xml b/04-SimpleFTP/.idea/gradle.xml new file mode 100644 index 0000000..d14ea90 --- /dev/null +++ b/04-SimpleFTP/.idea/gradle.xml @@ -0,0 +1,40 @@ + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/inspectionProfiles/Project_Default.xml b/04-SimpleFTP/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from simple-ftp/.idea/inspectionProfiles/Project_Default.xml rename to 04-SimpleFTP/.idea/inspectionProfiles/Project_Default.xml diff --git a/simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml b/04-SimpleFTP/.idea/libraries/Gradle__junit_junit_4_11.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__junit_junit_4_11.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__junit_junit_4_11.xml diff --git a/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml b/04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml diff --git a/simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml b/04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_5.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_8_2.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_core_2_8_2.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_jetbrains_annotations_15_0.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml diff --git a/simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml b/04-SimpleFTP/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml similarity index 100% rename from simple-ftp/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml rename to 04-SimpleFTP/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml diff --git a/simple-ftp/.idea/misc.xml b/04-SimpleFTP/.idea/misc.xml similarity index 71% rename from simple-ftp/.idea/misc.xml rename to 04-SimpleFTP/.idea/misc.xml index 0548357..d5d79e0 100644 --- a/simple-ftp/.idea/misc.xml +++ b/04-SimpleFTP/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules.xml b/04-SimpleFTP/.idea/modules.xml new file mode 100644 index 0000000..6e21d63 --- /dev/null +++ b/04-SimpleFTP/.idea/modules.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client.iml b/04-SimpleFTP/.idea/modules/console-client.iml new file mode 100644 index 0000000..d0a1f69 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/console-client.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client_main.iml b/04-SimpleFTP/.idea/modules/console-client_main.iml new file mode 100644 index 0000000..a866cb4 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/console-client_main.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client_test.iml b/04-SimpleFTP/.idea/modules/console-client_test.iml new file mode 100644 index 0000000..58c1db9 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/console-client_test.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/messages.iml b/04-SimpleFTP/.idea/modules/messages.iml new file mode 100644 index 0000000..2287620 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/messages.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp_main.iml b/04-SimpleFTP/.idea/modules/messages_main.iml similarity index 64% rename from simple-ftp/.idea/modules/simple-ftp_main.iml rename to 04-SimpleFTP/.idea/modules/messages_main.iml index c05f42d..4565e8d 100644 --- a/simple-ftp/.idea/modules/simple-ftp_main.iml +++ b/04-SimpleFTP/.idea/modules/messages_main.iml @@ -1,11 +1,11 @@ - + - + - - - + + + diff --git a/simple-ftp/.idea/modules/simple-ftp_test.iml b/04-SimpleFTP/.idea/modules/messages_test.iml similarity index 61% rename from simple-ftp/.idea/modules/simple-ftp_test.iml rename to 04-SimpleFTP/.idea/modules/messages_test.iml index 3337c26..ac9d4b5 100644 --- a/simple-ftp/.idea/modules/simple-ftp_test.iml +++ b/04-SimpleFTP/.idea/modules/messages_test.iml @@ -1,15 +1,15 @@ - + - + - - - + + + - + @@ -22,5 +22,5 @@ - + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server.iml b/04-SimpleFTP/.idea/modules/server.iml new file mode 100644 index 0000000..edeee8a --- /dev/null +++ b/04-SimpleFTP/.idea/modules/server.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server_main.iml b/04-SimpleFTP/.idea/modules/server_main.iml new file mode 100644 index 0000000..8684ee8 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/server_main.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server_test.iml b/04-SimpleFTP/.idea/modules/server_test.iml new file mode 100644 index 0000000..76dec57 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/server_test.iml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/simple-ftp/.idea/preferred-vcs.xml b/04-SimpleFTP/.idea/preferred-vcs.xml similarity index 59% rename from simple-ftp/.idea/preferred-vcs.xml rename to 04-SimpleFTP/.idea/preferred-vcs.xml index 848cfc4..8031127 100644 --- a/simple-ftp/.idea/preferred-vcs.xml +++ b/04-SimpleFTP/.idea/preferred-vcs.xml @@ -1,6 +1,7 @@ - ApexVCS + Git + \ No newline at end of file diff --git a/simple-ftp/.idea/uiDesigner.xml b/04-SimpleFTP/.idea/uiDesigner.xml similarity index 100% rename from simple-ftp/.idea/uiDesigner.xml rename to 04-SimpleFTP/.idea/uiDesigner.xml diff --git a/04-SimpleFTP/.idea/vcs.xml b/04-SimpleFTP/.idea/vcs.xml new file mode 100644 index 0000000..2d8b741 --- /dev/null +++ b/04-SimpleFTP/.idea/vcs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties new file mode 100644 index 0000000..36987ec --- /dev/null +++ b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Sun Apr 23 15:16:20 MSK 2017 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000000000000000000000000000000000000..9e16b9537600c6964fd3ff68e0620bcfd5ac6696 GIT binary patch literal 17 UcmZQxVCK5+#ML8*7$86p06QE70RR91 literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..fa34da5a2df9f7616aded33dbe87b1f937901422 GIT binary patch literal 18697 zcmeI%F-Sr|9LMo1f<&XI22k< zwFE6eLW_>l5V+YEL^jz_G}JxbJLKWm7T<%r_vd%~hWo5sch~0RM%hRh5LrEcg19Iq_ilsKwUxku! zJ>O9O50>7%i_Uy$&&)4X9t^D5M`rFm%{-v;{q21DBY1vh=DR9aUzx{@J5B@;KmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#~E zi-2F2-ExoXTRY0$3~n42)*Kh3@$XEyDn!qEu~Hk8mvY&jk%;wIN=*8%f8zyV-w|Yh)5d-$6^WHk>KF@e99= BcHRI0 literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000000000000000000000000000000000000..bf62d02ff55ee86cf560a6ac3b49940adde78e17 GIT binary patch literal 19275 zcmeI%Pe>GD7{~FMeUYFQn@b=aymS!3_1!3_P9jG5=d!R#bTLMoY;6CGv(pYir$rF| zV2~y#5fmMQIuvv%tSIo}!8C%5XuAc09jaR%@_m^dyvCN7_zpa?@BU`?<#|4{w>f1P z&DQVQVeB3UcbBXXKmY**5I_I{1Q0*~0R#|0009ILKmY**5J2F65g1T|?2m?NZcpgN zfzUA0jcU}9;Ya6KE$@nRQ+8(> zUM{ypdGFIW&$NoEtG`}-kMh2yIFCP7J{eu(i~s@%Ab$-&b@t=?6`9(Eo;5sEW*QJ!$=^&z@Zh|6+AQXx^2pu{JwN5&9anVHwK?Hs02XS(Th6xTm@%cR#82=G5dE6$9L6bSX76ac_F&nkQV33B{T8rx)ht zlAmv!*>qX{jPj>$zWG|*@NNF-{GEq8pTFu(KXyggC<|J$nL#~nC@RlMqamoL_c2Zd z&q9V-uAqvQBC**k7r$iQcicL<`0_(z;lQCt?7>j#_1W$5XNlYF)A+k>6FTAO3$x-@ znaS(aF{M|eHFJ#CshQlD$nmOYvw_iJ({df@+ALw&oH@!2l4uyZ%(s!XhMUdIo4X~# zLY7@-*Sd9M@sDSvyXUue{q+);O7LP$ao5QU`_V_TPLWhaDNi0WP02)^TTF(1(k(Mv zBV<@@pRqSlPhN-IfLE&lWCgi*zU49P@n>uA9>(r{P zi=HB}!z2BfW7$GJmmMh#4js>~NWtGRD62DUk)NSl@zUtH7v{NtRe5Gw-2C9ylzx|Q nd-}+UDJrZAud}}c6n^`!Y_0}J;v^GN|1JW(cHLurzIuNEa2}5b literal 0 HcmV?d00001 diff --git a/simple-ftp/build.gradle b/04-SimpleFTP/console-client/build.gradle similarity index 99% rename from simple-ftp/build.gradle rename to 04-SimpleFTP/console-client/build.gradle index e25280f..28d0f71 100644 --- a/simple-ftp/build.gradle +++ b/04-SimpleFTP/console-client/build.gradle @@ -16,4 +16,4 @@ dependencies { compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' -} +} \ No newline at end of file diff --git a/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class b/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class new file mode 100644 index 0000000000000000000000000000000000000000..726e52430db9889c80ac434179e6af3ac1f517f8 GIT binary patch literal 313 zcma)%O-chn5QSe&=10eg3AuqgqhKc?t_*GhSq;fT$-aARoDS_w==t$nt^^kzz(YxD zVh&&xJnDT=kE);FuWtZz3}f`rk8l}bKnNG6F!dv$cRk(`{AKx~34_!WdfmJ!?VhEw zOh##$NxPNKbp8bWIyV*JHg%1t_DVKF$t>5lbhF9yUbMR6xfS{QWGIXz+Jk4efF3=kj)06HrKf&c&j literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..dd2baac1fe0d70d8ce686449baddeb4cec60802a GIT binary patch literal 18697 zcmeI%KS%;$9LDjt2$Gb#!9d(X8Uz!g$)yMyqCcZZ1hq7@I7Fe)9}Ec^By;E*1eeGm ziX>VZ3R;99D2Tuyuq6uVYG`e+_qcnJ!?7*CFTD5uc#enT{j4`8gimYOOEgz+b7VpQ z0R#|0009ILKmY**5I_I{1Q0*~0R#|00D=D^5R(__vM%EbwVOjvN{EO@4juUsqkK9& zxM#f{FRA|r4~_TGz|KU!osX(~@x%3fAIKH$d|Bmd7bU&CaFn+5s>;q8l3_BZ@%lgS=G#;oO zXAcrD>sQXk-F0ij^ELeZI^~VsB#iU0z8QBm#9M14<^BxTI`v#NlPpBG49(f_u9}Ts Dm6v-O literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000000000000000000000000000000000000..996f84fa62e84eb874c9b025961a94ba27edb4bc GIT binary patch literal 19227 zcmeI%Pe>GD7{~FMeG#J-8>m3K?kUiH7qUYggdildLr@}Jl2;nm6{j6$)*TWLB7v4v zdvH6{r6Ri2MGTR!z0^WT1RWy!gFy%)SjR3N?0uOXyr$?Sz5~DAcb?gKd7jVCZO&R& zo3qt8tnK6I_L3C>2q1s}0tg_000IagfB*srAb-XA>t^Qv>UX{;XC&wWkmk1DmioNW){de7se{w#C& zKymrTdR*^qPU`v7TgC6Ssl~=VXOepIt?ReqYkVSr00IagfB*srAb=xZRg8O3w{Lm3Kp#57f00H_8sGlAYT1t-`rCGuJvW zb^l8G>9Nx05l?`_mqd;Ri)MT&duOdYb*&SU4@eyS}YnIMVmd+nCQ* zC;H7$AI(taftfH7_RF3BHIZ(4H@68VO8+{((pfoT@doNOTkP0>?wH7tCX{z85E-y!NHGdv=m&7V{ z(V@_46(=3K2!f)xD5yAf6*^c83gYUbATELqde4_f(m|{uDDr)fyvyDD-Tm(KyEi3H zNF@BVagpY=q1i+W0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_0D=ESAgwpD%G*q2 zXPettQzsZN{vF;Jz99es2tWV=5P$##AOHafKmY;| zfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|_!k6v2nhuV z34U=ufksB5=`2-tA!Q5hsE6yZihf>XbDu*UQ(F&=&N!mtFrhe;ZujO3 zAF4Bxn_^S)dz9Ptcs4nBZTr2K&*r=D+%)#Tx?d4_GcRba$V}>RQ&D+Znsq@PJ&$?9 zyJzCet_Z4FE)afl>D;II+s^BQFXrCWpYJ^w2;WZjE}YsDd1~BXAID#JU(^YQ76VqH zQeqab(Xu6-EUj8&v_`GyZX?A@PLcJG3|S>6CCxKwdFxw^RU1DIKZ)j^=KtWVTJF)W z=U6v&6(0OXoLk2BD>*Ke;MuC;m2z4X@4hE16zMG}<;Z=OC7Gykn@PVOx-?d6gb!u( zn7fQDFPmq%bG7w>7?sSO^SmI&a_YKmh^m4cVz=> literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build.gradle b/04-SimpleFTP/messages/build.gradle new file mode 100644 index 0000000..28d0f71 --- /dev/null +++ b/04-SimpleFTP/messages/build.gradle @@ -0,0 +1,19 @@ +group 'ru.spbau.bachelor2015.veselov.hw04' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' + testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' + compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' + compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' +} \ No newline at end of file diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class new file mode 100644 index 0000000000000000000000000000000000000000..a3287820a1190341ae93315491e040f923a290c4 GIT binary patch literal 2331 zcmbtU{ZAZ47=GsNV3*@c>G5TO%F2fvU|FcGSliO_snmlaAbM0|_F#G}?(JT7_o($B zA~F7;Nn09;`lE@7|C0F3-XWB`U{W`knRjO2kLP*ccjnK(fB6l-P2`eDVWFFr=mt9ivH%;XNJK)qY&Vgoa5CHv|$TE8G=GXZNgq%XBQaV6KP0?H29`^sJTL z&@Rd)ci#@|yd!5^*9)!C_S`^VAnW-Bb5DkO-?H7nv`&ATD_*!#b{zWXJMUxTS?P5@ z&2}(v`*J(<{AU7UOQ7+t?b_kAKxd{F*4D@-QO|ihQs8pdcI8UBn3w*BMSO~fw{1C_ zmT#+l^)M0c+63IN;D#zhYRPq_Kj&CMAbEU0>zB=-l())e-rC-kj_2Q)n7n1~%YgE} zx%+hDrn$JWnze&)#toiIe^~~BRgi;`KXM#A&vDiAt)dL2|60Pdf(%!qY`14dYKaNN zGb3cLhhC)u0?Bo+>~G6OTT#1O55u@BTM8X`KZO=tPN5C$0$t~eIa{`!9qFgoD7Tp7 z#~MCJp&wI}zgB{w;X{FY|0@v!t*2oh<@Z=of%fRg_RMw3k~sGFl`@ejtJr9jO48jC zxL&8uwHd0CV8XAQ2AcIeM_R5xM`o+mgt}92NQzMg2M2vw^8BcmxtU<&WtK)ZQ@D+f zlDuVfe};3VY8vhdOwag*a#6aW@x=3u2i5Cflur7>7#<3S4eyCD6pRlAMzI`(2CtTp zmxjxGqvO87=)Y!crCo35ysj_9vhP;)XLPjan9$LuqhCh{lgr3OizT>SC%KQ$v|puE zcj_cBg-@`Q#55iX^q;1D$#G=Ca!x2Ne77x2>P^s)Rb@Eiy84o+jCEioiDf+Ei%{cf zoo|Xf^iFZK&>ehj`M!za8jA99`V)(I(EdYwQnb@mIJzdI&K(_5!id-WQ1f%wKU_ zA35J=(mpqR{=n()?M)qT(vbz*H2Aa#mw?>!gDGRb-Zc$>V!M z+2pEh8yG77BZXK*w-TbECd4$A`K}O%GTy1;96v%LcNqDIy+mVLLL#k6bz>_;#9vWmA++uvhz#h7X2qu>8(fX_g9GU4*#pEQEmc_c zDIF!N(q3ykAWUlfid5AVdU>usrKjXUHFELv-1-5Uxz2N~c&v>(K;5xiBGPH&x)9kU z(u@CLGmvXYe@q?1VIDuNi#Nh?gypSo4zYTGmLsewQF;EIVMUb2=VUlGv5%J_n*R*8!-)hgjha%pC-_Mqt> D!bjtr literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class new file mode 100644 index 0000000000000000000000000000000000000000..846cd59e122cc6e29789985f15dd5837b8364980 GIT binary patch literal 2256 zcmbtU?^7F96g@8q*$`4n1EoMwwr!AKmZg>2A~Y6LP?!{}K}Ph0vq@jW;$}CqyP@*e z_)TW~q%%4=GU`WX{73vR#Pc?bgb`a6Jmtf!I04GlNb zh~ZW@x{%W_uHh{W6B;H3x>lUP+ZV{JIga!Sw(0xQ7tkuM6G$fz=qv7;d#2F{EZZnr zey}LeU9zf<88kd8@JX9{spvHfzg{*QM%k?FNZa-9&fU3Z>`9;Yp0V>{Zr)hke5#<9 z9sh;&o=D#}t1=f7S0*nU>=l z=Bd-zaD$D8Z4+ax9bLGst3!IXo@WWzRGBRe34bbOt@h z2;6_gs$~6#$hPTJjgQN_vci_Q{c>PYVGBHbx%mHS34!>e%GYpf85CUGCKq-@Sgcoa zxtu5Kt{0X+7jrD&$+fAi3}*0lnr(kuAiwNY8#Oky{@nHSM^Ufn^^>&g6XX7b?mpMY z{n>F}uQmKYXW!{%sXJ_{6byms|BkUzcHC#}v7Y2-!HMGUq|lSXcnYH_WX~vB3OviH zYPc_uB$=8?RTrZ7g;F;I7Qbv(TZ{UOQ319_Ww3zv(s%%N(aqCztx=+?X`j4$<(rDE zE5$TC6u8>qHYHaU@28Q+BYr{7A(i+Ik}WVFq)||j{T*m(SP>XGg@~H1<@ARFmxx&T z`iWT&I~_NerzH6C<;beKMI4v-8IPeCmpLn6ALlC^DTscAt9TgQj|2v|U*{a-JUsI! zwD>QWoj!z^K0<7J<`D6pk@%6$1P1v(*bKxq3~|LH;gu{j+8Kg2cY0}ErQJ(1DOwqx z8{(NY?(ynW#Bd~J)eWJL70K%ynur(+jN*-m;kr6T=YS$L{Sy-8wN0`KlKp}E@sM1T zz(7P!5m2uOQPjn>OB(4n)p@g%IuwI6`qHWac#=!;E%j9xe~*06e-OL*Q+vuD&CVSl zmA!j_co?B>RX^od_Hgn5S{J>)AsInL(luk0jQVyw`%dWqJ)Gw`H<8ZYHMX4y{XLxT zT^QGueV2Y-&1^1pPoKfkR3`q*6`pnjsnNA%7H+P zrZ{G*B3r}iv8ukNr^D*n1-`TAE{cq`pnOgW>&@{I6FNq=G3ZEhPE+_4Q`U{{e*wH3 B5#9g* literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class new file mode 100644 index 0000000000000000000000000000000000000000..67e16b4c82b209b9bb8cc40115834c04112e7f4b GIT binary patch literal 1695 zcmb7DTW=dh6#m9`yc@?!6DQ5JkZtP_$DvuLO@R_rQ3WamxgjDU5O_dicWQ4~?^=5a z@N0O(5>Ft3il~4`B>qVM1>xIENSs&^tTa34%sF$u?_B1uzkmH5zy>x8$YEv}Sw>mB6*S z<*1#o(@@^NB$#6)3MSb*-g>-MDU3m6gk+1qyp^=rz@2E225s z53?3kx`+|nC?XF{VEunH6&OEj*N2TG)eHpg{I@V^vI5ykRNRSjx$LQ~>%|SDQe(j@ z+bah}ynzLCqsbfSSPuPxR<_`u8&gbXa zl2mAOK&OgW#p?y!!X1HIXC>XXZPk+YX@2j2-BjIZ>NS{A8MFh+Td zJ~}N$+9qgun`cDOW6)uUY3dP&5*MdBA;i=%l@i!ua6#i}^(SNwNg_uQKky*IE+)nl zJ3@@I0%l_*%5{y68j$T&j5}V429`INtN1pq5b$#Tdqx0e;y(?ke4|wEK`*`5LpJuf ze$F1rbNL>$AzFV!E)78*$(L{fjKgecd9Q~N?iKDyq{~=~hq>53!hPjRzoAlJ{gd%P2Cb@*gWH;U2fUkY~ z+&|zi=uE%aD$qK8`PP|Ee^RIR+|3FRsAAoj-TQX#InR0SIp^-5|NQ(bfYbO!!9fg5 zNGYhpa06N}B0lG2j5gwJoEL)&GR7o~D|iPN6)2bxvhT`xPe@FP!TaL#fmln6-jsxC z1($GH!H2jaA;VB#v_NFVvBI!7`UB}F=^0RuR+!Af&MTXw= zvaw?5mTBw3oU6|{re~1pv0EM=uL_b@X_cnALnzv+dn%q;)YGPQgXhzx>yb!9#w=Kd zS8+H)W>=w+v{TXDa@MHmSwTb5b_V+g&gd)LrT&V(wAz1KFLBp33f$GFsvUucJE>8! zP(NZ?rZ>va7uzH7_$)(s+|CoE{REazS4vs#%n1J&qG>y46lV>`6ysnr>@At(KcU{}H=kXnvK z2?Z5PFd3Ts11=g=7%yd)dCp^K_NS;mO=dK%rOT9#`TU6e8`867fC%9xhXB_r`n_*KzLs8A&&{Uw8_ z9oog6g`H&A@*g;@Vih+Ptbk7J_|_3jQf3v5;!{U9<6FX=Z87kaJYt{=_Y~a47nB;i z7?FT6?bvXVUT@kX- zg>I7VA=wJGb=1ZZe?SUtpwzbx*7q27^XmvbLih(nqV;`0(Hi;^k03uF*${f^+g9C& z7~(V{4L(MOH~h5-p+5o@t>j||;Wz?iPL-ZxKf3 zW9+6@JZiLM4Xqn!`wuvt8?93vqVFu~ gpAhkkp-#ezgs-2F_y0XQ{G7GgeWd*?X|Kc3zt~6_od5s; literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class new file mode 100644 index 0000000000000000000000000000000000000000..3ccaef442b7cb7f053d4349547d241b2d826b73c GIT binary patch literal 413 zcmbVIO;5s55S%TADi#s^Nc;!t!3PQ_jRy%TNyP&Vi6`?~UrI@7OAl!MjPEz)3k7k+)Ngcn_m;?R|MWEpKNOj3v<+Y&omoToO$fmXh;HT);&I zm*ga`;Ie`%0!p#0S(a`J^o}oT%UaGd>|D6!<|cJ*UMraT*ovp04HQQNIwq@@XH@jO zwQRTs#b+$b_B7A1Emz>+xb2j3i@H~EG{bUpG`}v)P1xQ<)ii0N^JN>;D@&X0sD?YP zTP3e7K?sQ30;=gRj8zvFbVs1AhFAg&mT5ax(Op+7g$n}R+aV$x$&lL`P8pWrjS6J@ zYKFHBMgL8K*jamC7uY#&So%b@QqY}gX-^!$4-9XN6yF~<*F zw6C9`YY0NeIOZ9kDNifjy{avRsFLUJ7xg9o{1l7}Buly%Iwirr{<$%MxI=870L_tg za>}kcMg4-|Gu;I6uuLNrT^Ll+f&Bu5|ADK5t12dNO~o5{Q$;&=E4Z$rA0McgL{`NV zrd8Ykq0GLHd3}TEdQ@i&uRNibn7zw-kZ&8oP|=Au1t$KV1LnLuxjL&eIKnbiaSO8o zk-0Gyw=pen;&uFN3c0{8zjjT{D&?*f7WENSoHRrEw_+DR?MP4fzfrMt7%vO(S zyQeSTUrYa*67#O-Uo{A6VoL-4%sjQMxs!T@jlr-=%&i5}SR$ytdY686%X(xM=B*&* zxHYahj<&*Q(X=fBZC&3~$C|q+)-^VV=I-upM_;lXzvFN+AX7Qte^bRAK1{NGek3q@ z#wk@Ry5(gSY$tO%Y)_e`^?J(m_PD(ndm+=~9`127m8$Dy*v&EpJ!7$PByfk_Vq+Ui zux!u2tn27r)v-c-ErIp~E+;UMK-Z>YoAMlnL;<7HKrj`J#7~5Q^ce;UBXdD)>q&>f ztJhLtU@?g@?g|{Jy5lnP+>dW!kY|N7wjY~@SHkdvBXB=>2+qDBwVT4 zvIR^9Re^mq6JZyt+kKC|TKT>MVo1xPM+AE~Yk~OMqPsw$~wUq6E0e!??s4U-8i-5N%eb73Puz z662nxS28aN(JGxb$t7v)#R}MX@KPMdFpT!qQ?}?pLP`<&7pRnZ@vQGG>9Ggvdfmt(b~@*lKKmmLM6*gWjY!$>L@=v%8`8 z&A-DZ-#X*?;*6!JBR)FgA7wpv6B_8yj?-jz&$;)Wd(Q87K9Ya_{rw2QJj!wCNS#AJ z-q$b{M;aNq$VzQmzH;*QK|f|-N^MrdoQCTRTD8F)N7xKg#XY{yO~-Q0?w)U!JuBc9 zTdX_@#A?Sd&oH*xb^@y@3eLXeTXekaIBviL%XNH)YemG5M;GttYM1e)=lyT1|Ki!#!XU$4a!{&ywrzW+Z4>#42C(+NR&C@U~gu)rPQL@A~ZAO>hOrpt zVi-D=`BLB!4h>&YlE`_JQ+gJ<=)=-<4D!1jLMN(~?~pZ}^fM?~EqCvvTgeH!>01+rLE##MgBEb^f%S?KbyvOMoP`XLzq=M1qNeUos%Os`g1VL3K+~06c zK^JfQ2O{|t5%p)X=)l%H)?L^VVw^mH{#MQ-6T*o?xw^!t8WI`R{bF3UE@?8{_lSlL zRuXsm{)B$zC)yjPM}8y>sgLidiMyqz=qLF(Np&ZZ_@cBEO%zIp*!Tkv9)A5CTYrT& e40`9FzM!-aV@1O~4cjj$X|G#RlxuWHLGnKiLbfvi literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class new file mode 100644 index 0000000000000000000000000000000000000000..6b6dbcec20a3b3780cb80f432b502c82c4adfec9 GIT binary patch literal 407 zcmb_YO-sW-5Pg&8Lu0f>uU@>V2e(Q+DPE+45R0JnzDbv6Wt)`UB>J~J2_F0b{wQ%$ zKW^TffycZzpUnHm>l=U(1~GcrjIb4W+VleqCrsxJ_*%+%l7m$Yfq9Q`wW@@u_H)2CM#A9Y6$vXu#Z1cb@|o@l*W~v1pXEi5(7VgABDJ- zkBtqV^y=QnXW!}GKVIJejIkMGfb|F)5r%~DOxLRM&(JXiK! z<`t8z)D*IsNUMAQ4gIFnj&PIOR=7njTanA6RF$#EqoWhiDaUyy%E!@I%$0L;rkqeu zg<3S))J|M~vCK5LN=`3-E=~#YooQ{Mu5{mf=a0I>2ieI4J_17azatQ~`_Dxs>zVi+ u47>1ndHo>{Zp<386H5;S2QQ#!1|A~TkTLkd3Tv{=1FRxuM_6O^kbDBCb!&_O literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class new file mode 100644 index 0000000000000000000000000000000000000000..ad1b06c506aa54dab7fffad05528eba57e44f3b2 GIT binary patch literal 499 zcmcJM%}T>S6ot>ENux1Z@eN%0vv8`^mBo!H2r(O_BCaOsB^gPRl9@zb%a!252k@c9 zn_Arpf-`Wq=VR{WT;~1b^$oxXn*n-Q_p#w)AkZJ{QrlC3-tOK+z&)#`Bru3{NpUkv zsJ>B2!DK6{QdLY;tvkPjuFbU(xR2^ant7rcnW!|UqNGAf6dG@LBte!3`^{;iC4iih!NK I8moiw6ROsak^lez literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..7d77f134960d05ac927a60d910fb106a9940316a GIT binary patch literal 1492 zcma)5U2_{X6g{%nk+X5r#7Rr*w$xAuoDZ@|n*zn9BrYvAI0=J8XM!IX*_CaDwbrw% z4TJ~&4l_K#OPb-M@Wu>3ig2|KjbQ@QomuJXN;>D>bFcpR^T%fZ*0AluMUmqb7q8-m z9ZGhXbMYEp=P0|F#{$P9#}dQXU8R+|$B-`1KW1?52Tvr!`MT0_EAF>sxFcFVdGht3 zE&RtKRCayhbWBf049oQ}_M$;c#9m9Zd(scWn=7lgy?q&xz3=tDTv_vWWMn=y%8x1x z(S^cYVr(@;L3g4$1 z8_Mbu)uMjJArf8ejJ%1^+Yk0 zCJuE`Q_-`yo5f-l`7AE~9YYdV!-PtAIW~yD6NG(1iQFj{RBO@5`?68`P%q!B=fLu-(e>0mFqesBE4SsJVEA52-X~Fmu!y&JkSu zi%l^|o*q_77MET-;DFhtqwyTAJenEJnT4ldKai2ac^d6DIWdK4nkVTWOFZKQlgA9w z$>opfv^`hgM@SbA;T$4!h_TD!lR;}+>>!Uu=s4>-skVLD;Up&X-zohuNGs7|qB&R3po^$tpXYTiPKi|i_^N)Yu zdKbWBxShgY45V-zCz|-;!;Kiia0(+hEve@ee53(;aHbKX7*p_kBgQe2!V5SnsdFi$ zFe#~zO6p@Nd>rQ`^`iXKQk2X~sv!TS6ciOqE0_^zoYGuv%$l$bR~JYR&1&;nuId`4 z+>qh8Jpv7*#D;XD=55U|ot(D5m>aR&k!q<#9S>~OF}7H#*ONGAn1 z_8%G-hz(d%bacm%Vd^8*a$dK`G+GyE8nOynXs=2&Yn9)m?{b=_ikLTufhxB}IW}*ABTv>M40E1akO=08YCxVg zhq>Hy$PYwGGpD)e>eCE^Kx$n?;Lv+kMnLjjBn5VD8DN3?3RT zS}KV_Mnfi-Kt%3-+o-D*=7zP3hdmQm!4bN6;^l%~@zO$pA@J0_?fG4`CPRse{UKtNFY^VEeqd1UX*^waoa`s8zKK`bk4( z+wM)t&?O5?#X-y}m{UBS+3*ST4h*wXRIk_M*?OV7N<%Yy((UUt-w*?qN-qC z#R6Vdv4{%-+w1F8#eN)6@Cg;4#6^K-Z?(QG**{c#3YQdIR`F@PqT(~SsN%D@q~ddu z`aE7$@C6lL#A|Ym=D#HWI&oOVm+=)9uj8ud`mnQW$hNSS?;CJm z+m$CUHe*{0eql$mvhIClUf=4oZEaCjHIdad!rYae+#KQ{D?ACGF*oY*_oVQ3d_&;j z>>Y(dK9hS7z9|sbDwWbAdsa5AxL7p{UcsIW24e!4yCI#P8@ojuh#Z%xh_~1G=68SkjH{`WL zwim6a$vhy8jXZMJo)o-66oxEou1XL88BX~?f!~=;OYD%DYUDf;R@qBS}Uz>ymp!^_`NLYkm^8>MC>5mPT?B;-QE98L0+L=^Ai^*Vz0<9^Nw zzJGvoh9e2l4DTty)5%rD2e}r7NP13fgYb3u zo^^0d5rNY}p3aC%C&g12#fc0_NYK{}KgZhr^Kn`jjHKGO7GJxi82S+2isldCcQQhOLl7bma$Xf6!8*DrCyn~enQDz%M=FA-?P<}JUpmF zrutD@k=oMj@2+51JL9#C-Atj4_S1NpsKZ0uw?CCm$yVs=iF9xm)FUSLUm+KWoBxXk zw0!OikEWk2A=&h^B}6?5nGy0Q`6VrfETGy*EHQ=2{b%eAOd!j3`I9n|?&f$RJkCa& zem=T{X3oFh+{pQtoPCR1`a{NiI|TFJuv(fxlsAHg;UW6`f;%V^y{eeshr&t4yzeRyKM3m6P0$OzaQQ`BNCgvq6u3hNUYLzuyaJ6RADyk!`HU L@33IMi+%qAU}H?| literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class new file mode 100644 index 0000000000000000000000000000000000000000..d81927beb30b680b46e51e1de8c2e6fef65c6346 GIT binary patch literal 5131 zcmbtYX?GLX8Gc5RJ+dsYEn~+v7zCJDUcxwR4RL_jhJc9|iVf6uwy`|61k#K;8X4%` zG~Ju-YudDFy0{HZ8@gZ-5}GePJ*S^~PQUjr^m9Kn^m%8-vb-fge9p{W=DqKIo_D$L zwf^z$o3{ZRz*`Y)$FPc#2u5)xf)C@Yim_@0Fdo4k=L^kJO@33X(S_T=HkEoNL!Y5`Bk%MoXmHq08n!iLm~&3b7g3-lQ##>h6toXr)aP~0Ok0{im)Asvpy|Kr z7z3UlbyeD~W(B?X4~uFdC$1!ooRhZ9yb9W_`E0>-(plqtI-lmAeWqzSy8Br{?T}^9 zX%`E$q~|Sr*%E zR)k5#WywJWPbP@1bIjv2ONR>4jhPoyPj8`mt`D_Io9PV7>! z=dLnJMLr4#1r_sAT*egz^`&)^c>RUhS;LOvDn6#-<57G9pN!&D__T`8MDbZXAH^vQ zs`y+KFW~bE4&V1tA*jC~`+QNwmt>zWtN2P3U&Yr{ycosT@r@|HiEpX+b`;;iccb_o zzAvAD5XBGiqbOd&kE1vO9(Bj>8-pabZ+U_969q>;kS-n_t}!#ZIj4-X=bc!D_7EI&lR$U=?v=*4{e(V zc~Cc*LR%8+t_{iQp`gj%N>1Ws|Mzw<2kVx(44RHHC*?++*E0oUbe6%G7%bQ8OAu7( za>_6jJX+4dN8I5i=o0I^Q<$FSVWN$ia~9h%e@q?Sci{$c-Z>|oA<;U=uQbA-&pSCP zh)+(GwsIS7v?UYGA?iLee_2?bNURUk`%YinjZV_&EHmzVmN}`_tk{z)jNWfq8AGQj z8xxb|ruOHlzd>-M^lZ|mEwp9F2c(QIZC)0PKJwKosHtT=O?|vm*o@$aTrO;9Jf(Bc zwT@q1d#uqaq#|>MQz}uRgzJ&rvX`EdtA&=dvRRg7O+fC~T-W(N4LjCS1~s_lp)3K! z%>*4WvN`9f@9!pt`FbQMx7Ty$T7VlZsMKd>`ZBzxgt@bnCdN^XTagAV(_w9KOJG-G zstnVL5MQ$uE16p*Xp*|Nwl>?yS+-k{IOt){Fj&t=@iKlY7rvh#oPDf+vC=3d{2Jwo_su8$UAWsyZE#bH(BPw_&Echw2ZYYWzDRXwGF3Wo4))n z!srVl7slx@j)ZY)#Zflq*kr8YHPRrSti-|L@;LAWde^nb@+sm=Me#el9>F#IUcs*A zuY;Kk?^l^6;-#}v#T$(Db#@br?Zh7=xQ;)utgq3;ONV2WsrgF;H$<|29hfSLOoC+< z{tcjP^_$$QmA8NStAfJOF1~kjq_I`lR&*{xxz0`id-#relXwvA9JTSObZ46RPH=J1 zUHm#{gZwrX>n$Sq4gy16MTFi##Z6QOP=s1UxHI%NswRTLBCi9BsJ@A402gjy(?r)I zHV=2-Kur;~AwEUa6%pe^eGyxVXegqQ<7G&3Zz~^C70#jqorH6kaJtY<-~zLSkbrGu z*@_34-n<=x!V(+?9Z<3AKmMz9jauIZ#49P0NTIno6k4?OVSFPE!d^jSnYA z-pe+O(Mq6Is<=-K2k`(7Z4Bigp&Tkf`4?1oalZ1c@I){)J`t)IpQxxDA6kMo+`UnR zRMMafp9fY(NjIZp5IiZfE0R!2&w2f=4qizGgTM+mc-Q6MoBz%aiF-=G^a z+X)(Y6t#GaGDmP6$0*T@4Czv)1+S^8dRcP=qrMDvQwC~Al>}jUKYO*Iuc93LGljacL!x-m(|0$fI8GsrD-oO z6=#+kfkEB3iA{hJC*aGU={+ewy+Xc4X4r{SUEfFl*M97t|XZss> zT`2b3_gUA;b?p-suKZ@%s=`}R#2?n>BN&BG;ufw?KD&rNFJSX6+>q`f5&o5*c+cni zpJ<4Oj;px#G#~y}b?pvqqVU%Nc9lD{vENs5^9~P+yB+PgYsr;5-)mi9L!HkNEE86q XTa3Ra$t%Fbj23Gkckg$X z_vRn}e*4b=?!)iX*o%{C3}Yn6g|itHa4wCHqnN=M&MO$-g?3!X;6YqeFp~bZcHKSe`L&IDl$1?Q*`Q@TPx{xt)!P1jEe2tJ8;ka+LGaNyreBG58S6!4cFD@4Obfr2Gfq| z@l?b0Is>sZBojedAa=PR(7DyN3%a9M4YF=>28k~N#Y}EWnP(at5xINRxOIM7t3{SP9S4*>cr)4a64hXdO z6mEimC2%T&O(d1#}s@;#S{3d zWcr$lgZQw5CkfsEA{mIoh7N%PSSw^PXhilF4>XMPm7ZL1?ByVzn|frr2g3YXHS9S0 zicDr=Z0J>iyetWUyM2OST^6YcpJFhLuj46(^X7O7qe2$Sr&(9@TCK7oaG)nDYOZdT z!`$=EgkuI`$A*)(9wv~gG6!r*7Z~h`sI{Z4=wYF#P-&vI?UYfwQei6Cjx^u1gF3!{ zlg6QtbxLZxcblBx2mz%W2oxBIYPwBEG|fWT1iGWn+^99%$`q^Oyx|Qy^Ytog1`jpe z)76?stm)cIoGx-mY-Iq8U>X?as}$tPeTQx|miqEY4j!F;9Rj#0IjxVwvk#$u2* ze(a3t-U3;xCaXZAr%>pn2%a>;`tx4}wt{C=d;{NB@lg=f0~_HjjbAjhqFf%QfHK<#y-oxqO##mpQyCh#S@)jQ*DLg08 zx6Vd4u~KiPbqqd*tdRbN6naw_NTHO%!4&e1n&dk$@Qi|&>0#uW(6kyyk2P-zJ9qX_@yjv5z(O>iC7-LN@Eqj<|AtZ_fQgV zY|n^@xthl7lCpINH5L4}QTKd{!&gm&`wgDe&Nr>V``B{w;zASd;@dWc_hTRXB-i(| zznd)u(F%W-;A$QpAngIJFSC!a@9Y0Nl&0(WVc%O2ef`%Fdz(ABfp`qpk+^|m41b04 zN2J~)brU-I-yU$H3q71s271}}2=(_8JoA32I83@D)axjBk8wqEiWQ1^c4ATt(id^4E;@ow#9**y8i@%KKP@qqDIMJ49i@%Cy z((IXjA|Y1S{?$g!{Nq!S+qY6;G(^>(p?3~Jqd7EU9j&Vvz&$j#70=^de1t}xfW;3L zjrc6H@8u}&V>yB>u{=S_2MF6qLNm(QDSpbF##x-fL;RF^1n2nB86)R7Ul$j615e;t zey2Rg{v}NNxDO$dS|g-Q3fdJssPMZ*DEz8fLpS2oknAlyEvm?|$ zPK}Rli>?;L_V`|GCy5NXs57&})c9E7OxhgtqbAwce+_LCr5kV(1%eg)q&wwU zwu8}@dwvzE+>5Jd@;SP=Cx4P&j%DkOw&W^tfRDXz0JgZ`V9M@+=5TiO9!mCnMCfVq;F;~`KUUx<`*}$Q|i6m z-ofgnhu^|$WPb;*%i(Xx{uh!6KR*A4Jw5SL3SKeTM%mV6so-}VhhmK}6^<4BZVk$N zo^}5pC}R1Y9iSOWB Gxbr``G#gL= literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class new file mode 100644 index 0000000000000000000000000000000000000000..d0b5b4a355a4fb46c1c9b2cbc4e494c7c3275192 GIT binary patch literal 3579 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 \(.*\)$'` + 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/messages/gradlew.bat b/04-SimpleFTP/messages/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/04-SimpleFTP/messages/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/04-SimpleFTP/messages/settings.gradle b/04-SimpleFTP/messages/settings.gradle new file mode 100644 index 0000000..5ccb43e --- /dev/null +++ b/04-SimpleFTP/messages/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'messages' + diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java similarity index 55% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java index e625ede..d285e1f 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java @@ -1,15 +1,11 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; - -import java.io.IOException; -import java.nio.channels.SelectionKey; /** * A request ftp message. This message asks server to list the content of a specified folder. */ -public class FTPListMessage implements FTPRequestMessage { +public class FTPListMessage implements FTPMessage { private final @NotNull String path; /** @@ -27,13 +23,4 @@ public FTPListMessage(final @NotNull String path) { public @NotNull String getPath() { return path; } - - /** - * @see FTPRequestMessage#accept(Server, SelectionKey) - */ - @Override - public void accept(final @NotNull Server server, final @NotNull SelectionKey key) - throws IOException, InvalidFTPMessageException { - server.handleMessage(key, this); - } } diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java similarity index 83% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index e193a69..b50966c 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -26,7 +26,7 @@ public class FTPMessageTransmitter { * @param channel a channel to which new transmitter will be writing messages. */ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { - logger.info("New FTPMessageTransmitter ({}) is created", this); + logger.info("New ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({}) is created", this); this.channel = channel; } @@ -37,7 +37,7 @@ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { * @param message a message to add. */ public void addMessage(final @NotNull FTPMessage message) throws IOException { - logger.info("New message is added to FTPMessageTransmitter ({})", this); + logger.info("New message is added to ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({})", this); writers.add(new MessageWriter(channel, SerializationUtils.serialize(message))); } @@ -48,7 +48,7 @@ public void addMessage(final @NotNull FTPMessage message) throws IOException { * @throws IOException if any IO exception occurs during writing. */ public void write() throws IOException { - logger.debug("Write method of FTPMessageTransmitter ({}) is called", this); + logger.debug("Write method of ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({}) is called", this); if (writers.isEmpty()) { return; diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java similarity index 100% rename from simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java rename to 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java similarity index 87% rename from simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java rename to 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java index 50786a8..ad00305 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageReaderTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java @@ -1,12 +1,13 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; +import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import ru.spbau.bachelor2015.veselov.hw04.TestUtils; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; @@ -14,20 +15,18 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.commons.lang3.ArrayUtils.addAll; import static org.apache.commons.lang3.ArrayUtils.toObject; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.toLengthByteArray; public class MessageReaderTest { @Test public void testZeroLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(toLengthByteArray(0))); + when(channel.read(any())).thenAnswer(write(TestUtils.toLengthByteArray(0))); MessageReader reader = new MessageReader(channel); @@ -38,7 +37,7 @@ public void testZeroLengthMessage() throws Exception { @Test(expected = MessageWithNegativeLengthException.class) public void testNegativeLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(toLengthByteArray(-1))); + when(channel.read(any())).thenAnswer(write(TestUtils.toLengthByteArray(-1))); MessageReader reader = new MessageReader(channel); @@ -59,7 +58,7 @@ public void testCorrectnessOneReading() throws Exception { final byte[] data = new byte[] {1, 2, 3}; ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(addAll(toLengthByteArray(3), data))); + when(channel.read(any())).thenAnswer(write(ArrayUtils.addAll(TestUtils.toLengthByteArray(3), data))); MessageReader reader = new MessageReader(channel); @@ -72,7 +71,7 @@ public void testCorrectnessMultipleReading() throws Exception { final byte[] data = new byte[] {1, 2, 3}; ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(extrude(addAll(toLengthByteArray(3), data)))); + when(channel.read(any())).thenAnswer(write(extrude(ArrayUtils.addAll(TestUtils.toLengthByteArray(3), data)))); MessageReader reader = new MessageReader(channel); while (!reader.read()); diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java similarity index 88% rename from simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java rename to 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java index 011c234..15e0033 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/MessageWriterTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java @@ -1,11 +1,10 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import ru.spbau.bachelor2015.veselov.hw04.messages.Message; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.TestUtils; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; @@ -18,7 +17,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.intArrayOfOnes; public class MessageWriterTest { @Test @@ -38,7 +36,7 @@ public void testMultipleWritings() throws Exception { final byte[] data = new byte[] {1, 2, 3}; WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())).thenAnswer(read(intArrayOfOnes(data.length + Message.LENGTH_BYTES))); + when(channel.write(any())).thenAnswer(read(TestUtils.intArrayOfOnes(data.length + Message.LENGTH_BYTES))); MessageWriter writer = new MessageWriter(channel, data); diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties new file mode 100644 index 0000000..6598b2f --- /dev/null +++ b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Sun Apr 23 15:16:19 MSK 2017 diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000000000000000000000000000000000000..27a1895aa990382b74be8430d27bcd6ec004786a GIT binary patch literal 17 TcmZSHQDG2r*P6?d0RjX8DVqZ{ literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..bb3f1ae0c54ae42bfb00e394216f94f0d69f7d8d GIT binary patch literal 18697 zcmeI%KS%;$9LDjt2#T&hHxx)y(GbE>T2oULK|$jY5rJ)igF`6_(j-EIP!Lq)P#`r# zE-uHeyFVFCP)>{<9r~kQ2G}mx*WI_M| z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~f&U_~Dj(A8JjQ2q+QVQ%h(Mnly7Ei?QSDSO zIM>T%_5a{4ICW>9OnkffrOKzT-s`1U&T#X2mB-KP*6ZWKt(!+xuD&wgcJ4S4KmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 zpdEo3S@z34W^erjZ#_RFbwHju9A-o{YUZZrVG CV|b(h literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000000000000000000000000000000000000..155aebb21c1d93ddc20f2a65b9195b7e3665df1e GIT binary patch literal 19211 zcmeI%K}Zx)9LMpQeMHbo%_WfN)+tcmhF&^}q+xXlw}>ulBTl-Do5Sq7b6JHJLBw!T zFesu!bW4bq>JW)t6b}l5VB%o|AxKzH9Xxo@_m~~Mx}q2P4*YiC{AcI!|9^IF({32` z)_(Ocj*hEGOI8RVfB*srAbf6q!Cm7soqH>@`sg{8%@y>HceDy-jmw|Tv| zE$4#zy*FXKV{vxl@9@@Eb^rCS9)7F(cyNtR1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5IBxNv-;61l~EmGewY1&X-6h= z_6wPDd+Z^ZvU9eKwKT?)X?MW6`{<#}I9|^2WS?jE4mf^OkDWCmC%jQu#fdMMyT@KX zjefkA-76#(Ox4GfZt90hNk^E=X02UG-?Lr!u*t^iX;aGfRIjJHpRg8wZqGir{p3dZ z)5M4LpZuI2VP220r1DEgm}{ptg6j>c!Lmswqb50vZH47czfUJu|39y^#&0zw;$QVZ zD|#UPkmPlQS*rCf@m0IE-y|$Qx^uI9ac1&&A@?>mTCsF9vH6coY1K?;I6x@a8*M;Bdmuvm)T>&qkQAhsYV@_q2~j=T4}``zbvZ%Uky zNcczVBJFEeyNMPAAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0{@G^wAsjZZ!?ht zU2bDXgOFISX#`@6~5vMQL=oGG_^e(36l zX6E}uQ>{n2U26|?var&ePwnq}Jn$wv{-i1kRzcEyiCI)|OH*}0Sq({rna4WgJ+pD< zR3+6c9|%9cKKCvDv3GI&-OEpnw}+1g!Vgo!%jX9oOVK;*%k2C9D<>8n&xFuVq=*}TQON@()Jc_SY~^#16vKVTbZ_IiTa5fm#15utFipY zmT#BAEnm;AJXc!sTut+8Wm=XVeJ0y987^uq)De3ff;&w4bucBdJ0q08yFu$Up-tr(?{IU2J5%~yzQNJsCl{!6ioDML b4v@e4uWW93NB=aF%A5;NFKB9Pz8~@vnNWlM literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/build.gradle b/04-SimpleFTP/server/build.gradle new file mode 100644 index 0000000..28d0f71 --- /dev/null +++ b/04-SimpleFTP/server/build.gradle @@ -0,0 +1,19 @@ +group 'ru.spbau.bachelor2015.veselov.hw04' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' + testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' + compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' + compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' +} \ No newline at end of file diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class new file mode 100644 index 0000000000000000000000000000000000000000..5b8e203dd4e849003b421d343d1f0fa2b6197c38 GIT binary patch literal 2439 zcma)6{ZHFg6g@8qaR>>e;iH4D;Fhq2z%cFTT0Tn4XpxvwRuzQArfGA+YcNZk$aYxw z7a{GZOut_uTjV*FV4f24DdjY4qTFFA{iP zy>4h2*DxWFbfmd29f9St(>B~z#cUfDvw9%wP3O-1?YqX2bU8mV4!)gVFdEWz&6;$L zr@`d8AG|DZ{dwE=tcKjQk1W@!)a9COH$Bs{nzk!2S#CNt<4}4P$FywMFwZ_3TTO4P zU9U68#Kjyt-?h%?>GK@Zb{m%GDaK1t7;o%63%Tx`#S$#JV%e6rD)6!xCCw#;M+xoD zV0u>|vEJO50$0kGEw|c@igb2NN+*yjH>+lS*K{nk4mT6tfkiDBBVw)}P-R(P^E`I5 zA#IOE=PxS!%yi6#q?+g2)mxKZ&{=^8#px)3m*^wV&s-hK3#>#-*j+V&^meoDRON=H zbQ-1CTXoJInnz{^S?C!gp=HpAjKIAJr@LD=fdQ4zsGD}p_^fg$tDZo-sM>cmpU*q8 z)pYy=%*8xgTHKu8&EO_(rFqLH*{%q<-Nn-|C2&7Ncvq=36a-e+oLXD;UVqVa^he=U z(_5!q*9%i_L2tg$r`)+IS8udkPv^DOD^j<4CsUXfDE$}4gL2T^zv$~oukF~O|4a(W z6#7yaPhmKPYbj*U3ApV!mR-~E5icMqHB5@RSS+6@95^h0(XkbXzC7Kr6?$cG7aynj zbGs*S>nz7+y)J8J{j~NcFRQYpenc7;1%|tzsg7l_oW>GX_#1jF(>8x(vLnrE8V{A{ zU>BMi)&$1RQiM0IBYIsR%Z$};o|-NHYV))t_;Utg$f*-co8l@7fnM4)M+#yP{wk-A z^E*8fjLV`Qaa>`fOW!!{#LS=2;y)ulOPioAy@n{wyh5xr`wHzB^$npnn1iUiA$B>uepacRrD_qXY8b0VI9AOo@z%{(r1uCwfl98Z> zJD`e}Lk*tn7DyPm-F50;}W^s z5#kDaJ-IvdBSoIH`GQ8%IG6#qVrVNT3g7X3uYb*Ymr4=WKr8`RNw`V{lX) z#5o1$gLqfLdn(??1r;7#RB$PT%ebOK!3PSis!%Z{mk(9=@KF#6Nv{Pl9mI_En3c<% z^qCK0LB%4Lr1`Rfk5%;I6B&riih@rC0+UwWDxDYb4h}5~_%7OMQ=m0r<<04GE@>7Q zjbxURj)a{uvdc!%l6+n0D`hN4U?@>6N1Z~_C`Xe;j2-*PP%UpXZ+C*YA;ckhMT zhEUDpa?ep`eHW@~*mtEto`tkL+X7vK_52!7pg=HVIGNfdz#CzTus3g)jVx>LZmhc2 zyon(K+H05DlNTw@@+{X+9aF4Ljaf8^dCCjYC@V{AjM{Jy_)}TiVVW&QI=xUX6pE(f zn7kEsyXR*890x28M{s~QsQh_|bDj;Zhsi}r34QpFZ$Lb7)qPw8t}skDK&u(xO}s@e zgrhjdAawS|c(v~1x%p-jo|O)-_h9+_iL1y`A7Kv$~JE10ay#@y5?-HNNy;Yg!HS3FFIu`QsFB#Wh+VZm{l*x6r!9wN|9Hu5DFz?mytS z>recJzxnMN#~*lFr#l>rDq2Mc`KKJP;%@{bH(4=PAD-43S2!m=cSEJX

0kzdPFE}5*%BE$FJze6Aa)t9A_@WZZtq1tI9mPM4JOn?E(dsx(Fav^${v*twORUjL;xr;moWg02ag_4M zIPf1L3eJdUSc0lxOuj1^R}fS1w!5BHaF)flwrcwW0pGt+<|q#He?p8Olh`v>7v95< z!Knpf#lpU4+|J)*1k6ay6)v?X?Pz()fDsyEcx4Q4-9)1B9cq0nD9&es?;cG44{l8T A3jhEB literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Server.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Server.class new file mode 100644 index 0000000000000000000000000000000000000000..39b3baa11e45cd460119c0c92dff3d4600316629 GIT binary patch literal 9882 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 literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class new file mode 100644 index 0000000000000000000000000000000000000000..40fdda199fbdd0709e62d685826d8e6fbdbef323 GIT binary patch literal 433 zcmbu5y-ve06ot=C^8+DJ#Ky=547i{&ff)FyKnkc5Rd*+~h*5|uI|;lN6A}Xtz(XN! zDqv!QYw75mPuIRze*buV12DvTj2>1atVQS(!ed?O`h?Ki-kB2oGc!|!eyS^V(>!F# zPGnXx*+@+;%c-=w%U{s13+)K!scnRtXR;BQ%nMZ-dob8P6s>aXTTwg?hC)5%YF=wo zIdN6BvedJ&tc#0pdPInCO=EL4(%rnx-cOp2Pl^|9P>4ln>3x$fW+i4zHi^ELC&7ac;6sU% zq8ITZI0GN^{g~aE-S>~zHvl6HLiDg1U@JhM;GgMI*XM-Z-u|56UYLa<^b=jGN%N4Z zY9`Zy$#!BgSb5u>#~)FUc|H8 wpHILp9RA!ch?93@_1TG)2fTw9&@%%E0jtj#d|-_=TGbxb5was}usVo70m(df2mk;8 literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class b/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class new file mode 100644 index 0000000000000000000000000000000000000000..1643b20eba08df52b68f59954f689b464b11ac48 GIT binary patch literal 2392 zcmb7G?Nb{?82>E^TsV%BrdBIed$vK6@Nx+P71Lr7!A28`4WdxB-5g7D^m3QEyQJ3d z`u{kiHtP8D%^CkF$7e5r1Z2jLncaPM_u1#=_q<&G{^yt90W3m{Lc_F*aikQaRYZ_c z@fK#}G&_bl%uC8pkws2U3o72mqJkv_%M2qy&GM632BYXT4Zl(0O{2oiny_7OA)8w= zTEZu~Wz?Q!7mc#;TEg2Aevqf9cPz&WRvCEef^P?5-`v?Q3E$^ckx%b3MAzK|!7x#@ z9I@4`SI7!pvFRjHbWLvWa?g_c?qO7V#h?`&M|kTt_kBUz+#q^;E+%v2q*Ct~F(5#F zRx=C}jOJ5@g@N$tdnz3s;g0`Icnm9pSWSn$#lcQ zFm`HpMS@}2+^HHT(PEgpkbH`CRRrs<69^}unnO93lYCU07aC;_6WLV8!j79ObdP1+_cYhJZkr<~LeT~EK)Z6JE%xLfGc zQ~tE>9_my6{FJZPn|`2EGtw(Ucc|0E@Q}jZtB;OX3U*?+7Q<2ulc%oBfk(YW!5(!_ z(pQ(Ltn{POVaPw~WI;br-SiHRx?CC_;R_Y}_>$pf&xV3+iz>H|9Xlym1&=8W&e0|j ziG!jo0vc*MdvL9iu-Y z<1ny<91gvI!T6#v~ky4z%dHkDFdb}gwSDRc{h2!+t{w3?PmYOzJdoAfr_ve^y0n*cNZ z89qjIM*Sj=!xv{nKnEY6obhjR#B(=kleC4&jG5WJuk-kw^E>x!{{Huu-vAs#EruSv z){PxFCSS)DoQNTUHx!(V;S|Q>IE^!MC#&LY921z7uX8HS$8Z4`6gwwS4w3&Ne_gpeVTbBf%W=dLN&jm?O^ViM$@OBCHj+js9ybHBJETn25*wuO7% z;+`i+Vj|~O4X;w*RinU3!gAcBV@Hk~HQ~{`W~|&EJ7(mCTO)tM^OGA5QpCxP5zlg$ zmxV9fw)83G00Q~k*@)8OcFDL>Sfx~qrzs5)(-&nKP(V)WDMM7qC}<3#VL00f?n`sC zIn(neZSS^lr-kS7l1K&y2==zT&x<#wc_m00)e}Q(Nq9xqEQmRWVSg&%dxe*aE=6u! z2+k_97{(>JnYo+Xc^YPc*nW{Xav>Qc$tHQ+10%vP8Ag zxyv1;)1NxtzMh$NxM`hL|EbqIfT~aWuVFp(e%xZWC2c*BN z1W4Se5ZPi$m)G!=t{|^r4)1E1$2F?{L;AWv%N>z&?`c@TqJrxT*$xml1K(7zTO1G48JuAdd-{!tU7a~k*4CAfWqM>npvyq0~ zjlCGry9QKqosb?td>RjKaU z)YtC!i`09Y^>fZ~EWvF`Wlb8pvdqw*T5Qc_LxQ{>?trIeB{1|RlSx-p95?9Iv>2nF zlbTA;Yj__Y#OSl~A(hvpTdJ0++vv-Vt4}lTVPId5fuJ&(;?HEKk| zO;|B>fqLgq^K{CxM2TB#;at2^6hW_2K+UbK1vl)-JPhDg3>DCKqHhc53Vi64rXKnv zhmeq+gvLHvb%9Er#+~%2V6-Jy3E5_7jL_)-b|Z{Ev|1&dFpaxL{(=&Ij2oFpV40DJ z2xay?MEFNK3S%F=^|~1L(@g$$1rAv-lZHdsOY;PoSMdond`jn^k;~7Kru{IO8sO;$ z>!-B@^a?%Qp$1maID`WvC{f*Opvp>A5kfWcCnEO{4L=z91Ci-NKhyLnx*kKx{DjaG zs3ClT1Z{WII{Xdk+(#t*fGo9w&#r^dB8g%0*pC!mrKc7Amz2}52>jP{`fUJSLqt{o zK}JDjg4mL<+oMqEpF>IE~9Rh8H4tMdQ= literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class b/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class new file mode 100644 index 0000000000000000000000000000000000000000..4a833d3b2c8e9d86019699100132f89908dcd5f2 GIT binary patch literal 2010 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 \(.*\)$'` + 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/server/gradlew.bat b/04-SimpleFTP/server/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/04-SimpleFTP/server/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/04-SimpleFTP/server/settings.gradle b/04-SimpleFTP/server/settings.gradle new file mode 100644 index 0000000..c9d3ca4 --- /dev/null +++ b/04-SimpleFTP/server/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'server' + diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java similarity index 94% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 715e754..99ae7bc 100644 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -26,8 +26,9 @@ /** * TODO: limit a length of an incoming message * TODO: add javadocs to Server - * TODO: add FTPMessageTransmitter test + * TODO: add ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter test * TODO: add javadocs to exceptions + * TODO: add method which allows wait until server is stopped and use in server test */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -143,14 +144,14 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[ throws IOException, InvalidFTPMessageException { FTPMessage message = SerializationUtils.deserialize(rawMessage); - if (message instanceof FTPRequestMessage) { - ((FTPRequestMessage) message).accept(this, key); + if (message instanceof FTPListMessage) { + handleMessage(key, (FTPListMessage) message); } else { throw new NoSuchMessageException(); } } - void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) + private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) throws IOException, InvalidFTPMessageException { Path path = Paths.get(message.getPath()); diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java similarity index 100% rename from simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java diff --git a/04-SimpleFTP/server/src/main/resources/log4j2.xml b/04-SimpleFTP/server/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b8f1cce --- /dev/null +++ b/04-SimpleFTP/server/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java similarity index 97% rename from simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java rename to 04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 5c2b15c..c42463b 100644 --- a/simple-ftp/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -21,7 +21,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -import static ru.spbau.bachelor2015.veselov.hw04.TestUtils.toLengthByteArray; public class ServerTest { @Rule @@ -123,6 +122,10 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep return new FileEntryMatcher(path, isDirectory); } + public static @NotNull byte[] toLengthByteArray(int integer) { + return ByteBuffer.allocate(Message.LENGTH_BYTES).putInt(integer).array().clone(); + } + private static abstract class TestMessage { private final @NotNull FTPMessage message; diff --git a/simple-ftp/.idea/compiler.xml b/simple-ftp/.idea/compiler.xml deleted file mode 100644 index 3f8a10e..0000000 --- a/simple-ftp/.idea/compiler.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/simple-ftp/.idea/gradle.xml b/simple-ftp/.idea/gradle.xml deleted file mode 100644 index ab6e46d..0000000 --- a/simple-ftp/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/simple-ftp/.idea/modules.xml b/simple-ftp/.idea/modules.xml deleted file mode 100644 index 96510b6..0000000 --- a/simple-ftp/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/simple-ftp/.idea/modules/simple-ftp.iml b/simple-ftp/.idea/modules/simple-ftp.iml deleted file mode 100644 index 2855e58..0000000 --- a/simple-ftp/.idea/modules/simple-ftp.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/simple-ftp/settings.gradle b/simple-ftp/settings.gradle deleted file mode 100644 index afa2437..0000000 --- a/simple-ftp/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'simple-ftp' - diff --git a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java b/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java deleted file mode 100644 index 8b2b5b8..0000000 --- a/simple-ftp/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPRequestMessage.java +++ /dev/null @@ -1,23 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04; - -import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; - -import java.io.IOException; -import java.nio.channels.SelectionKey; - -/** - * An interface which represents a request message to a server. - */ -public interface FTPRequestMessage extends FTPMessage { - /** - * Method to implement double dispatch pattern. This method should call handleMessage method of given server. - * - * @param server a server which will handle this message. - * @param key a selection key of a channel which produced this message. This key should be passed to handleMessage - * method of a server. - * @throws IOException if any IO exception occurs while server handles this message. - * @throws InvalidFTPMessageException if this message is invalid. - */ - void accept(@NotNull Server server, @NotNull SelectionKey key) throws IOException, InvalidFTPMessageException; -} From 8fc1c6fd930fbf646bfae239cd036374613e4c12 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 16:58:44 +0300 Subject: [PATCH 26/69] Implement Client class. --- .../.idea/modules/console-client_main.iml | 1 + .../bachelor2015/veselov/hw04/Client.class | Bin 313 -> 3478 bytes .../bachelor2015/veselov/hw04/Main.class | Bin 0 -> 473 bytes .../bachelor2015/veselov/hw04/Client.java | 63 ++++++++++++++++- .../spbau/bachelor2015/veselov/hw04/Main.java | 17 +++++ .../veselov/hw04/FTPMessageReader.class | Bin 0 -> 3227 bytes .../veselov/hw04/FTPMessageTransmitter.class | Bin 3161 -> 3313 bytes .../veselov/hw04/FTPMessageReader.java | 66 ++++++++++++++++++ .../veselov/hw04/FTPMessageTransmitter.java | 34 ++++++--- .../veselov/hw04/FTPChannelAttachment.class | Bin 2439 -> 2415 bytes .../bachelor2015/veselov/hw04/Server.class | Bin 9882 -> 9402 bytes .../veselov/hw04/FTPChannelAttachment.java | 7 +- .../bachelor2015/veselov/hw04/Server.java | 30 ++------ 13 files changed, 182 insertions(+), 36 deletions(-) create mode 100644 04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class create mode 100644 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java create mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.class create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java diff --git a/04-SimpleFTP/.idea/modules/console-client_main.iml b/04-SimpleFTP/.idea/modules/console-client_main.iml index a866cb4..d2ce9e1 100644 --- a/04-SimpleFTP/.idea/modules/console-client_main.iml +++ b/04-SimpleFTP/.idea/modules/console-client_main.iml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class b/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class index 726e52430db9889c80ac434179e6af3ac1f517f8..9eebaabcbab9d1c883634e233488e10a61de66db 100644 GIT binary patch literal 3478 zcmcInYf}?f7=8{3YzR>xsI8ziDpW3N@P46M5w*nvT0w2p)-K^lR+HUycLQo`um7W8 zndzr?rh-$ZwbPkSXZkn#KWd+McLR|@8#_~GPR{K;&w1bHy`1IGzkm7#z+rro#1@=M zVi;$eu^A%<&Lt7Yd0Dw&;GHB4yem7S1}-L%#CtLslkIT>6G?2uC6T!-Kktjc6$6t7 zrVLy)aLvGV1tVWDZCe)=c8=XO=gh2aIoW8<%T7A^d)glfMTQi*u2gK_D(O*s&ho73 zq8_$w$2Wb;u|0*|V~#tUy{r9c*R*UeOW^8ecEa%|D#ao(cC5vidQg5Ir^R0cG}DrbkT7S4jwp?ozou2bJ@cD;Nk3rsmtTq^UPU2wR)D9HM!cH z5tJjZhH@o1CID|)w&kBz*wP#FQ#9?_?4<8n_UzDT-!+B!h%=)VTE{F~PgF|N+MP1V zj6!9RAjz@iCy?u;{93hLATsOXs#eMbYO=pY|Vc7QOwHvvG zRw&+av!3&%(34(Puh^4~V6Iz!VM5O`;^y?2wrBmqip|1P+4KvH=?FmKP(9a0>aHrf zVbVAA_r}d~;IklEZZMyiIOKTJsknK4!4eO*gdW;2Zb@M$1`XUy;TAqj;dN|P=nOMT z``J-j`(ZK-&&;^APsDen@DXk+9RIHYE+8MLupMvE)K>xt<6F*C@g2ydkj0?Ff%-ti zyAfRiF`YslGbv~crf>(d3diclc`iy6a&?@H-2000q0mfggsVZe)~wb5hgF0XF$|Lz7G4InQ`R;MY;Rv3McT+a ztmvX~SCqjFzNnN((Kpn0L!rOATYK?!*Yd@vvk!b-t@~2t))kg0T2FZMdX%vMH8Dkvwt3U?uksBlilV-dvSDRO)L{&hq&ghE`eLwfw0C!RyILx#JW`x6 z7vjAv?vx>Dd$OFnqJ- zc?e^6C<>R_7bArV=8_n~yuz;4h#oB#Syqcx6ITM(z=I?n;!-tA1E@%tWzyF*lAk5< zNF+Pf(Zs+P)p{5}L{C%A>91HxPV$3?iG~=`QbEyxPJRhBajlE}Hns#*2ZC8z>fXOd zu(G{WB2Hx1VSZHYCib^zXC^>p0`zNY^3D(6Ojh{o)R)c+Yiy+kfVNr9!4|Uk$|mJD{P&j0m4>06*`9F z5nG~Sf(o_Mkgb%>Q05R350lR!N(y70h$WtJJ!W9Dfgyt*!^%L%8H2ZqaZSY9$MM<# zYemDRfYn-Z4Iz=_wk4$=a7=2|UnGUps@Bf$h!=W7dLdC9AuW?GEg+G077z=hwsKAW zL`KHawl^)1B1-&>EfG}UU~UC+687Sry}4MrJh?zhW9d)Wx3G8Fhsf*SzdIKXWLnsJ zFOii{8OSxJeadWPFS1mNNpSy#dUr45;f>o%_>@PM@koZB^T<;|u|Vwl1B@`QR(ms?ctV%WZ>C8udg1K$1z#o9*_ delta 146 zcmbOxy^~4l)W2Q(7#J8#7zDT&m>GE48Ti;4_!$}4Y%=pQOY9gKm^CJ^W=x+vmsy&P zg@KikL36Soqw?fhR>@!nMFu9I77$=WCQZ_!F&b=R;}#}j2nRhObqNmk_{-# b0Mx(%BzeGWRt8Q6E+CJQfg4CNG4KEYdsYvM diff --git a/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class b/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..c2ccb627c395a10c694d140cdc1a4ee3b631181f GIT binary patch literal 473 zcma)2%TB^T6g^W~3W!ocaqUXb!~ugVj2okgNtFeLjjL&$lp&=h(}(_+D-#!ffFEVN ztwv3B;UstNJ?Fm8% zEm)Fg==N^ig~$aDMHKL9s#O$>O94U$G_vzYnxS$2;LBC2;wZ7vB|MEY?aK>QD6AJ7 z4vV2pn6Mc3{;7(=`Ia*A7Sc~iKuM{XUrxT3ViyMeU2zQ1Q()0uCB(@y^49(n*khTt w>8_S!4K<3J9|fqRL8y*3VvMr+fN;_LtI_$<$gqwLDr%9LRPK;%Qf#384xa8}Qvd(} literal 0 HcmV?d00001 diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index a7f3a00..b28006c 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -1,4 +1,65 @@ package ru.spbau.bachelor2015.veselov.hw04; -public class Client { +import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.channels.SocketChannel; + +/** + * A client class establishes a connection with ftp server and allows to send a request messages to it. + */ +public class Client implements AutoCloseable { + private final @NotNull SocketChannel channel; + + private final @NotNull FTPMessageTransmitter transmitter; + + private final @NotNull FTPMessageReader reader; + + /** + * Establishes a connection. + * + * @param host a host to connect to. + * @param port a port to connect to. + * @throws IOException if any IO exception occurs during establishment of connection. + */ + public Client(final @NotNull String host, final int port) throws IOException { + channel = SocketChannel.open(); + channel.connect(new InetSocketAddress(host, port)); + + transmitter = new FTPMessageTransmitter(channel); + reader = new FTPMessageReader(channel); + } + + /** + * Closes the connection. + * + * @throws IOException if any IO exception occurs during closing of connection. + */ + @Override + public void close() throws IOException { + channel.close(); + } + + /** + * Send a list request to a server. + * + * @param path a path to a directory which content is requested. + * @return answer message. + * @throws IOException if any IO exception occurs during interaction with server. + */ + public @NotNull FTPListAnswerMessage list(final @NotNull String path) throws IOException { + FTPListMessage message = new FTPListMessage(path); + + transmitter.addMessage(message); + transmitter.waitUntilWritten(); + + try { + return (FTPListAnswerMessage) reader.waitUntilRead(); + } catch (MessageWithNegativeLengthException e) { + channel.close(); + throw new RuntimeException(e); + } + } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java new file mode 100644 index 0000000..8d62223 --- /dev/null +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -0,0 +1,17 @@ +package ru.spbau.bachelor2015.veselov.hw04; + +import java.io.IOException; + +/** + * Entry point of a client program. This class allows to make requests to server. + */ +public class Main { + /** + * Entry method. + * + * @param args arguments are ignored. + * @throws IOException any IO exception which may occur during reading of commands. + */ + public static void main(String[] args) throws IOException { + } +} diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.class new file mode 100644 index 0000000000000000000000000000000000000000..63930ebff1f7e262068dd141462fb077048c1af9 GIT binary patch literal 3227 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 read() throws IOException, MessageWithNegativeLengthException { + if (!reader.read()) { + return Optional.empty(); + } + + return Optional.of(getMessage()); + } + + /** + * Returns read message. This method waits until message is fully read. A better performance may be achieved if + * underlying channel is switched to blocking mode. + * + * @throws IOException if any IO exception occurs during reading. + * @throws MessageWithNegativeLengthException if the length of the message is negative. + */ + public @NotNull FTPMessage waitUntilRead() throws IOException, MessageWithNegativeLengthException { + while (!reader.read()); + + return getMessage(); + } + + private @NotNull FTPMessage getMessage() { + byte[] data; + try { + data = reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + reader.reset(); + return SerializationUtils.deserialize(data); + } +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index b50966c..48fb7a1 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -26,7 +26,7 @@ public class FTPMessageTransmitter { * @param channel a channel to which new transmitter will be writing messages. */ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { - logger.info("New ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({}) is created", this); + logger.info("New FTPMessageTransmitter ({}) is created", this); this.channel = channel; } @@ -37,7 +37,7 @@ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { * @param message a message to add. */ public void addMessage(final @NotNull FTPMessage message) throws IOException { - logger.info("New message is added to ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({})", this); + logger.info("New message is added to FTPMessageTransmitter ({})", this); writers.add(new MessageWriter(channel, SerializationUtils.serialize(message))); } @@ -45,17 +45,35 @@ public void addMessage(final @NotNull FTPMessage message) throws IOException { /** * Makes an attempt to write a message to a channel. * + * @return true if there is no messages to write left. * @throws IOException if any IO exception occurs during writing. */ - public void write() throws IOException { - logger.debug("Write method of ru.spbau.bachelor2015.veselov.hw04.FTPMessageTransmitter ({}) is called", this); + public boolean write() throws IOException { + logger.debug("Write method of FTPMessageTransmitter ({}) is called", this); - if (writers.isEmpty()) { - return; + if (!writers.isEmpty()) { + MessageWriter writer = writers.getFirst(); + if (writer.write()) { + writers.poll(); + } } - MessageWriter writer = writers.getFirst(); - if (writer.write()) { + return writers.isEmpty(); + } + + /** + * Writes every message in queue into the underlying channel. A better performance may be achieved if + * underlying channel is switched to blocking mode. + * + * @throws IOException if any IO exception occurs during writing. + */ + public void waitUntilWritten() throws IOException { + logger.debug("WaitUntilWritten method of FTPMessageTransmitter ({}) is called", this); + + while (!writers.isEmpty()) { + MessageWriter writer = writers.getFirst(); + while (!writer.write()); + writers.poll(); } } diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class index 5b8e203dd4e849003b421d343d1f0fa2b6197c38..cc25be9329fff085e2c3f021ed56107a0f82e96b 100644 GIT binary patch delta 84 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 SL6YUHGB#L=$_=s=q5lG_pdN1k literal 9882 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 optional = reader.read(); + if (!optional.isPresent()) { return; } - byte[] message; - try { - message = reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } - - reader.reset(); - - handleMessage(key, message); - } - - private void handleMessage(final @NotNull SelectionKey key, final @NotNull byte[] rawMessage) - throws IOException, InvalidFTPMessageException { - FTPMessage message = SerializationUtils.deserialize(rawMessage); - + FTPMessage message = optional.get(); if (message instanceof FTPListMessage) { handleMessage(key, (FTPListMessage) message); } else { From b1e09097787b4d75416d805a7b553e338642deda Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 17:46:38 +0300 Subject: [PATCH 27/69] Implement client Main class. --- .../spbau/bachelor2015/veselov/hw04/Main.java | 41 ++++++++++++++++++- .../veselov/hw04/FTPListAnswerMessage.java | 6 ++- .../bachelor2015/veselov/hw04/Server.java | 2 +- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 8d62223..6a64e1d 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,6 +1,9 @@ package ru.spbau.bachelor2015.veselov.hw04; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Scanner; /** * Entry point of a client program. This class allows to make requests to server. @@ -9,9 +12,45 @@ public class Main { /** * Entry method. * - * @param args arguments are ignored. + * @param args first argument is a hostname, second argument is a port. * @throws IOException any IO exception which may occur during reading of commands. */ public static void main(String[] args) throws IOException { + try (Client client = new Client(args[0], Integer.parseInt(args[1])); + InputStreamReader inputStreamReader = new InputStreamReader(System.in); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { + boolean shouldRun = true; + while (shouldRun) { + String inputLine = bufferedReader.readLine(); + Scanner scanner = new Scanner(inputLine); + + if (!scanner.hasNext()) { + continue; + } + + String command = scanner.next(); + switch (command) { + case "disconnect": + shouldRun = false; + break; + + case "list": + if (!scanner.hasNext()) { + System.out.println("Argument expected"); + break; + } + + FTPListAnswerMessage answer = client.list(scanner.next()); + for (FTPListAnswerMessage.Entry entry : answer.getContent()) { + System.out.println(entry); + } + + break; + + default: + System.out.println("Unknown command: " + command); + } + } + } } } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java index 0a1b49f..aa06426 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java @@ -66,7 +66,11 @@ public boolean isDirectory() { * Returns a string representation of this file entry. */ public @NotNull String toString() { - return path + "[" + Boolean.toString(isDirectory) + "]"; + if (isDirectory) { + return path + " [directory]"; + } + + return path; } } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index d31e1f6..c61b2e6 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -26,7 +26,7 @@ * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test * TODO: add javadocs to exceptions - * TODO: add method which allows wait until server is stopped and use in server test + * TODO: add method which allows wait until server is stopped (join) and use in server test */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From e9bec9a033e2acbb5e01887b23c58afeee697b70 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 18:38:40 +0300 Subject: [PATCH 28/69] Add integration tests module. --- 04-SimpleFTP/.idea/compiler.xml | 2 + 04-SimpleFTP/.idea/gradle.xml | 11 ++ 04-SimpleFTP/.idea/modules.xml | 3 + 04-SimpleFTP/.idea/modules/console-client.iml | 1 - .../.idea/modules/integration-tests.iml | 12 ++ .../.idea/modules/integration-tests_main.iml | 23 +++ .../.idea/modules/integration-tests_test.iml | 29 +++ 04-SimpleFTP/.idea/modules/server.iml | 1 - 04-SimpleFTP/.idea/modules/server_test.iml | 1 - 04-SimpleFTP/.idea/vcs.xml | 1 + .../bachelor2015/veselov/hw04/Client.class | Bin 3478 -> 3495 bytes .../bachelor2015/veselov/hw04/Main.class | Bin 473 -> 3520 bytes .../3.1/taskArtifacts/cache.properties | 1 + .../3.1/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 0 -> 18697 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 0 -> 19301 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 0 -> 19570 bytes 04-SimpleFTP/integration-tests/build.gradle | 19 ++ .../veselov/hw04/ServerTest$1.class | Bin 0 -> 2691 bytes .../hw04/ServerTest$FileEntryMatcher.class | Bin 2806 -> 2806 bytes .../veselov/hw04/ServerTest$TestMessage.class | Bin 0 -> 945 bytes .../veselov/hw04/ServerTest.class | Bin 0 -> 6602 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52928 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + 04-SimpleFTP/integration-tests/gradlew | 169 ++++++++++++++++++ 04-SimpleFTP/integration-tests/gradlew.bat | 84 +++++++++ .../integration-tests/settings.gradle | 2 + .../bachelor2015/veselov/hw04/ServerTest.java | 45 ++--- .../hw04/FTPListAnswerMessage$Entry.class | Bin 2331 -> 2320 bytes .../bachelor2015/veselov/hw04/Main.class | Bin 2282 -> 2320 bytes .../bachelor2015/veselov/hw04/Server.class | Bin 9402 -> 9597 bytes .../veselov/hw04/ServerTest$1.class | Bin 2392 -> 0 bytes .../veselov/hw04/ServerTest$TestMessage.class | Bin 2010 -> 0 bytes .../veselov/hw04/ServerTest.class | Bin 7236 -> 0 bytes .../spbau/bachelor2015/veselov/hw04/Main.java | 2 +- .../bachelor2015/veselov/hw04/Server.java | 98 +++++----- 36 files changed, 429 insertions(+), 81 deletions(-) create mode 100644 04-SimpleFTP/.idea/modules/integration-tests.iml create mode 100644 04-SimpleFTP/.idea/modules/integration-tests_main.iml create mode 100644 04-SimpleFTP/.idea/modules/integration-tests_test.iml create mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties create mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties.lock create mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileHashes.bin create mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileSnapshots.bin create mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/taskArtifacts.bin create mode 100644 04-SimpleFTP/integration-tests/build.gradle create mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class rename 04-SimpleFTP/{server => integration-tests}/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$FileEntryMatcher.class (90%) create mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class create mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest.class create mode 100644 04-SimpleFTP/integration-tests/gradle/wrapper/gradle-wrapper.jar create mode 100644 04-SimpleFTP/integration-tests/gradle/wrapper/gradle-wrapper.properties create mode 100755 04-SimpleFTP/integration-tests/gradlew create mode 100644 04-SimpleFTP/integration-tests/gradlew.bat create mode 100644 04-SimpleFTP/integration-tests/settings.gradle rename 04-SimpleFTP/{server => integration-tests}/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java (76%) delete mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class delete mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class delete mode 100644 04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest.class diff --git a/04-SimpleFTP/.idea/compiler.xml b/04-SimpleFTP/.idea/compiler.xml index 34af4f7..a8ab345 100644 --- a/04-SimpleFTP/.idea/compiler.xml +++ b/04-SimpleFTP/.idea/compiler.xml @@ -4,6 +4,8 @@ + + diff --git a/04-SimpleFTP/.idea/gradle.xml b/04-SimpleFTP/.idea/gradle.xml index d14ea90..b86f033 100644 --- a/04-SimpleFTP/.idea/gradle.xml +++ b/04-SimpleFTP/.idea/gradle.xml @@ -13,6 +13,17 @@ + + +

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 \(.*\)$'` + 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/integration-tests/gradlew.bat b/04-SimpleFTP/integration-tests/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/04-SimpleFTP/integration-tests/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/04-SimpleFTP/integration-tests/settings.gradle b/04-SimpleFTP/integration-tests/settings.gradle new file mode 100644 index 0000000..b9934d8 --- /dev/null +++ b/04-SimpleFTP/integration-tests/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'integration-tests' + diff --git a/04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java similarity index 76% rename from 04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java rename to 04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index c42463b..7cc0739 100644 --- a/04-SimpleFTP/server/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.InputStream; -import java.net.Socket; import java.nio.ByteBuffer; import java.nio.file.Path; import java.nio.file.Paths; @@ -39,15 +38,15 @@ public void folderInitialization() throws Exception { } private final TestMessage listTestMessage = - new TestMessage(new FTPListMessage(Paths.get("").toString())) { - @Override - public void check(@NotNull FTPMessage message) throws Exception { - FTPListAnswerMessage answer = (FTPListAnswerMessage) message; + new TestMessage() { + @Override + public void test(final @NotNull Client client) throws Exception { + FTPListAnswerMessage answer = client.list(Paths.get("").toString()); - assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), - false)))); + assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), + false)))); } - }; + }; @Test public void testFTPListMessage() throws Exception { @@ -71,24 +70,20 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep Server server = new Server(pathToRoot, port); server.start(); - Socket socket = null; - while (socket == null) { + Client client = null; + + while (client == null) { try { - socket = new Socket((String) null, port); - } catch (IOException e) { + client = new Client("localhost", port); + } catch (IOException ignore) { } } for (TestMessage testMessage : messages) { - socket.getOutputStream().write(prepareMessage(testMessage.getMessage())); - - FTPMessage answer = SerializationUtils.deserialize(readMessage(socket.getInputStream())); - - testMessage.check(answer); + testMessage.test(client); } - socket.close(); - + client.close(); server.stop(); } @@ -127,17 +122,7 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep } private static abstract class TestMessage { - private final @NotNull FTPMessage message; - - public TestMessage(final @NotNull FTPMessage message) { - this.message = message; - } - - public @NotNull FTPMessage getMessage() { - return message; - } - - public abstract void check(final @NotNull FTPMessage answer) throws Exception; + public abstract void test(final @NotNull Client client) throws Exception; } private static class FileEntryMatcher extends BaseMatcher { diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class index a3287820a1190341ae93315491e040f923a290c4..f08a8b03216ab45162369da0d5fafba6888fbf0a 100644 GIT binary patch literal 2320 zcmbtU>rNX-6#mAyT^mElnuLagupuTGldup-X-YyuxTH=Dp#dR56t!zJF-zCG*6x}# zeUmS8FX5(yTN1_?Vl~~{VNi;@`kteEEJjbvqGYprX*DcSe z@`ANzxJJq3bCzX$x@Xvy%W%DDI~8r0dnHFVELYQy549EBTdA8S`4~9sWBpC-w4V;c zT`(M8_H5@31KVOq+%qi0n`O9|YlXEnvO%cl?QPC*u4q_%rCu#@XI&?Jf`?t!%?;f# z#5&xJc{>IHjxSoC2$3#W7I)@N-E}!_KPWnN&8?O6x>nN5JKVIL+v5{=v_0;Uyr=EF z9-q>d)>n&$>&;p2Ywj#_*VQXL>-!^)*|Qv1bw{sqk2|LlCRMn%>SwzrH_}RsA(|T@ z_OfRO6=3LG^YrpJ%X%#&l3KItPMI$mg6gGqn8rjI)5t(eBaO~9&O>47JzLyIb;I1| zP8#EwpoFL|wwo1rnTCq15^gix|6h4w=su46th7r7X6W&^3|m{{R3X#&E~pw2r=lkG zT8&%V47b{py)|JW2g?8SM*?LypUq|+Ub7v)U1>2+y_GABY@{)XsT5tHJEwRAg^@7L zFgxc|>Q!!e>MPq(ABG*T)|#bPhlku@)qbT8xno1FTCKaDO1DQXan+)$A>%GX{>Y5F zWyjt=tLt#D?pUGzjEuC5n=<-ks4_B?Fp6B&DXn+gB<#hB4hzyh)0)GXG#+6-h0n0S zFnCaqT56F-yxE}@($6T=_ra``m2E&KEY*Lk%1qO`I2xP!9|i4dRb+R z(V0f!#%XVYUK@5!obUF+%neZ3I}- z!C{C+_!E?YX+IXpMTx4}CKWwFWa@bgkc9}P(JXA^6e{{72@#)e5F*|ZVwRNYZ3uDh zg*YdL@%I=!Kx}j0cNKY$gd)-JJ!C;3E(kQ)B-*f459 zzf$W?i8~umV}JRz1{>)6f!u*82cK{*&pEn>Y_Zo=$n*D*A4?@V-nj_I5BBb>z zQlU%AMeqrqLe4eEW>mSq)<6f%vor^uTQLliz9zN z$`YO(QgOnQHY;kbz^cvJ$J)`2IP&>50eTXQFR29wi9v+m_0cRIgd|3B3CVu|D`?ti literal 2331 zcmbtU{ZAZ47=GsNV3*@c>G5TO%F2fvU|FcGSliO_snmlaAbM0|_F#G}?(JT7_o($B zA~F7;Nn09;`lE@7|C0F3-XWB`U{W`knRjO2kLP*ccjnK(fB6l-P2`eDVWFFr=mt9ivH%;XNJK)qY&Vgoa5CHv|$TE8G=GXZNgq%XBQaV6KP0?H29`^sJTL z&@Rd)ci#@|yd!5^*9)!C_S`^VAnW-Bb5DkO-?H7nv`&ATD_*!#b{zWXJMUxTS?P5@ z&2}(v`*J(<{AU7UOQ7+t?b_kAKxd{F*4D@-QO|ihQs8pdcI8UBn3w*BMSO~fw{1C_ zmT#+l^)M0c+63IN;D#zhYRPq_Kj&CMAbEU0>zB=-l())e-rC-kj_2Q)n7n1~%YgE} zx%+hDrn$JWnze&)#toiIe^~~BRgi;`KXM#A&vDiAt)dL2|60Pdf(%!qY`14dYKaNN zGb3cLhhC)u0?Bo+>~G6OTT#1O55u@BTM8X`KZO=tPN5C$0$t~eIa{`!9qFgoD7Tp7 z#~MCJp&wI}zgB{w;X{FY|0@v!t*2oh<@Z=of%fRg_RMw3k~sGFl`@ejtJr9jO48jC zxL&8uwHd0CV8XAQ2AcIeM_R5xM`o+mgt}92NQzMg2M2vw^8BcmxtU<&WtK)ZQ@D+f zlDuVfe};3VY8vhdOwag*a#6aW@x=3u2i5Cflur7>7#<3S4eyCD6pRlAMzI`(2CtTp zmxjxGqvO87=)Y!crCo35ysj_9vhP;)XLPjan9$LuqhCh{lgr3OizT>SC%KQ$v|puE zcj_cBg-@`Q#55iX^q;1D$#G=Ca!x2Ne77x2>P^s)Rb@Eiy84o+jCEioiDf+Ei%{cf zoo|Xf^iFZK&>ehj`M!za8jA99`V)(I(EdYwQnb@mIJzdI&K(_5!id-WQ1f%wKU_ zA35J=(mpqR{=n()?M)qT(vbz*H2Aa#mw?>!gDGRb-Zc$>V!M z+2pEh8yG77BZXK*w-TbECd4$A`K}O%GTy1;96v%LcNqDIy+mVLLL#k6bz>_;#9vWmA++uvhz#h7X2qu>8(fX_g9GU4*#pEQEmc_c zDIF!N(q3ykAWUlfid5AVdU>usrKjXUHFELv-1-5Uxz2N~c&v>(K;5xiBGPH&x)9kU z(u@CLGmvXYe@q?1VIDuNi#Nh?gypSo4zYTGmLsewQF;EIVMUb2=VUlGv5%J_n*R*8!-)hgjha%pC-_Mqt> D!bjtr diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class index 4c73e66d3b46168e9cd4faecae01748655eb1eb2..bdb278ec1211349cf4743b0193e1c5818f050e41 100644 GIT binary patch delta 386 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 E2lKW6asU7T diff --git a/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class b/04-SimpleFTP/server/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class deleted file mode 100644 index 1643b20eba08df52b68f59954f689b464b11ac48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2392 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 t@U43mi~0z_CH@oV5q>QZ3-K;JpZzRCw2C* { - try (Selector selector = Selector.open(); - ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { - serverSocketChannel.socket().bind(new InetSocketAddress(port)); - serverSocketChannel.configureBlocking(false); - serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); - - logger.info("Server ({}) is started", this); - - while (shouldRun) { - selector.select(); - - for (SelectionKey key : selector.selectedKeys()) { - try { - if (key.isAcceptable()) { - acceptNewConnection(selector, serverSocketChannel); - } - - if (key.isReadable()) { - readMessage(key); - } - - if (key.isWritable()) { - ((FTPChannelAttachment) key.attachment()).getTransmitter().write(); - } - } catch (InvalidMessageException | InvalidFTPMessageException e) { - logger.error("Server ({}) received an invalid message", this); - key.channel().close(); - } catch (IOException ignored) { - logger.error( + this.serverThread = + new Thread( + () -> { + try (Selector selector = Selector.open(); + ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { + serverSocketChannel.socket().bind(new InetSocketAddress(port)); + serverSocketChannel.configureBlocking(false); + serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); + + logger.info("Server ({}) is started", this); + + while (shouldRun) { + selector.select(); + + for (SelectionKey key : selector.selectedKeys()) { + try { + if (key.isAcceptable()) { + acceptNewConnection(selector, serverSocketChannel); + } + + if (key.isReadable()) { + readMessage(key); + } + + if (key.isWritable()) { + ((FTPChannelAttachment) key.attachment()).getTransmitter().write(); + } + } catch (InvalidMessageException | InvalidFTPMessageException e) { + logger.error("Server ({}) received an invalid message", this); + + key.channel().close(); + } catch (IOException ignored) { + logger.error( "IOException occurred during interaction of Server ({}) with a connection", this); - key.channel().close(); + key.channel().close(); + } } - } - selector.selectedKeys().clear(); + selector.selectedKeys().clear(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + logger.info("Server ({}) is stopped", this); } - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - logger.info("Server ({}) is stopped", this); } - } - ).start(); + ); + } + + public void start() { + shouldRun = true; + serverThread.start(); } - public void stop() { + public void stop() throws InterruptedException { shouldRun = false; + serverThread.join(); } private void acceptNewConnection(final @NotNull Selector selector, From ffd29d01f91c0bb6f1ac84f848d351a7050e080b Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 19:36:07 +0300 Subject: [PATCH 29/69] Change project structure. --- 04-SimpleFTP/.idea/compiler.xml | 2 + 04-SimpleFTP/.idea/gradle.xml | 33 +--- 04-SimpleFTP/.idea/misc.xml | 40 ++++- 04-SimpleFTP/.idea/modules.xml | 27 +-- 04-SimpleFTP/.idea/modules/04-SimpleFTP.iml | 12 ++ .../.idea/modules/04-SimpleFTP_main.iml | 13 ++ .../.idea/modules/04-SimpleFTP_test.iml | 17 ++ 04-SimpleFTP/.idea/modules/console-client.iml | 12 -- .../modules/console-client/console-client.iml | 12 ++ .../console-client_main.iml | 12 +- .../console-client_test.iml | 11 +- .../.idea/modules/integration-tests.iml | 12 -- .../integration-tests/integration-tests.iml | 12 ++ .../integration-tests_main.iml | 26 +++ .../integration-tests_test.iml | 16 +- .../.idea/modules/integration-tests_main.iml | 23 --- 04-SimpleFTP/.idea/modules/messages.iml | 12 -- .../.idea/modules/messages/messages.iml | 12 ++ .../modules/{ => messages}/messages_main.iml | 10 +- .../modules/{ => messages}/messages_test.iml | 10 +- 04-SimpleFTP/.idea/modules/server.iml | 12 -- 04-SimpleFTP/.idea/modules/server/server.iml | 12 ++ .../modules/{ => server}/server_main.iml | 12 +- .../modules/{ => server}/server_test.iml | 11 +- 04-SimpleFTP/.idea/preferred-vcs.xml | 3 +- 04-SimpleFTP/.idea/uiDesigner.xml | 124 ------------- 04-SimpleFTP/.idea/vcs.xml | 9 - 04-SimpleFTP/build.gradle | 14 ++ .../3.1/taskArtifacts/cache.properties | 1 - .../3.1/taskArtifacts/cache.properties.lock | Bin 17 -> 0 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 18697 -> 0 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 19275 -> 0 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 19557 -> 0 bytes 04-SimpleFTP/console-client/build.gradle | 2 + 04-SimpleFTP/console-client/settings.gradle | 2 - .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- 04-SimpleFTP/{console-client => }/gradlew | 0 04-SimpleFTP/{console-client => }/gradlew.bat | 0 .../3.1/taskArtifacts/cache.properties | 1 - .../3.1/taskArtifacts/cache.properties.lock | Bin 17 -> 0 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 18697 -> 0 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 19301 -> 0 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 19570 -> 0 bytes 04-SimpleFTP/integration-tests/build.gradle | 4 + .../gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - 04-SimpleFTP/integration-tests/gradlew | 169 ------------------ 04-SimpleFTP/integration-tests/gradlew.bat | 84 --------- .../integration-tests/settings.gradle | 2 - .../3.1/taskArtifacts/cache.properties | 1 - .../3.1/taskArtifacts/cache.properties.lock | Bin 17 -> 0 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 18697 -> 0 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 19227 -> 0 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 19533 -> 0 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - 04-SimpleFTP/messages/gradlew | 169 ------------------ 04-SimpleFTP/messages/gradlew.bat | 84 --------- 04-SimpleFTP/messages/settings.gradle | 2 - .../3.1/taskArtifacts/cache.properties | 1 - .../3.1/taskArtifacts/cache.properties.lock | Bin 17 -> 0 bytes .../.gradle/3.1/taskArtifacts/fileHashes.bin | Bin 18697 -> 0 bytes .../3.1/taskArtifacts/fileSnapshots.bin | Bin 19211 -> 0 bytes .../3.1/taskArtifacts/taskArtifacts.bin | Bin 19525 -> 0 bytes 04-SimpleFTP/server/build.gradle | 2 + .../server/gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - 04-SimpleFTP/server/gradlew | 169 ------------------ 04-SimpleFTP/server/gradlew.bat | 84 --------- 04-SimpleFTP/server/settings.gradle | 2 - 04-SimpleFTP/settings.gradle | 6 + 72 files changed, 246 insertions(+), 1080 deletions(-) create mode 100644 04-SimpleFTP/.idea/modules/04-SimpleFTP.iml create mode 100644 04-SimpleFTP/.idea/modules/04-SimpleFTP_main.iml create mode 100644 04-SimpleFTP/.idea/modules/04-SimpleFTP_test.iml delete mode 100644 04-SimpleFTP/.idea/modules/console-client.iml create mode 100644 04-SimpleFTP/.idea/modules/console-client/console-client.iml rename 04-SimpleFTP/.idea/modules/{ => console-client}/console-client_main.iml (63%) rename 04-SimpleFTP/.idea/modules/{ => console-client}/console-client_test.iml (64%) delete mode 100644 04-SimpleFTP/.idea/modules/integration-tests.iml create mode 100644 04-SimpleFTP/.idea/modules/integration-tests/integration-tests.iml create mode 100644 04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml rename 04-SimpleFTP/.idea/modules/{ => integration-tests}/integration-tests_test.iml (62%) delete mode 100644 04-SimpleFTP/.idea/modules/integration-tests_main.iml delete mode 100644 04-SimpleFTP/.idea/modules/messages.iml create mode 100644 04-SimpleFTP/.idea/modules/messages/messages.iml rename 04-SimpleFTP/.idea/modules/{ => messages}/messages_main.iml (63%) rename 04-SimpleFTP/.idea/modules/{ => messages}/messages_test.iml (67%) delete mode 100644 04-SimpleFTP/.idea/modules/server.iml create mode 100644 04-SimpleFTP/.idea/modules/server/server.iml rename 04-SimpleFTP/.idea/modules/{ => server}/server_main.iml (74%) rename 04-SimpleFTP/.idea/modules/{ => server}/server_test.iml (73%) delete mode 100644 04-SimpleFTP/.idea/uiDesigner.xml delete mode 100644 04-SimpleFTP/.idea/vcs.xml create mode 100644 04-SimpleFTP/build.gradle delete mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties delete mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock delete mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin delete mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin delete mode 100644 04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/taskArtifacts.bin delete mode 100644 04-SimpleFTP/console-client/settings.gradle rename 04-SimpleFTP/{console-client => }/gradle/wrapper/gradle-wrapper.jar (100%) rename 04-SimpleFTP/{console-client => }/gradle/wrapper/gradle-wrapper.properties (86%) rename 04-SimpleFTP/{console-client => }/gradlew (100%) rename 04-SimpleFTP/{console-client => }/gradlew.bat (100%) delete mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties delete mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties.lock delete mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileHashes.bin delete mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileSnapshots.bin delete mode 100644 04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/taskArtifacts.bin delete mode 100644 04-SimpleFTP/integration-tests/gradle/wrapper/gradle-wrapper.jar delete mode 100644 04-SimpleFTP/integration-tests/gradle/wrapper/gradle-wrapper.properties delete mode 100755 04-SimpleFTP/integration-tests/gradlew delete mode 100644 04-SimpleFTP/integration-tests/gradlew.bat delete mode 100644 04-SimpleFTP/integration-tests/settings.gradle delete mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties delete mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties.lock delete mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin delete mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin delete mode 100644 04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/taskArtifacts.bin delete mode 100644 04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.jar delete mode 100644 04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.properties delete mode 100755 04-SimpleFTP/messages/gradlew delete mode 100644 04-SimpleFTP/messages/gradlew.bat delete mode 100644 04-SimpleFTP/messages/settings.gradle delete mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties delete mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock delete mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin delete mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin delete mode 100644 04-SimpleFTP/server/.gradle/3.1/taskArtifacts/taskArtifacts.bin delete mode 100644 04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.jar delete mode 100644 04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.properties delete mode 100755 04-SimpleFTP/server/gradlew delete mode 100644 04-SimpleFTP/server/gradlew.bat delete mode 100644 04-SimpleFTP/server/settings.gradle create mode 100644 04-SimpleFTP/settings.gradle diff --git a/04-SimpleFTP/.idea/compiler.xml b/04-SimpleFTP/.idea/compiler.xml index a8ab345..370ddc4 100644 --- a/04-SimpleFTP/.idea/compiler.xml +++ b/04-SimpleFTP/.idea/compiler.xml @@ -2,6 +2,8 @@ + + diff --git a/04-SimpleFTP/.idea/gradle.xml b/04-SimpleFTP/.idea/gradle.xml index b86f033..ead5fc3 100644 --- a/04-SimpleFTP/.idea/gradle.xml +++ b/04-SimpleFTP/.idea/gradle.xml @@ -5,43 +5,14 @@ - - - - - - - - - diff --git a/04-SimpleFTP/.idea/misc.xml b/04-SimpleFTP/.idea/misc.xml index d5d79e0..2c55e21 100644 --- a/04-SimpleFTP/.idea/misc.xml +++ b/04-SimpleFTP/.idea/misc.xml @@ -1,6 +1,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules.xml b/04-SimpleFTP/.idea/modules.xml index df1d84c..c0fc09d 100644 --- a/04-SimpleFTP/.idea/modules.xml +++ b/04-SimpleFTP/.idea/modules.xml @@ -2,18 +2,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/04-SimpleFTP.iml b/04-SimpleFTP/.idea/modules/04-SimpleFTP.iml new file mode 100644 index 0000000..58f339a --- /dev/null +++ b/04-SimpleFTP/.idea/modules/04-SimpleFTP.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/04-SimpleFTP_main.iml b/04-SimpleFTP/.idea/modules/04-SimpleFTP_main.iml new file mode 100644 index 0000000..3fe6597 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/04-SimpleFTP_main.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/04-SimpleFTP_test.iml b/04-SimpleFTP/.idea/modules/04-SimpleFTP_test.iml new file mode 100644 index 0000000..49bbaa4 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/04-SimpleFTP_test.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client.iml b/04-SimpleFTP/.idea/modules/console-client.iml deleted file mode 100644 index ae8b15c..0000000 --- a/04-SimpleFTP/.idea/modules/console-client.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client/console-client.iml b/04-SimpleFTP/.idea/modules/console-client/console-client.iml new file mode 100644 index 0000000..90edea0 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/console-client/console-client.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client_main.iml b/04-SimpleFTP/.idea/modules/console-client/console-client_main.iml similarity index 63% rename from 04-SimpleFTP/.idea/modules/console-client_main.iml rename to 04-SimpleFTP/.idea/modules/console-client/console-client_main.iml index d2ce9e1..274eb64 100644 --- a/04-SimpleFTP/.idea/modules/console-client_main.iml +++ b/04-SimpleFTP/.idea/modules/console-client/console-client_main.iml @@ -1,14 +1,15 @@ - + - + - - - + + + + @@ -19,6 +20,5 @@ - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/console-client_test.iml b/04-SimpleFTP/.idea/modules/console-client/console-client_test.iml similarity index 64% rename from 04-SimpleFTP/.idea/modules/console-client_test.iml rename to 04-SimpleFTP/.idea/modules/console-client/console-client_test.iml index 58c1db9..c3cc9fb 100644 --- a/04-SimpleFTP/.idea/modules/console-client_test.iml +++ b/04-SimpleFTP/.idea/modules/console-client/console-client_test.iml @@ -1,15 +1,16 @@ - + - + - - - + + + + diff --git a/04-SimpleFTP/.idea/modules/integration-tests.iml b/04-SimpleFTP/.idea/modules/integration-tests.iml deleted file mode 100644 index ab995aa..0000000 --- a/04-SimpleFTP/.idea/modules/integration-tests.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests.iml b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests.iml new file mode 100644 index 0000000..220cdcc --- /dev/null +++ b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml new file mode 100644 index 0000000..7ce9466 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/integration-tests_test.iml b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml similarity index 62% rename from 04-SimpleFTP/.idea/modules/integration-tests_test.iml rename to 04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml index fd5884e..bb81d2a 100644 --- a/04-SimpleFTP/.idea/modules/integration-tests_test.iml +++ b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml @@ -1,15 +1,18 @@ - + - + - - - + + + + + + @@ -21,9 +24,6 @@ - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/integration-tests_main.iml b/04-SimpleFTP/.idea/modules/integration-tests_main.iml deleted file mode 100644 index 3ab0576..0000000 --- a/04-SimpleFTP/.idea/modules/integration-tests_main.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/messages.iml b/04-SimpleFTP/.idea/modules/messages.iml deleted file mode 100644 index 2287620..0000000 --- a/04-SimpleFTP/.idea/modules/messages.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/messages/messages.iml b/04-SimpleFTP/.idea/modules/messages/messages.iml new file mode 100644 index 0000000..b0bf3ec --- /dev/null +++ b/04-SimpleFTP/.idea/modules/messages/messages.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/messages_main.iml b/04-SimpleFTP/.idea/modules/messages/messages_main.iml similarity index 63% rename from 04-SimpleFTP/.idea/modules/messages_main.iml rename to 04-SimpleFTP/.idea/modules/messages/messages_main.iml index 4565e8d..403fabd 100644 --- a/04-SimpleFTP/.idea/modules/messages_main.iml +++ b/04-SimpleFTP/.idea/modules/messages/messages_main.iml @@ -1,11 +1,11 @@ - + - + - - - + + + diff --git a/04-SimpleFTP/.idea/modules/messages_test.iml b/04-SimpleFTP/.idea/modules/messages/messages_test.iml similarity index 67% rename from 04-SimpleFTP/.idea/modules/messages_test.iml rename to 04-SimpleFTP/.idea/modules/messages/messages_test.iml index ac9d4b5..41dced3 100644 --- a/04-SimpleFTP/.idea/modules/messages_test.iml +++ b/04-SimpleFTP/.idea/modules/messages/messages_test.iml @@ -1,11 +1,11 @@ - + - + - - - + + + diff --git a/04-SimpleFTP/.idea/modules/server.iml b/04-SimpleFTP/.idea/modules/server.iml deleted file mode 100644 index ce95aed..0000000 --- a/04-SimpleFTP/.idea/modules/server.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server/server.iml b/04-SimpleFTP/.idea/modules/server/server.iml new file mode 100644 index 0000000..d2d5ae8 --- /dev/null +++ b/04-SimpleFTP/.idea/modules/server/server.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server_main.iml b/04-SimpleFTP/.idea/modules/server/server_main.iml similarity index 74% rename from 04-SimpleFTP/.idea/modules/server_main.iml rename to 04-SimpleFTP/.idea/modules/server/server_main.iml index 8684ee8..a8bd692 100644 --- a/04-SimpleFTP/.idea/modules/server_main.iml +++ b/04-SimpleFTP/.idea/modules/server/server_main.iml @@ -1,14 +1,15 @@ - + - + - - - + + + + @@ -19,6 +20,5 @@ - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/server_test.iml b/04-SimpleFTP/.idea/modules/server/server_test.iml similarity index 73% rename from 04-SimpleFTP/.idea/modules/server_test.iml rename to 04-SimpleFTP/.idea/modules/server/server_test.iml index 0ee9012..0664a2e 100644 --- a/04-SimpleFTP/.idea/modules/server_test.iml +++ b/04-SimpleFTP/.idea/modules/server/server_test.iml @@ -1,15 +1,16 @@ - + - + - - - + + + + diff --git a/04-SimpleFTP/.idea/preferred-vcs.xml b/04-SimpleFTP/.idea/preferred-vcs.xml index 8031127..848cfc4 100644 --- a/04-SimpleFTP/.idea/preferred-vcs.xml +++ b/04-SimpleFTP/.idea/preferred-vcs.xml @@ -1,7 +1,6 @@ - Git - + ApexVCS \ No newline at end of file diff --git a/04-SimpleFTP/.idea/uiDesigner.xml b/04-SimpleFTP/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/04-SimpleFTP/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/.idea/vcs.xml b/04-SimpleFTP/.idea/vcs.xml deleted file mode 100644 index 93c3196..0000000 --- a/04-SimpleFTP/.idea/vcs.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/04-SimpleFTP/build.gradle b/04-SimpleFTP/build.gradle new file mode 100644 index 0000000..d590e0b --- /dev/null +++ b/04-SimpleFTP/build.gradle @@ -0,0 +1,14 @@ +group 'ru.spbau.bachelor2015.veselov.hw04' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' +} diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties deleted file mode 100644 index 36987ec..0000000 --- a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sun Apr 23 15:16:20 MSK 2017 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/cache.properties.lock deleted file mode 100644 index 9e16b9537600c6964fd3ff68e0620bcfd5ac6696..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZQxVCK5+#ML8*7$86p06QE70RR91 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileHashes.bin deleted file mode 100644 index fa34da5a2df9f7616aded33dbe87b1f937901422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18697 zcmeI%F-Sr|9LMo1f<&XI22k< zwFE6eLW_>l5V+YEL^jz_G}JxbJLKWm7T<%r_vd%~hWo5sch~0RM%hRh5LrEcg19Iq_ilsKwUxku! zJ>O9O50>7%i_Uy$&&)4X9t^D5M`rFm%{-v;{q21DBY1vh=DR9aUzx{@J5B@;KmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#~E zi-2F2-ExoXTRY0$3~n42)*Kh3@$XEyDn!qEu~Hk8mvY&jk%;wIN=*8%f8zyV-w|Yh)5d-$6^WHk>KF@e99= BcHRI0 diff --git a/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/console-client/.gradle/3.1/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index bf62d02ff55ee86cf560a6ac3b49940adde78e17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19275 zcmeI%Pe>GD7{~FMeUYFQn@b=aymS!3_1!3_P9jG5=d!R#bTLMoY;6CGv(pYir$rF| zV2~y#5fmMQIuvv%tSIo}!8C%5XuAc09jaR%@_m^dyvCN7_zpa?@BU`?<#|4{w>f1P z&DQVQVeB3UcbBXXKmY**5I_I{1Q0*~0R#|0009ILKmY**5J2F65g1T|?2m?NZcpgN zfzUA0jcU}9;Ya6KE$@nRQ+8(> zUM{ypdGFIW&$NoEtG`}-kMh2yIFCP7J{eu(i~s@%Ab$-&b@t=?6`9(Eo;5sEW*QJ!$=^&z@Zh|6+AQXx^2pu{JwN5&9anVHwK?Hs02XS(Th6xTm@%cR#82=G5dE6$9L6bSX76ac_F&nkQV33B{T8rx)ht zlAmv!*>qX{jPj>$zWG|*@NNF-{GEq8pTFu(KXyggC<|J$nL#~nC@RlMqamoL_c2Zd z&q9V-uAqvQBC**k7r$iQcicL<`0_(z;lQCt?7>j#_1W$5XNlYF)A+k>6FTAO3$x-@ znaS(aF{M|eHFJ#CshQlD$nmOYvw_iJ({df@+ALw&oH@!2l4uyZ%(s!XhMUdIo4X~# zLY7@-*Sd9M@sDSvyXUue{q+);O7LP$ao5QU`_V_TPLWhaDNi0WP02)^TTF(1(k(Mv zBV<@@pRqSlPhN-IfLE&lWCgi*zU49P@n>uA9>(r{P zi=HB}!z2BfW7$GJmmMh#4js>~NWtGRD62DUk)NSl@zUtH7v{NtRe5Gw-2C9ylzx|Q nd-}+UDJrZAud}}c6n^`!Y_0}J;v^GN|1JW(cHLurzIuNEa2}5b diff --git a/04-SimpleFTP/console-client/build.gradle b/04-SimpleFTP/console-client/build.gradle index 28d0f71..e617f8c 100644 --- a/04-SimpleFTP/console-client/build.gradle +++ b/04-SimpleFTP/console-client/build.gradle @@ -10,6 +10,8 @@ repositories { } dependencies { + compile project(":messages") + compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' compile group: 'org.jetbrains', name: 'annotations', version: '15.0' diff --git a/04-SimpleFTP/console-client/settings.gradle b/04-SimpleFTP/console-client/settings.gradle deleted file mode 100644 index e8681bf..0000000 --- a/04-SimpleFTP/console-client/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'console-client' - diff --git a/04-SimpleFTP/console-client/gradle/wrapper/gradle-wrapper.jar b/04-SimpleFTP/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 04-SimpleFTP/console-client/gradle/wrapper/gradle-wrapper.jar rename to 04-SimpleFTP/gradle/wrapper/gradle-wrapper.jar diff --git a/04-SimpleFTP/console-client/gradle/wrapper/gradle-wrapper.properties b/04-SimpleFTP/gradle/wrapper/gradle-wrapper.properties similarity index 86% rename from 04-SimpleFTP/console-client/gradle/wrapper/gradle-wrapper.properties rename to 04-SimpleFTP/gradle/wrapper/gradle-wrapper.properties index 8ada6b0..884f310 100644 --- a/04-SimpleFTP/console-client/gradle/wrapper/gradle-wrapper.properties +++ b/04-SimpleFTP/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sun Apr 23 15:16:20 MSK 2017 +#Sun Apr 23 19:22:48 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/04-SimpleFTP/console-client/gradlew b/04-SimpleFTP/gradlew similarity index 100% rename from 04-SimpleFTP/console-client/gradlew rename to 04-SimpleFTP/gradlew diff --git a/04-SimpleFTP/console-client/gradlew.bat b/04-SimpleFTP/gradlew.bat similarity index 100% rename from 04-SimpleFTP/console-client/gradlew.bat rename to 04-SimpleFTP/gradlew.bat diff --git a/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties deleted file mode 100644 index 8c5329d..0000000 --- a/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sun Apr 23 18:03:21 MSK 2017 diff --git a/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/cache.properties.lock deleted file mode 100644 index e7725c70101ec7dbe6cd540bd5a3a9acce0a296e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZQpF#WqHM=HRX0RjX8D0>4u diff --git a/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/fileHashes.bin deleted file mode 100644 index 2651b9665eeb4e7de53369e2436044d4fcab4b9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18697 zcmeI%&npCB9LMo5ZIRt}=YY1oZ4TPf+H!K-NQ9^LeQ>Y3-;XZkcfuj>qpM2#PBNn>?2MkWLhKmY** z5I_I{1Q0*~0R#|0009ILKmY**5cn?wlj7h_>)_t8x z>;DG}xz+MrCI0T^%Q|1Y>9;4sW1C)ntn-4o^Yt2t+eB0 zK$R0}$DM6#TNmNk((X*~D7Nx#=Bgqs*@LO`6ZZ@459&<%8`aCVv+=>{9{bd)f=Hp; z#EDFqFm{oN;N1y36lKU511$)~gD3IVAK*cshcxUe)LzCr@NJ)b(>(otUgVbZhS6*N zX&=V!ad>yh3IPNVKmY**5I_I{1Q0*~0R#|0009ILKmY**_KLt|734r1ruS4zFAi1> zBj2MI`xY|~HU=8CTk++Qq2&F+<11_5`WuD$xIgwH={L_U{5rAu`gq(QznJuoWURiU zt-+nRKl&!=&%O%|?Z}hU?friy{p4Hq@5R^nL;wK<5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|00D*rIIIVuPs_Ka@VQ!fAbh+r* zZbg>tz?+n_c0pF8oj;SEaEsoIGkocS?Uq7k%9o*AE@eX}2m@Q4-JEf%xk(wCssFHv zu;%J7GdJ!&yp~?=3xC(HH%&F)Gd=9Ks<*m?+3I9iyXs5NbNu$~+4gC!Abk~~TU!gO z`ReQQ@v~QtMQiny;^*7zI@o(1EK>DBmoTGl1oQl|iW|C4pz?M3AA~jXsZh)r!;iM2 zkE6@=%_$x8i;lUZ>b@>vu6OdRsSq9AFRW_%$6&O7vC*nkmhyMLTYAK&dc?FUp(~|Z GhV>U*$!7Tg diff --git a/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/taskArtifacts.bin b/04-SimpleFTP/integration-tests/.gradle/3.1/taskArtifacts/taskArtifacts.bin deleted file mode 100644 index a2830613df6fb311246214ffed95c3e6c85d800e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19570 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 \(.*\)$'` - 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/integration-tests/gradlew.bat b/04-SimpleFTP/integration-tests/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/04-SimpleFTP/integration-tests/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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/04-SimpleFTP/integration-tests/settings.gradle b/04-SimpleFTP/integration-tests/settings.gradle deleted file mode 100644 index b9934d8..0000000 --- a/04-SimpleFTP/integration-tests/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'integration-tests' - diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties deleted file mode 100644 index 9d91289..0000000 --- a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sun Apr 23 15:31:19 MSK 2017 diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/cache.properties.lock deleted file mode 100644 index 83fece06f6684f114575fd235c1b83cad9eac4f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZQ>IXz+Jk4efF3=kj)06HrKf&c&j diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileHashes.bin deleted file mode 100644 index dd2baac1fe0d70d8ce686449baddeb4cec60802a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18697 zcmeI%KS%;$9LDjt2$Gb#!9d(X8Uz!g$)yMyqCcZZ1hq7@I7Fe)9}Ec^By;E*1eeGm ziX>VZ3R;99D2Tuyuq6uVYG`e+_qcnJ!?7*CFTD5uc#enT{j4`8gimYOOEgz+b7VpQ z0R#|0009ILKmY**5I_I{1Q0*~0R#|00D=D^5R(__vM%EbwVOjvN{EO@4juUsqkK9& zxM#f{FRA|r4~_TGz|KU!osX(~@x%3fAIKH$d|Bmd7bU&CaFn+5s>;q8l3_BZ@%lgS=G#;oO zXAcrD>sQXk-F0ij^ELeZI^~VsB#iU0z8QBm#9M14<^BxTI`v#NlPpBG49(f_u9}Ts Dm6v-O diff --git a/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/messages/.gradle/3.1/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index 996f84fa62e84eb874c9b025961a94ba27edb4bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19227 zcmeI%Pe>GD7{~FMeG#J-8>m3K?kUiH7qUYggdildLr@}Jl2;nm6{j6$)*TWLB7v4v zdvH6{r6Ri2MGTR!z0^WT1RWy!gFy%)SjR3N?0uOXyr$?Sz5~DAcb?gKd7jVCZO&R& zo3qt8tnK6I_L3C>2q1s}0tg_000IagfB*srAb-XA>t^Qv>UX{;XC&wWkmk1DmioNW){de7se{w#C& zKymrTdR*^qPU`v7TgC6Ssl~=VXOepIt?ReqYkVSr00IagfB*srAb=xZRg8O3w{Lm3Kp#57f00H_8sGlAYT1t-`rCGuJvW zb^l8G>9Nx05l?`_mqd;Ri)MT&duOdYb*&SU4@eyS}YnIMVmd+nCQ* zC;H7$AI(taftfH7_RF3BHIZ(4H@68VO8+{((pfoT@doNOTkP0>?wH7tCX{z85E-y!NHGdv=m&7V{ z(V@_46(=3K2!f)xD5yAf6*^c83gYUbATELqde4_f(m|{uDDr)fyvyDD-Tm(KyEi3H zNF@BVagpY=q1i+W0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_0D=ESAgwpD%G*q2 zXPettQzsZN{vF;Jz99es2tWV=5P$##AOHafKmY;| zfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|_!k6v2nhuV z34U=ufksB5=`2-tA!Q5hsE6yZihf>XbDu*UQ(F&=&N!mtFrhe;ZujO3 zAF4Bxn_^S)dz9Ptcs4nBZTr2K&*r=D+%)#Tx?d4_GcRba$V}>RQ&D+Znsq@PJ&$?9 zyJzCet_Z4FE)afl>D;II+s^BQFXrCWpYJ^w2;WZjE}YsDd1~BXAID#JU(^YQ76VqH zQeqab(Xu6-EUj8&v_`GyZX?A@PLcJG3|S>6CCxKwdFxw^RU1DIKZ)j^=KtWVTJF)W z=U6v&6(0OXoLk2BD>*Ke;MuC;m2z4X@4hE16zMG}<;Z=OC7Gykn@PVOx-?d6gb!u( zn7fQDFPmq%bG7w>7?sSO^SmI&a_YKmh^m4cVz=> diff --git a/04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.jar b/04-SimpleFTP/messages/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 6ffa237849ef3607e39c3b334a92a65367962071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52928 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 \(.*\)$'` - 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/messages/gradlew.bat b/04-SimpleFTP/messages/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/04-SimpleFTP/messages/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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/04-SimpleFTP/messages/settings.gradle b/04-SimpleFTP/messages/settings.gradle deleted file mode 100644 index 5ccb43e..0000000 --- a/04-SimpleFTP/messages/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'messages' - diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties deleted file mode 100644 index 6598b2f..0000000 --- a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties +++ /dev/null @@ -1 +0,0 @@ -#Sun Apr 23 15:16:19 MSK 2017 diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/cache.properties.lock deleted file mode 100644 index 27a1895aa990382b74be8430d27bcd6ec004786a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZSHQDG2r*P6?d0RjX8DVqZ{ diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileHashes.bin deleted file mode 100644 index bb3f1ae0c54ae42bfb00e394216f94f0d69f7d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18697 zcmeI%KS%;$9LDjt2#T&hHxx)y(GbE>T2oULK|$jY5rJ)igF`6_(j-EIP!Lq)P#`r# zE-uHeyFVFCP)>{<9r~kQ2G}mx*WI_M| z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~f&U_~Dj(A8JjQ2q+QVQ%h(Mnly7Ei?QSDSO zIM>T%_5a{4ICW>9OnkffrOKzT-s`1U&T#X2mB-KP*6ZWKt(!+xuD&wgcJ4S4KmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 zpdEo3S@z34W^erjZ#_RFbwHju9A-o{YUZZrVG CV|b(h diff --git a/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/04-SimpleFTP/server/.gradle/3.1/taskArtifacts/fileSnapshots.bin deleted file mode 100644 index 155aebb21c1d93ddc20f2a65b9195b7e3665df1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19211 zcmeI%K}Zx)9LMpQeMHbo%_WfN)+tcmhF&^}q+xXlw}>ulBTl-Do5Sq7b6JHJLBw!T zFesu!bW4bq>JW)t6b}l5VB%o|AxKzH9Xxo@_m~~Mx}q2P4*YiC{AcI!|9^IF({32` z)_(Ocj*hEGOI8RVfB*srAbf6q!Cm7soqH>@`sg{8%@y>HceDy-jmw|Tv| zE$4#zy*FXKV{vxl@9@@Eb^rCS9)7F(cyNtR1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5IBxNv-;61l~EmGewY1&X-6h= z_6wPDd+Z^ZvU9eKwKT?)X?MW6`{<#}I9|^2WS?jE4mf^OkDWCmC%jQu#fdMMyT@KX zjefkA-76#(Ox4GfZt90hNk^E=X02UG-?Lr!u*t^iX;aGfRIjJHpRg8wZqGir{p3dZ z)5M4LpZuI2VP220r1DEgm}{ptg6j>c!Lmswqb50vZH47czfUJu|39y^#&0zw;$QVZ zD|#UPkmPlQS*rCf@m0IE-y|$Qx^uI9ac1&&A@?>mTCsF9vH6coY1K?;I6x@a8*M;Bdmuvm)T>&qkQAhsYV@_q2~j=T4}``zbvZ%Uky zNcczVBJFEeyNMPAAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0{@G^wAsjZZ!?ht zU2bDXgOFISX#`@6~5vMQL=oGG_^e(36l zX6E}uQ>{n2U26|?var&ePwnq}Jn$wv{-i1kRzcEyiCI)|OH*}0Sq({rna4WgJ+pD< zR3+6c9|%9cKKCvDv3GI&-OEpnw}+1g!Vgo!%jX9oOVK;*%k2C9D<>8n&xFuVq=*}TQON@()Jc_SY~^#16vKVTbZ_IiTa5fm#15utFipY zmT#BAEnm;AJXc!sTut+8Wm=XVeJ0y987^uq)De3ff;&w4bucBdJ0q08yFu$Up-tr(?{IU2J5%~yzQNJsCl{!6ioDML b4v@e4uWW93NB=aF%A5;NFKB9Pz8~@vnNWlM diff --git a/04-SimpleFTP/server/build.gradle b/04-SimpleFTP/server/build.gradle index 28d0f71..e617f8c 100644 --- a/04-SimpleFTP/server/build.gradle +++ b/04-SimpleFTP/server/build.gradle @@ -10,6 +10,8 @@ repositories { } dependencies { + compile project(":messages") + compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' compile group: 'org.jetbrains', name: 'annotations', version: '15.0' diff --git a/04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.jar b/04-SimpleFTP/server/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 6ffa237849ef3607e39c3b334a92a65367962071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52928 zcmagGb95)swk{ew9kXNGwr$(C^NZ85ZQHifv2EM7)3?vv`<-+5e*3;xW6Y}hW3I6< zCcd@iSEV2g3I+oN1O)|jZN@AK^!Eb!uiM`X`me}}stD3b%8Ai~0xA59VoR-HEdO5x zmA``ee=5of%1MfeDyz`Riap3qPRK~p(#^q3(^5@O&NM19EHdvN-A~evN>0g6QA^SQ z!<>hhq#PD$QMO@_mK+utjrKQVUtrxk-8ljOA06)g+sMHFc4+Tp{x5_2cOBS&>X1WSG!pV|VNad#DJM1TXs(`9L%opN1UGD9Zg1&fIj6|1q{So)3U-a4CWoQ*xDe5m z9`W<5i~8J4RP+_u%df<<9!9wKqF2xU;C4v(Y!-T*OjUIq^ zrN#C6w^bh64qit6YXA;^mssTgXO7Aq&Mv053QqQa7t6)c)cNllz(dg0#lqCi#nRZ& z#op;3i%_g=YmY35=!;GfIx@FkZcv@PzU--T6k$JSfDIiT4$UZAAuGdgYY1vy<8ERf ze_#6;Y0Gj4`C1s&D3DA5jB+zDeaZ7M$-~|Ga&WS812hh>B8m=xh6M+;rrcz!kBLTQ zQ`T6%#zoO?vnKj6^1J1i7u*WNSiW`iNs=miGfCi*Dt^VFDLpvE&ns6(aHeC z3qt$jqc5sVSqlbZ75*bJsob;aDw2{15z$SP{#8W_RMN^WRTA9t1p#8i@dE|&pob=c z>4dH1_G9oyVwbRrJN+fN?`US`1FRZminh>|a=RWyrg0hu1l&)#`tM(Uhjs)>+`Q#R zyL_M$JmrSVd^<}^2Z=lmXzpB8b#R7CX6&K$>&L2@1r+F zgz!9d3IWpYw~%eSRwg3?YyHAJ^SF3F0sVC!egmeXUuvAdRnu8O!fpbO9W`cf>gOAno#99T}(kXhV=q)pdA2M=qnp%m01S6(e)rKH8I>ea*Ki-hqr4*x& zdI`U`<+68^vOuMe#HwA3# z8s`VAKDK^XtT>34)+UF(wn+a!!Q{XE_T*B-x#F+2ZTuCY|7>-V|Bq|^!=^-|`~Er> zT*#lvvtv}GE*QNhqr0w37*IilN4-`iHYx6N7rsnL{NJI-+{su_W2v8S58hk&K zSF4XUH^2Qr|8=Hd<(^wQfBj4GuYb}0=b4KC?|`N1Z0aOoZ)+-JZ*T4D@Q+DHD{ISR z3!;9D#p^CVDOFK4w^(U|X|HKrsV)poRD`QQ5kSkE1Vh)*b((0}e5!YoSXs@F@I8vN z@(w6bj|O&*wNJVCI3G_=-thDLf@t(t1Sn390Sb00b0otkp$zoIbY8;|#p($5+5_T% zx)D7U#gr^$`=z0!;S#mqpWg+k^w-B~?28}g1?6T^+!k_OLLAOlIapaH>MFISon<>a z#u>JvsZATsqH?A%q`f@j4J{Vxf94o^fe%Y~;p-IZp4PQ3J;GyY z>%3S5j62F@xLWzNts|LZMw5TiX2i7EYGpCpYpq$i7awMoXdfH>B3zGTrc6*3VGz{e z^JtI^J46yB=~AkXLW6iRg9rALy}hn40|cU>y&#&Uo#uRqEi_SWnnLL=R01O17i&`< zVJiW#2yhSXIFPQly%O)YX{p^Y3fEP8ci004$zE71gxEJxgy_9Kq{!WNV*q-BY{$6M zHXo@Fi>Vq0n(gogULZ$-oP$uz>k+TTVVbRXMNizXun5Zpv>{B({=_YDKhy*EPXfYp z4&j7E)Hw;}c~Dpk1AXl{iZKIfju=Q1ReXO+9unMs7QE&}c`cJimI0sCQ~K+#0MB57 z_%eu|pup5PF5&)H2+g#WU?LGXBDF9#xLC<)f{^x$eq?kCvS-qT^WK_NN^Ngtbtp9Y zydcQ(Z_dSA#BgUgzfhXze!ELjA*T{mx95Lz$XYnLX9fr$pyt0>l=(lKsVKnM#?{%< z%~Z_N##GSQ*woos*3iz--1MJOKUrG5-<=bH#0oRL^=1%Gr~b!v`u%NysCSn&s(bp|(V<9HJ=ETn z>>!)L{ri-i58563tM8*7{92&ZhzCa-0d>;lLTy@kt5pnfFkWoWgRp#Q-RDYWeefS; zUwH+Ol}B+}KPr#HLQ1I|RB&U5>fz)^42=YYdq9FY)To}5;~a5D46?*R_Ujx9KnA38 zb$`WEaX1`c4l%3VDlG0=Q&@6P*3qmauQ^u{XKuJwnfr;0Kj#VPUI%&1%dC|!r=8#N zPGH%fl})$F&9US5&NN9Y<;}N>6=~mdM}iPhD=?q0yDi@pyU#bFF)o{Nrt}IEWK5c6 zzJn2AwF>mDXB~}p7smsiJ!OEls620WS-zy_6kjV3hVh#yN>iP929^uX(5y1C9;X); z&P!i$CAUh8UKCx{*{tQvOc>QKxJ(M3Az4hqL4jP2%_2<5QuZw0s@>CaC%b2Rk3AF} zlrojrQb$(HHg;WOa}Yl8C0n|zJ#6^Aw`Hc;u=CT*B06!YWZ^U6imwm-2HCDfDpIfGUOBbO1wO(mK_{!Y4>8Z9!1X zQyVEgfAV@Wd+i{tl*R~I)R{zqq&Ra1*yEbsIR|(_w~ue@6^*8wpeI+(kTX}#2rNxH zt(&jLNMuAEH2oO>tJJltAVu9V!=pFfSbt2hn)4v}H!oJJ2?pHAQ*;-(tUh*ONkpk) zS`Fzz+XYrdf7HRC=_!Dg#YJpD6SwvN{uj5Mng)m|o{u+*y(K_Eq@GHedFjV0YU?*;bj@9esA2Fa{2OTuko-eAN_~0mv4x94|1j5 zj~F|^e2SUk)Ghc!5JTXvKr!DY_FMOS9O%v9PQtqQR;EG4(h|rSS1W%ooPg-|bZc1q zuS3ccy$x@q0*@yI3TwMp;G-Szer=F?s1>oAi#%U`D+@Bw2&9NTyzhJh4oYSs4oYED zo}I{#QBh`7(9h^Hh`|;~k#}}k01Cf-xLu3ZQ#*y1Q6AT@ zHo1f2-zgpMk!`%VvLfUT;#?_VvIIyD`hQpj_f*3vFd~w2+k=+$^>bA`wak9n<%t$M zfmokkA9^g{AZF4VR||0E5cENzA}i-5-r8YG4ED;Z(@rb9vR2O+E!Hx<`|V~ZAXT9^ zTR~E**uY)OTA635woEfA8=S8&{-nZ>Wm*zX2TrU7HybySv)Pw6Vu{MD1bnCKqY+N zsRxZEkiz#R?r>9Ekc+rrPQa4l6O#%`aviL$Xbl{ixfxZ-$3NCXM}3zsv+Icx`&ElH z<|FPD6t#p33)_=p=KocMNAQKH|D)kF7L0Bwu{6XhWe-Z)2f=9^!3Bcs=@}ob>iL3H@JilKMZkX~On)W|rozPKGX)_ICfoNr|@dD1wM1e>P5*1Nj2{3kry? z2($8bnV}I>8CBuXB)o-d98!pnVm5VI@02Zx81I7de{GJlRjBHRiG{lw>WXed%Tn1P#gGR(bfHrLSS*7K=Hre|cbm z99yux$h=V>NE!lYZkdYHaD6Gyv0sgOYVlfZ=z1}$MA^Q&PS3VoXnfNoLFxN-#k`1J zv%PNoG#C>AeB7OxM+=P(5Zp^Wmgi?^z$(m{P1b zw?I{TKv(lOUSxz;{CTbr6Yoqg7g<9pZ#CZ|_T5p6QNfqv7oWc26-l;eD+?1|xbpN` zhRwY3RcYSU{KkeygPYUSx1+0NJ@3?>dOyCdjAnO*4;*EN%km}sroLlEjayOJFPV%E z0frad=6K50Pp;w8-xs@>U58}={tg9F3cCwO9eTaWr-#x zdFVk~?k9eHu~wIam=&35zVE1mvQK&*b7$xC4wmkmq?49SFg4}S@32Tpb}Iq9Gwy)P zj!NK&WugSlBzS=K_pL|_yBh)O55woawp3gZ98)1!do_gQIDvCf`VFWOB0-{5ToqhH z9$0%J#Mn4NtmH!xf`p>K45gqF)2K74gerVOf?$ed<2+;$iGY<}0 zljI=88SiG1&@O5Y(pI9EAZ?;TB|!rrg(}uNC(I%X4RPKdlLWSZde_p&F+UHq|1r%m zy_m`{8s+mMUcMtobhtcj((t@)?c;UT+}pe&_x=76%MaWYX76)4R1`pof6j0=;3`9% zcGpK7ZU2^Mpe9G8)S16)3+@ba>|@bigrUeuCs9u^B#W;?BMGQNngEm{QEMdcr)(aU zU|92Q4tFYbkq>4N~*_cZ9#!_myn30TMp4L6e1>bjT|g6)PDSM^5zs@?EhE4pnY%E&BpV}@kw6zV!k zhw>R32R=oSwMIS`ad9Xl%tDoMkW5@DOKU2NUdlK!vNEYeMw(plDsY^s4)W7*-?yy{#8?|q9xWM*xU#HS^kRq|tWH{s?Zow#+_{JZtrWV}*6xH6eZxx@i6cuNEv4!9=TOMd0*@DF;i69S6V5PMoNmd_$s&M#N^0W3 zF&7ylage1Kqr7ny5>}mG^er2Ww|XN~X#j4JB>^G`YZC<{O}X{umdi}<@2AV}wCmA> z)NMe<;edu&T&-;V*;=IOZNf-i^*U7^NwbW~jv-WQI{vsazo)4d6^c3kooP$WVuA5v!&X>0vnC7s7{lI%{$_gwC`zfkW}|Jqq~X z1IG+LlYeTYC;kX*)>7Y0Z5#sV5vi6C4!HQtF5lpdhXlW=&-SUfzY;AFgTG)5JZ3+G zq7F?@V5Y=wtMFp=)c`AdTHuE`AOsJ;Us(9-lQ4-@>{%>S+{t2hr4`b3lNPP_V+_x; zFjQgX$DGJxdCM`57G?o!XiL0L6F=5;{sB-n$Xq;V7CIp4LZt(2c+1!Qhxz&^rwf1o z?c8BIj^{A1FG6$fEa&0Np|1HE?{7{FwU=*BOiwtBw^Q-Ba7af^{&&U@N0xbF1bk8M zBTazgkEz4@WVrV+eSFP}6Z5bpFwPjopX9WL$c+(5t4(|ag$P(rkl%)H;I+HzQOA-x zMooM!$Y_UjhL4Eu>FdHSC~M-Lwp|gaw@j2v4uRC-XQa(dF^-S><~n`WG{N{g&MOSk z42m>zeeQqpw>PkU>9d%g*Mt7Q#!^Z(u`1}A>l&nuvg z^rntb)iMq{$fTiU!-%Sf*fWxam_Q@pLz|I(R3~NDNL%KkM*oTM3&tKA#Qy~SEQ~s7 zfk)P8jLXS!zTwP$pz{0veuv*hluwk{H3La?p#HT{My41@BcdC|Ewq{JKp+@DYY-M& z3gM2m3O%sSJixSh0#|=7d6lMT>-8I}L3d!kwse5ceY@NzQI4&%r6gmd!WfF1BdWc0 zI4FOy8CQ1>*VVx3sIV|bY*VqLrN+5*2$9t`J73`{ryO5pNQGAStUbo?j5b~Y`+iJh zsT+>^hf1!$CTPg8k@ts+tEV^5QOdA(b8sX^PAi2R$ugO7h>-@4Fmuw{S&-5Jin{CI zBUe%%wQcG8k0UfU3pnH(-`ex|`yrEi-bA~M)mI3@8yT0+dxUTySyg4hU(5`|&n zLOkgE&_~eOOasGzKJDMlbqYaRr>VoOY9i|CUtjoSb@+;4y`&Vudr=0|w&!7Vw7}Fu z7bU*4jMuj%G)ji@beeL}_V`E0IA`v=!c!o5WECv4SA_@-df?JD-?)i#<3B?z zd_q>4+Q6Vq=WFTw8=W0ec7-;Iw~2CE#I+Ws0kmDI^KkQ4 zT*33K6h&C`(!pG4-J7@j&wqgb)g+BxEvZlcLP_i&KtN>w*(4PVT`UBholR|x{yWho ztG(&}TtWInC!wWTWlLksZ6IMPgF*;gu{CTfyPrbcf(({KJtQZD-h_S;mfX@Mg*@gZ&}ty zqJ)!bMihRFMI}%Uz+>g8D<)mZYHCnPF%BAx%4rs16x5lz87b_IyNQNmQrQhT;Ak`2 zO!%GL)>H7|4UpfCVe$oIh`u*P%#41nVagpiGkNO`*`n!(?ME__+$y2!BOlRE+@di) zs>b)A53QJfi=pmB?Q1i7|J*@3p%=f~qUa$f*H^pqLE~3&u<2;3!626%X`X71uuh=? z*II6X^C~Fgj@hH&aP{!Daq_fswKTNyeHyp1vvM_bsCIW0OJ}*q$)x_fsSa87UHjv2xA8==^&Ploq2ecjJRS&J9MNqzN=EIY4<9`W4POXQ z8Gv+D9HPc1yA_6Cxorw5WvC>KwA4H7PGS9oa%bUz%vSHf8UhT_9K&l5#EPDfzfxk2 zS-hrKiQPHF_adI9wiWJva@RW4-%+FWE;9sbZl7-+5>xpW?zO&VN9^gnO_>f)2`xKC2jsm+Qbg_723Uyq-Jz$e%`U8F*J{+XTVB33x)-QW9;2v@$=cL0 zpp>ZAv_bc>hz&khMy2)d+`7ZN-(`eUh?)N2(h#{~XI~iSV-k z=pr*j=q~4&d>aK6Co^P=40&!-Z4spnYAZ_QMjM!|*kN9DAtCfmO^gkU^&MOBY%eYi zcVk~jwN#y(9dXts5buwVQ)BvSyK_-co+;Q_61D}JXJXsI3Qv4z8^+!LoYnezD2cn8w9<`xRZ$_yz_YpR?OqtKg)7tx=>jeL=?? zl(;esZbE_&6h_kcJsob+V%nfo{SGiTcO0PGN=TiH><*0OIvD$@-MBJj66qi@Mp)Y5 z)@z+3W2XI)jE9dJawjB8&n5f(*?^1N)sY)uJHpE5qjz$N+<0P#4`hO6{;KMdqi=9^ zI!xRK1b%Z;0WVp@UuT}ZAL|q6l;mX-iGzP|-kpUuy{7^{UYT=F8pAj(fG-3<#4jj% zlX_(s=7{`t_xtz3BI;HerbMy6u=c<>Qa=cPu~3i))K^Y%Vvn1FB*`yQ0x|}y)lYif z@+|w(dDW&B#PQ+~E2x>GkOfu|x)8Vgno<2Z>>pP|ElR?W>RM=_2jUzqp&TlXO(D~f zdmkMm&u7CgXP)y42MQ(_BkD?9d)E^1y4+6=o``#CCKQ1jQeyIiva`ag{dE}YX!tI? zO&e)Myj5tvxq4=F>wt5zX1cf(<+@iOT>@5=qI+m1#FFd*K!Q?GhIbYS)3{DB2SQO; zU3UZuYgU$}$bKOHbKeaM=`9Y5`}RP}z3pN>Jb(jLKI1;2Y!CR5$Hw*^0(|@CHY*D! zJhvkh(#d6&ms!M~x09nAnW$hJ`<)B20^mU28aXKS3CFzjC&c^>PWijWXEWLnM;y}l z+N9y*?2X0;w&#WM8_JV0H1<{m@-2M?q&};-D~yyrBcAIWiN@=6=rh0!1UTd+w6Ee@Jss#K;!zOwa;r2{Jk&Te4kvj;gtePY=$#4Cq4KNoWPT z2gNnW_2x{j)jzzpEri}#E}pPFeNs3zOkGdCYOYLh&q$U7;Htb%9wzftaP`I1a68BU z{96f_W4mSR=iid}B_$9L!GF$`l6KB6hBh|;IBm(+g!M)}YUU^JTw9|VphoN;w-zDt z2xZ4cgqMt4MU1;;AUHR1Pl&oCzMf7Hsn&{=TIx~Io>QxeHKJ8jl$@nlweo3s&TnpR zUQ)BRzqsn|etF*B_@H|6Gjn6lG(p^_@BK16_R2c>lXc^*ulMz_ARcZ(=!clcH=R06 z9!(UjpAi7U0&F=vR*Id+gjahDhH#fT15WW9#ndK&B@t9-RJkY}dzUB&J&(IhBjXGP z5|ky`eDpINX6F9k5@^Oyc5eaH1$zem7K=yTQ>utldG8H4W8eT(XWSIH;=t*xDy~E+ zqry>ViWP?b_CY8ZV=QV2IAcb-$gey%be>d(D*Zp>Yg6qoj&K6sk9fw~RuQruex zsy@2&-6oltnpXh_z}l<65(RIV%(nnlpIiZ3?M0$(Bju^>ZS<$UzA3%6$z)IkKLIs6 zcJ}83*`B!Zhkn_-whJF#(d^Q(iB?X0bt&f{A(2%$&xNm69N&C1y& z4JU+C2D?*kqU717|2)ytoF$LY!`iKUwR-E)+UBF>YuDPdP78pKwmxTLx9@1mFLzxS zE?LTCXRWqxcM;wyX_g6|O1V-Aa%i}DmP zFHy|Aq;k1cPgZ-5*Bn$eJn9 zL2tr-6!tSn%UL~o6ov^Pih@}(plD)+%H*v#*f4h<{VV~uiL%p7QF&#)MTQVAhpNgZ z{{ILMG5Ny&l{l_qUwEB9`i%ccl&t>s^^){U$E7s1cbqr#2|xDs$%JxYBp`nQp2_W z7Mc%9!Ve1TAL%j>VH0VL8Xj61*5w5<@30g6Du4$hnM@ngNf}g3Y?8+)q4U zpRII?S+Pl7&a4e8&CZE!DCGW;2m!>B2B?!j~5nTG;A)cdBXGj|h;9~$P zBqkd`EVE~4bew6>6_VfJFI1I<&AqtF3UzssV?wi**rrT&qd|r^^8!i>R&L{tWGT!- zU512`NXZg%_{w^WyoSMupHU)s2d*D2iJRm(bf#O4z3^t;D=1n6AP^bYpI=<53(*b@_8ib0{W*m>~~OYrER<;J>;H zC?Qh9RoJ6)xk-0P0-EnAPNUrU&JX6w@Pw1fHIU@1COns9>{yLgOY)jan{0lfMv-f~ zXlf#|5rq^j1Vt7zC`y)GUV+~4PvD;i7(s*1<}_@v-VO*+@S}Ck2kkrS7*nnwy@^dq zJ(~I$ZeU4U$0cH$iX@=o#7_Yub6^o&IKKxsPtE^iGci^Os-e_u#ra@zEkkn~s zN_>qFca|4+F{0SsN=*z*tB}@pPV7|qv1~va8%-uJLW41D8#%3AX8^3+c=01;?Rq#X z;@%TOqER73RJaNqhWcfSX<*#-V`7;DODHmEcDx>Cy!sbY6MAmevZS+g$TD)iDl59y zMhH56@(@N&|9<`PQrGs7uuckeDw?sIyIqrs1TB7JOGDd|+{usqrN=I-^pg39#{j9` ze0NnYnJ=oZEZ_Wj0^Y)T*GH`6ntW?j&mcV2GqE1Ls1X&1@q(F(rc679Gtc*`{!Z1N zU-l|*WZQ+eCx-`S$@Y8Ns^2_25m#@6Qd6K+lBYg`NA&lpd7?E5P^ZhyuBv6qsNW6a zUT*Pn{8#+5kCn2Yq`nlGiDoW7_OOJ^MP^Z7VBReQ_y7Jz$>8{gUg zlHr!45Xo>yrrFneOq9&KANaIQz9vjNCGZnJ5;s7*ZlI=RHYwGm-Og_xo6R2(+*^<~ zBCTipz33{ZaTiqIYxx1;w&Rs zf^$+-4`0T!B*$s8n!qqLB%}U@%96UO< z+&c_k{S`Vn7j*>x*!OZ-IK7cBe)faJr-Da-U-=D+zxaOPo((E@E;Hazpc6|PGXM7p zmdz}Ag=0t`owDyqXh(tLB4N&vbZW&X%?%QjxGLZ94CSY8axb|74IZwwWrS9xA+TY( zliUSf#Ys~Ppg=A0)JtysR=BHj=`6p;P+sA=5Tgm-9fC{-qnAZatyk6Tr4AWD|p=7LG!w6YUd@voC z4Z`a&jdU)pAE!^B%ZQDg5Q*Z>#1-x+dz}Ap1?@Y2oc}nt>{Hnn)R$~ic@Q=`5tLk@g-huk3-0*ziI7_l0JpO|{7&o&xm+@EKyRE04)HE(Ke;2i# zhkP;roH)!MwWFQ8C#v2VccRuDfVRL}=2?84_*ARKCFD_*x$Vo*E8I~-QhBkg?0uGB zggO`nj^j9voS%~A+9-Fx88O)rPGf0G2VPZkqUEs5nZ~sU-(0lN9#s9+fUsJ3z7dPR z$J#{jR&LupmR+;5+H^O`!`az^O!mdvpcvb8zXA*vzuD5FFh}^T;R??5F$}o5_oObw z^rXVhGCg|0H>~dTu_<{wT>5@OPh89`6f9Y5EuD3MSow9Go#b2K56F@p2Q4sr%XFOt z8N8hIORoV(HSeogA4x^aMCxsCj(Qg@T{j#k`uav32J@ul*qq#MqjH}58oPxrH6G%T zpglCcB&NjZIXhT!5&h8Ylq=^+it`Qe&JopIBKEPv5++MMXcW)g2F2mgjtz62U#M9) zf}{g-a!b>O>*3!W&n7$x4RGP5dzmKqRG_bOfwV*~Fb1GSSX|R`j%Oj99Y@qe>e6Dh zmR_rO96gtd>ICY{AQm6Tg*J=X6CBKIag?hB0eB(IGaPTp7#cDGa!;N#c*2wzj!7A6 z=T6WDC(?O*hT2Rkal-ESiQ=x~!$q0sEqWg&&QiByoAqGw0Hv1oWwKN^-lv&-QkhQp<)a3IGwcJD<}wJc3*JIA3TZp@))v+MNu#@12NN?J!+lJ#Q!v7Geb+8Yd^aeb?0iW?;~W7>8L6n zYwoLyEJN8dt@ue>?oaHtXYx25v#ian;WvTNCfFA{-T2SM#r|aPnJTXMm*K){6c^nzuC#&O@ zK!@7=$QAa&ew&>hl8P>w$BHw=n<_!>%9dm|F51kOY@MwZdCnXie9n|eHt!AB!F%-0 z>G8*lKZXLA=yO&T<(Jh7HB*v)OJo72Pqgk9wC6`#KAtd^sz&%a2<#EeSXaY)1b?8W zu7D^j%Prv*ABv5RYlP!U33MVgsV=}$fgi(Ib*gb~GdT?Zr z(b66QnzFc~d63HynR&H-i0tzCuryO;=*=~wdqDTN;rvb=H|QyalA7jn_zWEP&CrFV zJ!yiEQ>z4|yhVNr?#z8y^qFwsJ)*r~=sO3=)zU(tKQ8FpbhFTv$!N{Wo7=!s&9mBH z*zx0Ye0wUKl_n52R^^XbvtUAr)8!RE!gs`e7Pu@|vCn=nAQM4U;^jdS4vDOb z?i7JCSQC<-5mwy>hz0eCA`Dbj{(jm3JnXec{Fry&Eztqx7m6(bet;7Lv!Xq!v-Xu< zQg$I5U|)c=^wl;jf6=6}eo$$_Bh2gE#}uQEmwGM@trYv=l~ZueBLzB|2%1MdOGe;~ zoF@y+*IAb1>FmFqu+%gJ0kL5p+ehS~(Vp^S?jY|4Y|Ip;)GJ3szD6#zoWFXZvCiMY zw#qa9e1aOXtYlf6v`pUtgBF4S-HukLXthASsl{WizO9+Ix1xCp<1vD&`7L$D0YOoIouAU71#2I$_t#rSt9Uor%NFP~XXbXnK9S|ekn z88NTv362NK=gFGA{Dxyf!TNd!ubYt6=rUUM6>0QcpnLHx*b< z;B>G?IuJeh`b}$~3zh2c4)Jui+SJ2zzhIA{RMC7iR7dA z3ftAotyhko!#rg#C>{9eAH*;&b9@g3cqK<|(Y*>_E_d8kxOorT9`o{=Ddjfo8tSUh zgWcYcWne3p`wi?v_O|QK&QmxN4%4{heht}RjK_u2!8yRAvNL}*w}3T7d9iKWa_iV9 zJgCbakZqF8Tm*Qg6&mBtaf{ZUNEI9vm{tx2gm>)^%L}zbG)X9oW}H0B9~-s++>h3gmyS|y?|8V*>0%2Pei9Mo?L++j=$ZY(F(T^E_Prew?bu4e7%N^M0{xX zeOZ^Ai2J<|PgV$f>;+|R#0Po8C;(8;zL-sT10N`LkA|P{ATc9AgYH0GI|tI<8}JU# z1lYau^!?{6h94f`dJrSLERlM^s9(D&dFp4Zfc6x(d4$u@+Xj>5l{4{EZkyh()sW{< z%^5$avWSz?*`JTfKi5T1JqAMDa&*j!*{5w^kymro0B1-YmyYuv<=yQC42$x6U62$z zUbD^&KRtulVhexIFlInB$wFF*1X}(GX0cBuo7HyHI2sG~$e0O?Q>tt4>W>Mv;)!z2 zQEjBEhtATo8>ntbwmqf76 zJ&wzy_rfJ^iS%qO>CtBY$SH)-jmshSve0O*NQtjtwm8>F;Ou80D&%12Mo2XLEE;H% z05IaClsePtPXg)P94>(a+}+ZE@p{k^dyJCKq6Pb2@UM{{f`zy)oCbogn$OJsIslX$ z_C6{0=vAVf{?iQ>Xiv!eH=a`sXxf?lmpH~9$l{&AWqb;`KR{A`0(M`-7Cu2-7x;o_ z#43n>(`5M`t5!ROJN+%(byMFzDoKZKrq&(led4w`o&zd=+aaG9A_y*lVmT0P${rGX{95rdF#hp3jo8Z{m)K^_&W9G-%&49b}E$8&%`81C^8~)97 zr_&~M6@zn5CgW=MGjx=o2My1|Y9yDyy&c|GpJ*AZLsi4c+@F8re&2X%rQZDIeJuUu zef(cIO+xneF3v80iA}PGmUhZ6hE6X3L;BEkUr$z zfN6sU%Mvh#V$DY#>Tv^WNE&A%*}~{}LAYH{?McDNOi}iHU-z5i7vffLK(=?t$Z}3y z>rLk-{`2+uVh*I&C(k4V&>l9Nl-7uI5F93;8`l^l#Y&CepGbhiPchZ$Q|;+O8H6b< z3Tz|W>jA&HkDMBdA`MJZ88IGm;SEMzi_U3QTM4QV^*~=PGTd) z4Ao3G!i)@^C3}kNu1xJ0&to$ZIzcBLeTHa6aiyZBKui9vO6 zEps4de}Vsx=pRn&G=E#|S_E&P(M{7*a0DoVGZUbE=*4jXOYw^L>24;Ob>hr^`*W_^$B~+`fs(Bbhnip zptMp@rv%xfdPm-zqFs9GQT}XEGvQ7~Wyocj@T4I zVdim?D`c{`FtsCO;#0$prGCZZzn%3(W%%azipel%uj>f=Z1M03))SCtQQLuxY>Xz= zsgf+wB2gycoK*q4L3+eU%igA2t6E)k%n3GwFV#)=QEg5W93VV~hn!h}ZF&tVqke6M zk1St|^=dSY{CR)<1#hQIh0rs2X_DE_fa(+8DVIIn+{b`!n=M5PWIfxZ>DUrItraPE zX^LX{ClbIi#d^@=5xaeR=E-hH%+gjKZ&XcE;hypm>OWV)xd2g>i0E08HA8O7vdm;d z0@7P`551)kl1;h2AVZv8V5KY^H}uPmvPV+jp+r5q=hT#x}Zk-u#WhC-*HE z0VLO>39nc?!0ngY9}%>EV=fnisAYfQ%~<0msv4kSq~dHmCNhZ#YJPIg@aNA#6*Sxl z`MrrSKY_{D66#xZL<#<1DuQ(p(^z-Vhjki#IdzyyRIA(v2p___BwN{cPx<7!f;Tb* zIEZ1$*p5QTzj396vut9C!Vey`#Yn8lPyeV2P1)uQT9dd|q`;=W zaNTVaL`Wnpm<0C_G$*Nz8T&s^$TOy;!(CMx`GM~hmzz8HDDV3NPR*la;KRrP5LB2j zxMjP$#9;m3`uGw3^nbn|P(zvW4e1f&8I(j1XR`a@60~#tp@1{UBu37>BM2PJoDbOo z@UjRQd|i-UWD8vLQdxHTH9=P8lljHT<3n2$6DH({Ub#7LUM2sX4N5*rA36*L1Qh$X zEJ5*~OA`NNgNg!7ja~oy%d=$la4(d<1^jAS&HDz-I7S0wWMGIO660%!;6=8Qwx@h8 zw#Aa@#+2n}WKC){>fe_0K}}P0olTa)p1Do38)@h?*zEb_O=mtkEBy1d%=Q?Tr1VL? z-=Eu=><_-qUFjZ`E8h?Il|XL0JHR~Hzl{aEbj9HD5O$%le6vys_awJH#DQ+$_H}`I zNDnM|hzs#%#x(*SfV;GZnX+oh$6ju4_3-{u#&>20Ak#kj2>1pcz_;HRYWa`{oq7C{ zLSw=2cxEutzd&mF@CL~N-y{gRF#8KUej%YV5V!3Fd@~Td`ye%Ihfcok8tp@QczFXN;74+SghPj@l7(k+^!1!^LE6Ut&3HzI#Z}D(6nek zy4hoR7(%4XbDZ9jLpsWRGI$p_JMHE-0H-4T{`30nL4Xs$p{x{pZm2vU(YYjkK}LGz z9$9Uz1cQcmA)ewY@eSUzywEe`(!P$=wJ^{!p-dWUP0~lIf0=I}>pYEV$wlmf!@7c# zYsIlYr!!clPla}CbUuGra)5-lv?<9|gx!*5QWLt9IC)xA&G<295S| zsd@9S{>dP-AC)LJ)@3si<>?0%<;+($4LdP<5tM6tKx7p-)!aqqt`~Jdw5n*Z}m(DkE#5)pu9U*+VoqOx>!#PlS(b=1Zn zt+X;I?M6#8ln>1dLw_&{wGxsxZA<0{C8OZIwo(GgE1z1~)Ef`Oy>$ikpXh+9_8pHJ z9kh6^RdO_Qa_2FP^Tj&5M2(9D^elZQ=G_Hqpjg}baj3-fkMX-aqsP7+*@GOG8?C%-(v z2Oz$|nSIBi#A5j*1uxlP(wm@A*-LLVW79H*qr%SEVis#rqZ(^_&31QoTVZ@hDt7`C z>@_3-^f~b7F=2OWVZK9pA#V}D z{|xq$xctC0jKA1x>|n+9)yQnV;muu8dM~Oe9`IaV$kfIXqO4!GRd!;tE_u65v;w&=G$}84X0mv&GAQ-Z=zrN& zg{kmq(ky8_bvOtq`iSwUvL1H_RT6SMp--%LT347zQ_59++G;XoV=p+jaB<#{*~GwK zJJ=9;p44#h*kYT%p@@p)=NKfETSou#lx;SNMjqrV1y&@|K`Y zB#3U=H6yW5xfBK@`u`iuWXxQ7^)v>d~^s#x_ zCw8}LUfQ+?r2y}Jscn2ReEC)~0p9T$HH9K@$TlZ)UD`yC>*aZ-Okc4%SYg~TmSW3W=D zaZP6=@0#(LI1kK{Fz%F5<(`zHI`(P0U*?%LT|ah#Ugw^q(_PDto;$+#zT*dd4>WV- z!p)jA2X8^tM|NLaUepq71q7xhKW9t8N*G~)GF5#Dn~8{SR!wbs&V^)oUg45UMFw@0 zqDlE)`m$M`p3TyDC&=yhLuF-Cm<}>9CJ>oLhU%o^#-v==6x~k8`6KqLNhQ+i# zlZw^ajL)-c9m~3)ir=Awb`wgOf>o6VW-_?-T&@%loOh5ki%c{YCGiV!%g#3PI$L1?Mux&!~(HFr?gsh;*%_}2sH3%UY6>_YGC#PN4FM0AH3@7&@9 z-yowq3XfaNWd-z>edvAuvj}7Dv6PksTH6@fF0Q~vq8QqsSO2hO8%j@Tt3aA1s*b5I z-_nh!_cnli^JWDH&sBtlwWNDxp*E41=C|!1@PDN;wuT#A6#V^R0~O|9`OjGBA72pv z6A}H_PV%2b4Gl+|VNvhE8m2~Ejc9MESnnb$5i-Sgcquf3g(G}57Wwfwth+b=y|J~tmd zBZ+@JUKxQh2hq{E9a%_CT@S zPo|F(E%so5iZ39x;uVvxW*-G0)JKlyEj7f(Q@+3O8ik*m%#!2}~e)af}AMugdxBKJqvubZo<^DAiT9?V=%kQm1A3pstw&hP4-Bml>K3;05 zzH)<)H(+gV@`EwghUomga_Dc;gCIV1@(mR=OrG% zhYh(9!h`DtVWmw%dipx=v3@m^xOt7?)n|Ct@YjQFz%3DGD5}K)sjL zS;%U;$EBl##S&h`C!lkr&-V94nL5X}@ambJw>|;8OE47)Y%1ogNUSQV zJuDAxJ$u!bsR6e&haS?!=)!`!I6e{s;o&Np^hrLo@kwV)*#ywLnsm%rZO*)hbrX(9 zV~O4%>v&LB?TFtjk$b8LEjuO%!*%J{`y-Dih?_NYh?!NrRjQYt^$qS5L;YyCTUH~*kWrT-rr+hxh}h(er1Hzus070F z;Kf|TXWB)xdAN5w>r%QTz+QEsaNw05vmK-fe?+aJxQNEa$m@l6lT8)6&aW&v1D|C% z&nlfNBK|^9p;>nX_U3RZ~-}6XjEskzg2&FD|pK{gM?0kmN}SXTJm_01}mhxRCfmkdqe-_ zT-SE<%BqSSxqVtT9dG(aT%;qtS#BM%V@jzmy1O|>-og#L{(w3^x3aiQ28qE?k9W8c{%YV}w6N?IXQ){PT2$TNt7d+02_5Hqtp@7w zQyA71Gw3|=%9$>@Y55tfsLtFA=|1mL^__BOo9cS^COg(0nmY_`&SAxzI#5a!yVX|N=<45NuUj08N#1=k z$+fPx=U|)Tim38K&)sy|qO~lx)e5hZ60Mrw^}-F;;bafqhk71!2&U(ofo+}2jNhKS z%c@I`Q&My3o|GMtb-b`h%ZAzDm5K+_Brx>GG~CRq8z6_`k0hS^8oCn33+G|9e2pe* zxABK=8u1H$VI0SE(>4};5Tdvp?sM(C1&J{ry3e>lIMhK^d54^X*AHdd{XvI6{G;o1 z3|R1~YmPOT7@_fL{f3-TM=6-ERO3bLl782a%=;T6p+o2_ZZfdu(Se`kswzXs613Pa@Cm*oy|YJE zNmk+vsLZMJL;}@bo}K({Zce+Y5`)d62Z3FOj#G;xvm#fb6CiUxiGdZE-Dlj2ux5EyG165HB=YpMA{J@2yG%D-xHrX zX1|V+pc_1}gC33x6x67~Il|HJh&A##{XEBZV8uV)X(eq5p&h_|XD ziV}J54dl{{@9(51TiBQjsbJ~$;+*JUKtBm$yHSbt0%{1lO+ISvujp0LvRkrq*v^H? z3dMR$r;qH(@#?9}bLysd(E3)g@%+WXiaPWuJ+Mz}cov90fHu=lndkF%$CX8+)tjWt z`i_|D1dpq-z9aZ%qgvJgDdtwIt9Q!Z>3z++LonL*(M;)Jv;eDLm{Md6c12eT=UBQc zGyGu{yJ_BQ&Any%yvarP?@M>zbC;d8s3kkMHgFl)oVT#{SBDlE9ZE{3(5qb>2ux6lE;^ znFg44H{f%<#!U(ZWcr%>E-fkiuw zz@i=E{~YQ5(}?`vxUDQTOIMsl^vz{#jc^_bpnR?n0?t7AZAB6uhE!JYE4QBjBa!Uh zkc`&Q9AOM|wt^T5MIKUaXCKK7Xi=&w0kWACj%FoCAwrBxRrR9JxtI@xZ>}*xl+k$o z9{C?lzQ--*AIio4VoY0#ttne^ko*y$A8$sO?xkLFN`ufa*ygX8~LVj!k1jMaa#0R8=Qi~O*hYb ztd`rF-EyTsbys$r4PDiUJd%pUy3HK$NYxl7Ge!LZmRw?|VSS)sNVe^e1(warKFauh z|I<4lvr%%QzWOdViQYYUh04iTn?7gCQ*?@LUW~Uuo}uereCA;}!@(z?apJmlw!{3+ z&RmfQAG`s9A_u?tXTouys_zE1i;et=8HVu;)l0B-#3tK#-5VZk3`Gi)c50wW!I~z$ zheCvcE1vSq%O-9^HgrF$A}W zC|wA~(;-GJ8T~P#o13d8eXeja7#dK`S8J18;eQ>>{+=3ybhaN^v>LsW9+rD#Rst>5 zSkZ4eFrL)A@nHSMYcPa*=~CaUWu*U@`q4V>xKqOA6O8F>)vJn!Q>!3W6RKrb5iPS) zxzDyyU4TSCtL9CKM{n5DmlPGas#1TRd3yT9sXKcE*E#0#r&Y{Jdb|~>=F|<(_QXwT zKr7!9=ZZ4W6E^tx_ft`+Z_p2B%_;+@c3GZxa(`Fn&Jd-)SR*KJs>4^;o_GX%NL(MG z^C&>5h}@GSIKl5!6n^9LV|@m_wPJc%aUAl6Khg7>fC*7M)nN(_%-$bPZ|KKqZD3PE zs(FOXq&-~QMY|J3IHFb+OrxaMfp-FCSClODyp z8DIz5eaXd8BJ;G}X0}1`^}{L0GQKrLwV->#9KchLNzt__0+YSY(2Vld@Gq`z4dqhzpWxKgSU^EYQI+zlAv-tIsw`b+;{F52s;~WUxl?n6h6N zPHNx6tQi6B+AJnv(k7k>amd8)&X@gJx)hmg_wSbq9UZk>CLpNI`bWZ6Q%Z>CU%0xHuwM&M>jZd@e+F+d zxZmV;8{`GoRh<>}Ch)B;zA=T-FFANd;tUeqVd%2ui-KUh+` zJ0xw{B_L1{#u`$S8YNqRBgrgF!14^9m|(UZf}2u{lOWOysz~>AJJdFx;Fe=gM(~@5 z?F~vX*@D(FGH>Dw7OgQ2cgRW}vl*PI2Vi{v8|9d~dvFZ8g^+P&`cV2GmsMRWSk4u`nAjyAFQhe+58vjP+66U|`PFDr;`T^L^?|4A^Jmr*yUXsk z`w9+7WvFc=OZ${|yZ{T($I|_g(u9=)-QHM_ES|5$=leCeU(Yusii0^Ec`ps#RwDikO%Z*(X4 zJVI$7=qjLR2P+wGczM7Ohg5(ZZOG%7t`H1}7rkR3s&q%~txJPEImU5gC;h7Vm!eb) zLLe#P3kZlR7zhZ*f8O8zM^P%Nw5_4Om9RO`AYg9b{Qqz#Ns3xhI6y4il*#6zQ-ys~ z^O{zpd#L5_wLL8<0aS3J#vlv=FG}fnBH8v;ganz0Psv{S>pcD*0u>(S;JH#{uaz{% zS31X)@n4v}Af1C1oD+Ig&`5GJ_Y=6&-ktXfJ{#rV zWUg-wSxe86*|5_t2Y^tZut;C?*()hLUzF#YEj>cdNnwj2cLL?|+nB(vv-=x~*-@*z z*qx>NW>Oj!Womu|Pnoh`Fp#KyqD!cwc{5`N`}vlUs2J8YQx8oRh>l4`fjfjUMb%{f zMeatfs6JXNanGM*9odS`cSo1uJi}V70E!czbY7 zz@Ae7)Cst``o^3OX-WvMh4Hg@)F*v~RcRQzWnrtl%h|o*SNd+oV+XWnelIhkSwpl% zMS9LWKIg`5^`aNkB9Xtxk-hf_6udV9e~kQ%h(QyQrZBN!ynsYQBoOw^*u;0%%Y z^9{8f^nYr4@rIH(0O0wi6cPvs(SIHZ{}X>0q!#9jW(x2zY3N|)hUdgURi}(CMzFdh zhK+ArAdPidXX&MZ(UG^W=U%1RoUk%Afl;>ZD*t2Cgs)Pli>?)u+-yZTv!|lWqgkb@ z^@jO|xp17Zd5)qwLH`{6_`0?4nRD!UJf7s6;|tN_@}^{L7*q?!IlDoRt!2DVX{T~v zFFlkG3o)#c*#kz+7l;&bL}D-U2 zlB0Cv?jIS;4d_$Y5T&pDA zO&ghs8m|PKt$d9Kv8{5=3$d+s4F(}M`ji(w{}dNlV$4IbKa5H!5Rq1_A7kP?%!mtv zck?yclIFanDpS7$(7$`~6t>&RZJTOCUe=LJn`i&IaDb=ux_3iT;3_M(K`Rh0q0VcO z7G05X38WU{AP`H!REQQ24?W1>g$*NK6qso>1nMnGmLO=Za@ee%{%ou&sUPaeuR1=l z*W1v-jh`8CSLK*cKML&D6Nio=Sd2LZ)7X?o8qnc3EN-LKZn7S##dC48w;Y;i^(2iH zuG!z$bX=BfHz9ozt3umkk1~}uB>u%dC~Lm5+_A-*0Z7zSxPkzC@xv+p$$uO<{J6!ypC4BRb8d+v>n(2c86X_7vAN z51}8q&isx8Zp+JVWaH8#RQ`vEKZ1W(8Na7$RN<3zjC!fMMx7o~l2t~zEEdE``ihM8emuAADvvhqUU^!p{)K;jtLc^hJt&Bv#!TC11r5CCC%9|Ayc!4csf zOqMy%5CsFEH|L0fJ2-Zb7329HrOe7UP?#>bDAm_1GTTYBkB*RX?TA2ieNxULmJ{M1 z`NQmq%%^B~*-d507~xm1t?`>|Kl+<)KY=gz!H)(WzwVjtI4SPu{?^bdE~rYfx#TvQ^qCD9x;$)zqdkvMUX}yJOtK z(ygEED1PEBjex7Dh{60WXHwQ;TV6nEz*yJCLlQ=caT>Isbkyr^ZRAR8fdC!9Ta(mE zoO?Tq{92(sb#~U3GrI&+ASwOH$ylJuD+;UkaeSN&kF1nHXIrL4dNEnni+(|3d@o zY?FCo5;-AS40@8de#!E3 zuq|3HJy!U3mc%333iWk^)=Ji~Wo3IotEU{aF<_IoOG>?KP8(_RkHf}snk9XCBGOEt z#QCE(%WhX{zDcGbKN%E9wyq2LdjyrvWKzXkAPd$BRjxgQ+ZUNII5XK9%W>4cuW@=` zEFnciml4NMd|O$GF=sGtFl%iXX6mb+^O;HmUCQFV3sdQN8<>tfl9EpoDfR?Y%)Ich z1=~{U%|lqp2DZ@Ty(?y{VSA`=7d4kz+V2aV+$fn{_@H!O%Rp>+&3wh~Sm+L&o57~e zy}S3#eo$?}sHH`1g(pL$BwTX^Y z;tcpo^D!~|x$2|47?8NceZ3-=>}X>enMH21!-?DO58R3dch5`s`WT0R*!D!Y`UI`? zOsUTyVZtL~!z09!Lk2=Gzt3Y_qv#S;zf9>FP~QR*3_>dwQ*n)DVi)@s89)6v7b8u7 zRgxnF?v~ks#2k)%7;?=wrt(DHn)!hbj3;n`*I&f)f3VPLUH?JOqx~;L zxgC&uLTC4XA>P0YVOmm#j;dLPUQ&8gVo_#l^njXr^4sWyOcTW4D#aIo*ydfQKyGK? zV?%%!@H7&{z}ei&h}OZ_(AeD0>2J?u9pOa;!kWMD@~R04vK2oA>T8|#f5MU0kr1=W zEEZ-GV7aY7?kQmSBvX3_wm-w=LWUsf=ZDE&%M__v0+>AurP&}av`4I1GX_qnt(b94 z9I#P^C#Fj02rO4#DiCt|=R~@UuZpT#W(Ma0pWOtkV;|fE|1ZM&>s5ho_kX$ez#!|t z=<)v~!y8(e{}0srU$@7O+$Zw@5k^Wtgc0Mv-!5SAmr2*qNyygP8c1f7Hn%YbVhCM; z81(

n17d0Ga1#ykKw<-F-%(;vGU1{_xi_MoSs*0jz?RY{Jy>)kanRYU@+$=E3C-9(O>YUlO6@# zIq}@_An-(j-3I??YZ!+f-Il;>ZeH01F9!d{EG#DIJ}@ z^vheg4l?BGJ9BC?chzZF!WY+Ht-pNqNM2Sja^B`X7IaWBS!td4)AX5hbwVzjq*|d( z#F*$hF1Je0QsE&(AI$K`3impOyp35HH>j>c#A zc)|u|AraRPa%F1VriFV;jhAnv-vv*$QHZ1_^H?Q1ur);4R9it_1!U1&&7z?6u)j5u z4}Vb?2|wSI5>KZon5t69&VLnECFyvEi;KYw%|??XF$+?(4_w)TzPXx*{bnTK4pTYr zLsF`Ybu3FwWt+8C+tVQ@7nrZ)<`wrrstvRT~A3Hi8zYtU5o%pd-j3&_cq2CssDi zJJwaHwIed?k~)``lN9E7>&_%s@xUBV5TN$^tY>pEk;o*ls4l6rk_J6OaB=V0JqhJ| zsHpoC7?e$j3|N#Uos#2F`;m+1+_HfW?5B$j8+OVk^}AKEmpe_2oz z1!3??fz$30sQU8!`?UM_|0-kd=xAUn#IcvG`zvyDQf#~Rr2Py*!p$RNxixt$UsmZ1yRFlGtID@Q^gKN$R zQo@YG4EHMuIdOxRBxg}nImA{+O4*}bW!59UYM|3-_$=TV}qlJgh+A; z7chtCZp0ByRL*zXtbzc1HD-SZ*ZXF4{5$z#Ao^FgSeQ1OwB>DqYHyHz9ENCfnl&?t57-nwT@DXzDYeV zedJk_K}|7S3en~y!2HE;kVws3T{eIef{2rd3qX9qXHMinetQm*=e0}G_gWY{f@_3N zKJAL7ca>L<#35l?(9J0u2QC+{F1l+Tn<2(_W9Ee4=kvREAh&@RSuu-0*B3R6oi5-sStS-lL6n)77}KNEY%^hS%{zg z5X<)aeiZI}D_SlF5ASz{=;@CZxunZ;ID_+wka;g5f)r30ePX{2qVd}8TCm#pW+Pp8 zm6eU!aoznQCx`@H5shhPF;*~uuo(xL8Orn5Z~EZ3n5umubIkX`)DKAibD!$0lwtad zdm8}UczFLeGvFUXUkNA)*_Z<7hn+qUg!|u(H?owcfgD`450iFdee1m20=*`G%{+M{ zDnfC|(84g7I+U;QVOzx)#qb&~qnF7~H9eylP@XrSVdO&%zKJ)JE>(h-7937n8IRrW zSL?Q0_rufl+aPE+6FtaB2v`=gb-9MKe!*l-sa(k_=~fEE;n6C=KWR@#^fHK&bNKaU z#%wkXu*$@TJr;SYHMejSny8pG?JfKGkh7IvDN7+j=1j$}vcTt@AHd|eqUt@ph>4y)I~o6QsHv@(78a3$60T^QN6?rmF1lJFk18w&GnUWekD zu=5zQ{Z=GWn{m%NT>HU`;o;txxe2;NC~rc`aL~hB?^~7HmW^t>^%eqU-1*oykK<~d z!kkG&Max*o$-iHp2jklVH$FiC!4Jm$C<01h^?&HgC%>;95sm|L_YY9c$eIyI21y*bLj`C99W-S1>?y4}(_&K^sP@Lw_yJ$XpZo zM=SWJG~zIH6&Ur1l6YK>8JHc;zPzKzt#AlGk*K|1iQUiChcE39D4JHDH&>hO$-DuK zd08Y=TC0wS*+kV%-GZLubSU)59=VI=UO68^Jz|U#!?B0^sfS-j?j+Ej(Nx{ZNgJ1J zuu&AZNQ(vIxm$(sDI6+BcIalui9=<)3@+JNhp@SE7 zPbl|Px81D2jIWe^NmK|l6b#C}i%~;4_nG`PE<9$~+$s#`{tjny_X8z+x9+-Dy12U9#c~o@NQQ!aD1hai zQg{eg#`_?KZuOt^yW`SMEz*0x`qn*3y;O!gym%u$jjj5WQqvUAeCYC{fE-0-?i4ewH{#p@9j3t0_Tw)-~p5E^>m7xSJ?u7Y*leODI|q6!%N& zeP$PRLqjagTc)WmK9ep^9po9lA>Z3-1a{7Vb>Te1Iw%=p7=a_NP{ZevAedHe=+ytZ>n;FRy_n z(T$Lgmj?EirMnA_Iv+>f5Yk=q3s=Fqb%cORz0EJ@R4Zpt11Fco2j*Ga3RGW6t zjXl#mZy)#lvqgZAID{)n8V46{1eAF-H?xx|-W|6|R6iX>z9r z$+VPuP%_b|p0&!(b7yBQN7|`M*m1nY3vU4cwFG_RskLtXp$OjyGE5BI_nqxeq*IN| z_D!kXcoOT*#=E)RaSUB9_ti0PJs1N@Juua==u>vA%%k78W||ykun)Ovy$G#wc@*GF z6Cw5M%}oUxrcWo!ur7IGy{cAfc6ct7D`7EICxR{h0`M>_bT&#{2`&U-rvgtc;KP$J zTx##CRZELp&K4VUc#DnNi;I^FDwE3dfNjBdd%pcgJg&;&k^1c&3AQUL2)TX0&#cYj z@))ws0sxz{pyNWJbrg<0Z}pb`s)ZHGA}y-yH;#a9>Q)H$Z*CYuuu}%&eThBI`E=Ws z9EiqAIh;<1xxUKi0}Ye&q)po|gu&FQy__%&uv3Pzy^e08eRr_BJrTeHhTfC449Ql= zMGMjP0@;)1Zlh=V-AB}q+?|;70RCOU=&Sczg=?mc_h~ngUXf1fS|6gp>cqIv-)w(Y zzzW*ScUa$oQkEgu3Ks#<*vkpc_#`<4izdV#U^U`yO1)Y%Z`N-recRv*21(^Rs9Pwl z4`2@#KcmT-qj8HDA?zl{&jdha#?1-ui!tfFf41*+F`2O}teMl6SYgeV&fC&oi{hPY zsXO0Wp}TpM!*0D@;UdAj|$tAcg2pm{|%!vb03++$AalHpC+ zF`tdU_WvsB=_TVJ`Ml9B2m98jF729`{xHR6vC1p8lmq~Qb#vG)y4A(Qh8s0MExB(7 zji&!-JdA>f;O$ZFj<&}<-RNY2WQsOm!-{N-dkKEab1@_@J>^S6->5~2M7}pWWH61w zi1VT`9xOe&-VlP!*fO>D7V=TFAKANk-YpKdYU48#FnW(Q${duf*{2lr zSk&A1I%l=(ZGM^ieC6RURohV?AA%m!5NL|Y^-Ow!FHEKHS8TSACYf&lSv1QT7;Gxf z7IbSik5*`Qht@ZHHiM=rTmkbf=Z17k_;*sQ*#OTM4W4l78!Wc)gjUH+!74Z0s6Ci_ z6d8&!b-o7!f*k=X*D$EM!y^2F<`ACHDteON5Bo|09I}{hey*tSkXm!ZF*_sU6ZcAN zx~S|R7CS_>iQL=4A@fRE0dw z&n`=ly%s^>`eqx32quMZ%&ys%65d00VpRu4#>_u{CHlZQ$1?VYu_>Xa z?pK%FuKD?C&K*1~c>8xiGV9c{CrJ$c$7>73`~YJq8mfNB+aSjoXbGYF4Atqj~;P@r}G%%>~%KBTFG4@ z&uQLc&gr(t&PLyApLa<4p6E!HBcuCUHKZdlni1qWN<)}&R9#8+xVXJnG+hbx{cC3! z5f~g)U1le1tmIv5CQ^rIZ^$|$f-`t;^!_>5j3}_p=SsZPLO|&X>*U5VZorjL(TO*! zcJRbjo#~3|s12@V^wBC}fMPSvCRJMc@3TPl@)cQ~D(Qa~M z057CaRDcm<3rDS^^XN~=Qu^NJrG=yHycOTFL8hmVWfNnY?o{kYClDZDKCO~}K8v6> zAr>{*Gz)uNt&~7-__N!#i-pJg-WiSPI=NsIJxC|i*ZTHYI?+KMVFcKSgoY@AEUL_|6`=nuM)?Awn*G>eZf}P@W)7tr_ z$=S@5C2?xFNPbm%=F-TVcSREMf$&dQK?9bJu=-Q#PE++?az#=}`*2skj=VmZPdxpm z!Jpw0aF7zL+GC;qtpp)HOcLyhU<_qj8)+!uwz-d@|un+A&_NM^r#v~{`unAz=pIeGAY z)p7-LV6PuZ$2Sx&l+wC@36X`jX#Jh^oHU(-rhkD3V#N+ zzO-o^kuvU)rf)E4ACX28lNa7or}#TQI>VR~MZ_7zZ)W)+GYT>z!H0Dd0J1x&-JOmyHYmjX_nBG*^7d zca)J#r+a|b+BBu3bRM9$;%N~t4kmYg+kuU= z(ZZ|9p0%1=Yp4V~gFai|ijVbV$}(?}3pXT~+cM9!S&wAY-6wGv+p2eBG+@W-xjy4( zsdabRvaN6ArIOZ7rP413h-!YBA79E0*P6LX%YQF3;=j#1D$$nZEl-^;Lwwhpo|Pnc{iX7sYlh8eEUvT4B_oR08Ch=LyD%EpuK z$FXYA!+X?F)0f4%Z;ZkOeTXmW!Leuvc`AyHBaaJYwwfOE_`|Ye%n{QIk_H!B-yAcNL9%n@tk(wF{e4Wi z*YThzp@-kgt~_1dGcGdXBO(>+%FiUuVE`S*I%Q!^#Ed|};g+a?SbarqV6~<_9#uv4 zOq`w$N*kw;@H8ToEg6p=WSvuS5sH9cX|hZOy+7&uF_tJ;mZA77SA@#YRb(Jz4sC?& zZ9iI=A%=zeo8i#2%xX@j(464dLHl{r{qP|0C=Cr{1fo z<@gsMB@t`9P6QQxU>Bdz&+zL8254fTJao%o6O^)P@40e9=>9W&W`&L|r6>`EE2r zxx;p1l-p6g$mL}AOK3<^q7p-%s74hBC&?PgGps&hT@^>v(KZLgET-y$!-={qDkTP% zs1HlO@XBlu7HN)(akbbZ`YGH66)p^nC782Lp~&#pkZZA77aY>aGq9aW0QO7@Gh^;r zuD#;o!JA4NGm_28YC)rw78whYp}$SK>%V8Mh_getn`tG@RbJ9aa%@1a)kn1DS7E@@ zrm){{lr}XMrU%(?E|71I*r3j$Y%XLapemk%L^6ssEJ6t3;HSnR1DasdDFJe_%E=fk zo|>Isd#XAuCQ6&>9`?)Y&?FN+twewX1iH8~9GnP>^xPAfYV&_|D^Gk6Py3+ zPmvm+sxUZix@*t%lp8sVy)NG&w3=(g*v;3}H9~{n2G*`<{0!)VeFzm3HKT^T+{=!9 zg~ivC?tOjwF6e3~XXI77L*g}oxTGEP+qju~F@GKQLI0P(+;y2hnBWV1PQ(S~J>w5c z!EHSP`X(*dIV`>1V@p>&=N|^jy=qUIz3jv;+Y!_%Azlu<(aEmbiW8N4Ej>C>p^W!8)+=bWEa;X&p4@)C%gMAm1lt;`c9emodvVe586rbR<$30@t$ii}|ENAgJvi);r-)IrQ#b;iHaKqQD(#&o?I=Ud zF7+uCR*V6>bxszS?A9<5y;^0`p1($oDl0d|LY4C}aFXlGMV)1=V+3X5>qf2$#qUlK z6$+AtuHc011WRoQXwC%mB)9Wpbk{{No=kh4KgyF{mG#SM*s6J_k9FA&{hd=K(2kMV z`txzCp#v7V&EIo{c(UR2F0Vl)I5rnXUrb~XJD$=xIRg}?M{{)h)|j2@Pj&Vybsrrm zHR|XL`)QUB919!9SDx_pRxi7atwV{bcQ&!Dcq0j;(iIzLyXn9!wlL*xEyPPW)4Hp zH!1b%x`dQ7_v*?vpA@B1@17GsYdX91eRE-VjC7Fg4#9N~6n~9D5YB*I=vc3LEIRU8 zX(7;jO0zyYcDOr;&pS9u+nB@{#k-D|dX>h${XUvD^0iQK%4R+dyNBe}ZO9uRqJ(~x z!&@`q6s(#BPp9pscFVzuV#CvD&N1H|T>^%pv$grw0@c6-Vx4lSx>UBh2bG>6VX+QW zMe=z?acfWu$24#BW#21lj#aJw<8Lix|B8t+t+c00fNF2?zq?)kWmW%YO!WUDDJCiE z{N;A#ZO~|Nk&$Uk-*b(m5~Z?1`$0-<_8rY1Hjd|sO(OVW#6;DEg6y;4SD{=G-xJtN zLAWd17Zf;i7yPNLj^pfcUe}Me_jmXmW z;6mM0Nv(i;Zo%z4S>d!nlZ``#3`_H?{X)y`(Lnv(htU!BP5Uh9O{R^RnvEt!L3ZM7 zQh&jCh4g9P9H=Bsc!}dE94e7UUf1@61aF=h zUG%qa1~OMNDu0B?L}}i9cO5Khl%ne1$6bMOOchuX3feV$QDH#S)oH)r38zDNcE(P@ z8cPt*3GG-E{OJk0wULdc zur*YUicX(%FnWia>{voppa}& z^|Q32cA$W`Up9Aevy8kha9l#Wx84nCIMo2;Nado7g0A0aqvil@9McpxpxwyB5lr2w zJ9YGAGtntVUYtK|uo+ zCUxQ^#nVlTZ#()F9e81~x+GKJVC25k>{Kw4RTgm;&!yh`s*r%H2U zxXH?;YSHXdrHRsE?@$&<0Ag$rZMu|ZFO;OYnw1n@OZcM5o?}51qN!vJ^hp;^Gh1(T z)LF1ijKs;r5>;j`s}%2#InkFX@lfeh2pPBOYm@SbW7gj=H!^}AW0`7Frpi*7mbMLp zhneJof(bG(MBX)l4_sHchRxD_hN+2@_sgB31YFLZQiCNju0P*J=v0?quv>UTR&NHt+T&{qpQmZqok3n>fq5- zthPQ-dnZH&lmNOJfcw&hAPn5wJ)oM;&cOfxKq$*cLul`d#Uw4 zUVB6E_aKoOT^_MBH?yh&Q91m{H(%KXL@$lslzXSI9burl>^U+|%MO^MFylIw-L%5G zAbXUK>FZlrpc88Tt)Z_c2b_uLqu!*sem0HL7v}PRgK?7dnp)8c3PhB z#N0O{^-9nd6(=hS)Q(tVLb9sm(zdcCZHE{xqy;*9PT*cehUi9Gi+8wG(K|y*(BAMX zCJ)#cDTp%Bo#Sk>6*BwVU7PBZvD1q$$E4V=9Mm0NCStXqva0YHGe!0pT*F9({j+{g zXE#F%T~0?@Bj6xds**)<%)i<-13KL)W&&0q<~5bW7|~{$<$M@MUMBOC$I}(m3A~~L ztnMnv_-wJ8%Og%)!3PMTt&q|S;X5f$Rxq6?DJPWoSN7dyX?ET67<8!>?4$^guGK6k ze1*kgG4POJ06>X+(er)$MF@9MQ=posLrjKOYSP8G`SNl0emdc_NR`Kt!X`nHoiP&iEmIYvr# z2W2%lq7aeeF;Wk-B7gc-TOvk6&+)G9b6lpMJ#IjU*&ms}eC~1soBgbxkheU_iVbOh zgpm02hO7z+-lj%fdO(GFy>w@+IJ4z!U39kRJ6Bw~3 zNk&gGt->>!=_mEhbau%^lXWmnXC>#s05`3Jict!$pA*GpBI#4gnV2tBj|Ci$&Pxl1 zo($iBo5L-m&@@gxf#(zr2%MvM`EwHsShsy-jAWvpGrd3ws{b*U=789#>_sO56_qPyGoUhFYV~uIS=OV@MO9! zx^L+DfkDw`LR=l}!pE8=cfS2o>nCYaR}mbG8}zUb7#^STKWf$*|4(CA0hQIZb&>Aw z2I-J)>28ru>F)0CF6l-8x>{xs4xlnX` zr1Rz4_{cGE$(degrwhK|rK~G4ZbjTVPr6RRwod}d$q{F*6Dlkt&B4#Y5%!Ud5LuzX zzpQ!>i6|0daH+8t-N7h%|5_6mZH*sHxR0M6Xho2@1@y#n-9RK>b2Zu6gPEb?#A*;q zO)8D5U@|t7miWfek!woK_8nB;E~*-yME642O^MMx+}PDCFAK-J%ec~Ff+og_K#kxf zO1XNCi=b}Mue+{$mJHloM7K06E|K*e=V|wJHz&uN6dv=G`Jis?N>YMtLxPdH#Db&{ zc4uC{x~qiovzWUB7IiRyMIGnwhOSq(R;C7e_JEf)z&Fyw!0x9h{)xk6daR^uCm(9S z7#OIKJMXKmoTCm&MIWG}uvd!X1tEn=7#+M+qx zPvcm-aLl(lr7H)zs#NDg$8jR;j%`#;l5@CSPeSN?et0hf6ERZlwM$(=(xKhbS-^_YXCJObu}o^(n=DE{?*Pjh zGx@;hdbSQyDwj7##_m&d0)hS!rlpr1BEwgzdkc7_LVL-3qfvXLb5b|Ur12=T;E~8@ zkpYpoR6%b--tV;XUd{${QV<8d^jY-R^^%y0xPrpKD=VE3wf}5*s6{1t-7td(y;hqK zr=qy}30tWZFFbeIgdU&4tKST+^MeG8y9K^HsG`#f>UqyB!E*ggoi@*Oo3C9 zg{h(5-#U>OUOsU_Vl-E-lK>bmK>;Qhk>A_&rzZTqP#4s(GXPw~Hn6lau{Uuv__Hrk zp8Q`9u}tnX>$)*@H>y3M33SbQce;cT61oB;rUFyf&%o0R7c3kTd)qg?)_W3DZnWL6 zM6ph3aHL?sQ3R9Rc1Ig`N4cG@cFV2So-u!V2?8R^D7H`P!`&JWr(oY;nq|3O=;INn zFUdj0t{eQ8njH45jw>D(M{}p&X-fQ!YhR9)Jjt2^L?;hY#^gN(CISyt<_5p|P1V-T z1Mgt6BjLb)3Ms~#V1UXJrvos2_?^S_mA`uF!v#}#ERd%88 z?;i?rK}U9i4RPT_K!3}eg(78D5MBz92BADJqcn6W9m4y|0xF?S6$HO+5gFp{o=8%&v&J{)j zM-XzL{E2ScTHi$afKYam^Y$aIH{5o1CX_fPX%r+Ld20C#9U|A_ZFu*n)cx6lFJ(E> z%K#GD=Uq(njaXGmyU9q!S9Nlb)H^nDFJ+wQZD8t=hFWt{oN`jEka7v4OJ_X^$LjirV&Mm zIZXEBB>bJ%?H6Glf`Q#~?60(m4>AOY+u8D*$J&#HA*x%r>Gmd?oLEP*3td{tv&>f} zX{mjjyZZ_qfikx*1-4>1(azq#9NqPO`C^-Cn@MepI34~ICPCDU$;+sz`SK|e{L?L_ zoomorDb!GLPR*`34-J~S2oEtJD;KY zL!oaKp#7*exa4`Ng=A|j9q}`}?6&2z&NR}|?P`0^?bQa)S+ufjB4mb~vt?>q#DdYy zT7(MDd!Qv9nqC>ApEqL99oSdWYxLT=Ymh5($QmZx8yARiyy3yvb0;c~UKPfElO}rT zoELS-Vi|oxh19s%XC`zi>Apdbt_ueF2R9=HnLG!W?+InoI5l z>#cLO%C2pC{UCQ`+U#VWvEkwDc7{p+bp@J8YH`xx?(hS z+-z&HB2*`O8?fq`;rTav3X%`CsjM;Knb2k+^caHcjLdQ^OrhNhEh5zA+?exi{7q`G zIe0N6dT^TS1j^x=mVv>CN@m5T2eIcGm<+rZH4Uc+qr+bI4`FtAM%bG%q*t0=E}|7< z*D+7e(ydiBIUX)*U{YydM7Ah44NIXVDlXzcEs;2~FrYVI7<{1t zoB?J?fx4hbuxwFFGThURQvt$~u|YSCTBnjOSG=Im=8Z~$fU{WT7emET!-L&Tuae0i zEkIe6kbx1NtS*R7bE1g~3$Z1cq(Pc@n6&H=gD%MmQ;XfiS*JEpD*!1+{d~mGI2{Xa z@U%ONYZc!gTb@V9s?JErU0kBvUxJv9*DZQric&J^<6CoF^PWj_xlk|36h7;IGyEH< z5Afzd=|fIz>I2^0_#YGB$(4GORdsEIFvWL5c`=M&O=3@h8z3||ms-Oxf}d#ljE9nJ zDbt*0wR!s+qKtGdiV4&Wp~7=~FzK(T30Ao0pQV$6GqOannM-bEfT-uR&{Bp$ana(q zm}O$)CSxjU;);ve*@g>x7aOn2VZNy2V)vO39M}gr2DKOtVSB44mOnfVSW7uviKtaQ z2xnNveA$p0+NnuU2~(Qij@8`V_Kq}*6paQL+fSvNaiVl0RPO^v^7F93pf|1s+M{_4 z)o?Nw1#bCu)hI}oMrg=u!TN+3dtx;`p=5FW_-M62R;7bz12JEiYn8zDath6wXW-`N zO#+(;r}YB1u{zU3R(hmm`MAn>>MDZ{GzMzLe&>3}+PYBLUO40$sgd9YB}xLuvFm4n zVT1a5lIcz)ab3&P1*3ZkR0oE3)o5YTsa$qsQx~z>{8^}Ae4{7HAk@1mD`=k~e=|GMkN+s97yFIDC;U}vSl;KE#mPlMFRyS9)l@wqdhcP|63VBX z+dpLP9Kt=|t^uVDMbi3NZG!~+g+lxBjKMDd_u+U90N(ObCxP(-Oj=VJx z8)9acR!SYpoe-N|@5;HD|DcKkTPr5Obmf5HHL&h>%j0*7A^5Vx3G)jful}bl_x^Rd zDQ>8_>H1O@9+9J2Ex$+Qo$pXIUC3nN5EEIAmNJ+Xa|C|LIrFR1;ZLZ4-B z7{T%M%9V=s{pU^k_6JM3Y~?=wV&(CaaTgdCsL zT=pdH_Qoa>$r!B z%1{B@9%iNJYzVx)v)uGcihlQ{6i(1UB|9>_0|uLDrwtQkU{3n6A?8vDcxqVc(nh7B zzY6RbWtBp;fyfRyc*(JQ#2dC7I5~ZRf&4r-RtGIb9N@K99QoEz+SDNlIL|nw7Wu$% zQVsY~yjbJ@T|Y3vD)tr0PV3E;+jJk3tAch>IEYZ$a}fq7XKT*A0o{h%w6E45P;ZzM z^ETE!KIV$v?(gHhru*8mAK6nH$&UbaWz%AvRWio;UQw0Tb)44Auj!*vHu@lUITp%M zEVS{~dQ*kHbuuq8NK*$N+Lv|avUeBudAX0w0mXaFv$wrb$;Vw3{()^0@E#Z$dGFBR zXMryj=xq!jY7EWkj;Y?TJEJx%TlQj?tk_&;`87@8De;OV#&e>r-QpQuD>b%?ZUKat zJ*3gNIkgCnh@q$##%T$>KMvh&>;f?qd3`Uo$)+rF(;;M^pZbDJqaG} z^EQzUo8I2AtdKE!70H+c%Wgo$;;TKBb%^~OJ;A~tKi_cNdID_`L*gup@$(WDJLV+! zk|FSf@46_FNSYI0VU03)@_kD-2Y@V6nE3Ta98fC=?jD|rb+$2q>U? zo&K}o){6D#vSO}5?V;nUHGV0<{gPXG&LVW8mZ#kp!ZYo7k2W#NU;T<`*y(zL zJzvoMwX0{o)%XpzY{1%-pb`Ei`In4NC~oF6#GUJ@cVw!ZjT?|_VH=zHoQH@JfB-ch zo0QzlwY`VeSL4ixN6$Xk3%}aG-ljXrt}bq6H9(>;ge?6y_vL1%O`w$aLk>*Edj(of z$%!UzsMi&jZY`8e1EPgT^k_a!xYI$D<(a^r6ner`fOD|R&6iG(a|dyShA}sGq{S2# zCz_#FSyFPQk>l^F?h2v94bevrvKItiHV2KyIGRR`ogQX$1ic?Wm9)et8h?hBv9w+| zN;`-ar^qXGUP=8W)??)T1e59kRDx^h&T=5Y4{CdQNYt3pen4EAjls)5A0aOhaevU@ z96QqeWpz%_M+lM(4XTXD*Fb9#%#o}U3f<1Mnlcy@=xUP6(IH+-Ce#k{Oq$ZP_9&`i zl}bXYINXxQ7sz1y%{398;6>LILIkfN(sSsevLK`KWHQ9K8j^A}By2K7HJ8P>T%I3q zT1=0m+moK=72g0IZ-|=E@kXxo858iz&Ycz4WUl4o+<-L2c*(Mz6YMKJP_Oh7OdWH? zJ|N$7i&a?acPa0i-K>ho?c2Blw~9uaGv@O%b!7y+U`+=%k>5MKAlb(i9OVr_YaBN% zPPyc_w9HYKD4&|jn#%HPoefI=`fSz}x!vrR!xfwx;q5tBMK^=^C9V@A!h{>>-NtN3 zyRapmXoAen8#w}Qh}3Ix1`#>#%$QQv?pE&yC|3p_PCEu-tn#;wMET}Gkml=6I1;!L zATMaaG$7Jdw_$Z{=v0<>J9G(RzmlecHD@;lR!aNgwAN&`wPbG!)h;O>Q+`HmBoL55 zcQKrE1{qi`8u;Ld@p1g_D}MJW9k54DaA9^QI109UOh;^wFTD@Gn(g-Vy#WXV2iPnb zVKPEpGHCO#kUAV)i4VbS*BH(^+k_L!7ZxZRZ8u?25-)%@LC0t0J9Oh^1-_|`O!A5@ zmMrIFtq=3Md}TModF&*Wb||ey6;na|UT~{p;x2>uE`nHR(sy+hNOM%5KvF)df32x0 zY)KpibDsrPN@RHkcIdj_5*Uiwb~Ry}l#@9cwEyD0jWUJVG*B1v6+30CKYt5rDonr# zbcLK)aCke#z_u>EYRK@c`HRMfWza;2NlCt%7lf~mJ-zd9JY+DZL@%`+{mBrdWHDcQ z9LTkoS8TAC`l7zCP@8X)a0$KEnS`Fx?l>O1JoK;+k=!#PCfv?4j^_?@)Pe%fTOrve zt(gja=_@}iwN_Nz2@s7kzvQOvGGTkfrIAG)HrU>pDBpfwF zu@fVdy4RrNOB&9Nt(3ChE^%BRCbR%C-TgNb3gn5LNr5H#$S|OeM4=M}nis^@XCPrv zOmIX}P6SdU5>^mOWe6`Gz@A;%`A^(KCaw|r^9YQ)OOdM<)B}aAZMeIp?v6X%YTV(^ zOS z`OCEe6QE{thI=mmtLy2|nej`C&J{@(eZhE$DmXAtY}wZ)Hn8LK;0=#Ftznfc>+gF> z-p85vtO5d%LEdV3CVL9;iXh+Is@_2{TThs`K`gF{SRNgL-4#kOiKlQFTX1_NOrGxo zDXP!X(HovSKkwP%ewX)xZYbn#H_%g4)S97k&Jc7dzDKxWi}cjUdERJ!mXBeo-Xhdy5Z4F3^6%Y}gNJd*g6{Zc!vN~CAwb^6>Sk@pg%`GcnCtC&``7@d=i2%QN|bJ<`^MLR7@@xc5`1?TUbFG z1C-IbHN7gyufQI=y%c-CRJ|MZT8w6DLU5xCDn*QS#FGu^zSmQ2nIzAM&S4e;_2%8y z^}A37s^+&^Cw$1yR$*Xq>1LRL*LWw4@0bX`3Z}?<`B?De4DDG_5I@Mc(L2$G+rlsb z)KMAcg~ztuiwoQv$771lFr@myA{vkJdzJe-VjQ{W`8u+}`y)}6t+2xtc~94}s>s+{l$Sk5siC}DERoEcGE)D#hchx(gt z_rJV&C?W9(Eq9;Oni1uFoT>sAAz`2x-}4F08ldPYr` zo;BO49j&fqNdGMsB|}!M*BZ?FwwiIUAZ-|e?;ASlrxTXsOc=AUS>2-Dx+PxZgwbBF zMSUK-U2Qu3T1a-S4DRGMlYmQyFW#dFPG5qzkrX$uQ-Kzr4t7h$B!z1LmCqsKC|=g{B~CI{QIm!X1%jhQpS z9(%WgFx~-%Ey{kKtDhw4+p*ObW`=A%cT5Fe#d( z$+uR{(44e>(*+X9ew_;2Sj+toqYm$sI%~MMWNDYI(_t1=w;Nln+w9mdNUwgxJ(o&p z!9ZfFB}lJ7XRcgwTJPxpm~hH2;Q0Aqd114Sc8ekz(&^Znf9(|PpkwVD(jEB4MJt~$kYHQEza{V=v=1phbe5#-O3^C92N^Dk{=&bfr$g`-P;_0Jb5 z-!gOV2MV0Sm~`REEJ_hRn(}2-cz%s zW@o(5jcQmjI8q0b(-t%4V@xCstgcp}v2%$Y7Bwu&N?zval8oRDXNI<7ADk3JMQG$< z(&VT3Y+K3$*j|9wE0tF0N$*%tO1zyz7fWmuA{! z@QGumEOIoH{KAi8TY)dXHo$(J#gvZk71xrHNuGT-7%`rTlV_Zo!(OU-j%icv9_-KI z1nHQSr3ammbpfco?=Kl?ei@>EJ_17g>0S9U|fXm_LPN?1oEDA0!ut15`lj4Mm4xZU(wTeUNQEd zCE^6qv>v?G60wFbS<({Xk%G*#32rE?5^J1;{xx@AA#Akp0+j7jzL5B60@lV<+q#T9pQhKYEb9ArmLmLyiBO zplj;BiVS^~VaT8{hG|Ht#rRfNH3DN$?d98gb9u`7)O9^k;D`opoxd=)>$VRnWF{4= zgu@S?hwVK;ion71Q?M{fCP<6h8+9Z|>pD2wXq+ugvG1~%OlW9->&kCIjCuxVz*hX$ zzQ?iZehcS(p@nC2%$hQcBk?A>+~7f?i(MX9?(xp1mu9DyGM!72HSSfl z$Oz4QCzgy(V=oL3pQYF{Rx(Tx*~PbKFY*nBwbi=yuucV$ViM)}D3bSqy8 z88cp;2??o+fHgr1ilD6x(tjxLpv7V}g^jlHKGmPL=}$ey8ny4Ce(vkS=~F{6KE|Hw41~6<~g%~DzYSw1k;&|?j%Dl@2+$P=Xn^9hsFVRyG+Sh2H>*}g0F5Z3- z_(&dHcGwwx)K_QrW~r;^fw{0^ym(VVev=6Cqyz|SWK-F)LA{ecs}>LxqO}YTZ-!+( z;q?IN!|V*e1+fcZPiH1w{91m#?I0%~W9F{+g3vxq^=;nN2!9lnbn26nbT!P!@-_7L@R`X(Gl~k!p8%w(Grbc zXv1DpfF-8i*dE{5URa%j1YP2)HcOmon(g{XqKn(6_X3Msu0IcIPtB$L{5A_|SNkoE zZR(^u^A++I9BAg{utl6|;jyYf)sAW>t-#8D-_+*|1|FNcY2IH4uDJ9Tv=+eJObD2p zX?`ELesjwF`L;!by!!u3i`3QA9uwzjpz>2-WYZ3YVzj&}24x^J>3#?9XC=s`8u)Ee zrbY6C9wTeJ$qJE(7V-cb>5m<~$U_x(Pfq8!Pd{~E<6vrkbboxNjYLhU|LT>T6p^n0 z!X15P&Q4%xsyNNNXzz?(S{gDNbcpAN!OvZj6==wUn7d>c|OG>mhmic;2Yk$hZ=? zfd@%h+n~m5UDF91u)?AhThlL%(Ri569S6Spll1;NU?2si%D6$tk^|UxF*DY9)zD-z z#bv2vY)Pt@Nquvxvkhay!QRZu^^K|3=5+O4SI&{D_Z*LmH2nhdRQRUOps_EpJH=hf zCK$OVm|eW>q0~C{nqIERu*9DUb;(m2Up@A^1RChMCC=1#49=cpFG9 zTDi(`NBGuW)I?j;5BhPSt+-RujJefAYBF_T+%Lyx;Kihqw+s?2v5cE3M`KKS)!abNcTs%<>ORqL=?|OIG)!`0lzHMo!%wrs*NtjvZY09C-U@O)g!5^ zIv|SW4SR#gC4hkCK@ccUzOjciiS)(ys!-D=iP_h*P$4(-rms){9|dnFadD=P6926D z&_4EYGxjo`W&@&tD|SoAc03xlhl~MD%~=G=L^+P+Ty!sD-NA|aV>B7Z^R`z6IG+br zm<`>r?2QC_UsF)yT&&0Xg1oOp(Ep;B*n0~fu~7GcgW&Dslj*yzqrxr;@D&sRZnOR? zy^Fs-1AZqRTZ6wGV1ClOC{+ZkRpk)5>j7@pj+JQHp6d|0NKL5FEd2%0$P6TKDbvg! zyy}nDFzTB>p3FvxoH44xfj?~8yO@K-42c# zyTODmB@6do_d2|~LZIAqDG|?lSQQ;;& z2qsyVG8fmH)=I+;9-JeM`5YFwOY6gW1f6rh674zNkivf6fm}iIx!TA@%TXt;=5h#% zhH&FMx`&~+-1`gW*YDFa%wFOagiqkSE^sme?XvChu~&P+Eu8bpI4aP%YPX*niCBWw zLh95H>xi0I#FJn`mY?>0!e<(Uh!MgbLk59L*q!%*N5WZONmz)xU7&KGokQOuqcP>T z^WBbbgz=XtR)&$!ZiH+wmc7c@py~zA;D)V{6W(IV5n|y>@DM!0V}y9+lt<1q?ec~D zHH6p^c-d8DZlO4MT`;@)!6dDteVC6W=-d*^Rs-KG;SPz%n^9^c&LP|~%Fonsf*FWV zRbZQ~!sz=qR=*DX8Efw_NE;_yp)}UYRQ!jIM^nrF zPrP6{M;tf(&~L-3s}~ef`HZz4QfLKGXj6|DN(|0eadB8G-Y6`mNc1VeTdQ=NZA13; zxP6BBwSEOB&_5mkJR;ozJA!{DV<%u>Xk}|4Vq$A&FYloHz5f5&{q`tX$fGC&Zpl|! z+f*Bi!M&}U7xUxOg5)peLxe$!Mh>xvXPvK?R+*a7pIb05^2+ATe(W5r@k=PYQa8HG zd(7p{nX+@zgCwi?V3YsmWT+8vX})nR!|m$f^3;kB=$*}*Ue)3B978P;OgmgGEM#;8 znsqfG$%fIhkR%$r63BTtEJh`cS@4Qc8~I*vp0^Ca(vfN5h;{6raqF?}j!!RL?E`ga zjMUyL^t^T|Rx8q&kyou&l8;zPvox+(EG|>U5}*TIBA{a^k#+5QBg+19g;m4QG?jla zr5U>mOK0A6S|Y_klvZ&7c`(_awy9LDDTys2Hfsn`YvLp|p)OzDp?REw#eU>W2R zf<;j=LZV1py-9AsUM;_+(CLN@-gBl1a-Z|dL_HJU%aCpOWw4Zw2-5Pc;FcWtrg2nj z;WiqqjY+VgKF?qg)+DH0s%5zLKe{nKPpL6B#L8(s(u;;M?4puS3C6`e>5zhHL`&-m z_SI<_vI!z`A;#+Y*bH5F2G*Ad9XhWQ>@5C%9luRC={nqg&e=FAD&oa}^T~TsFbsM! z6^|iAUe1mxMU!dfE-jDOvniPm0#gR>lFf+ip%8Ffx3XVW*>w;PCiSgUc7r3mRv09vXIPkGMf9XhH(Tv7$mBMwFN>+AzLt{ z=42KviP zaUOT+uWYej2!0(y;()l4zj;=F0gTZczmL)KE_U_?7XQYkkRCfE(Zz=vI5uBwQCl}_ zIwQQyB7h>)9e@#yj`5oA)xKv6{!|PJ3fYvvs)VvH3_(W_GPwz2A%C}O8q@jM<49U# zi&snAvyNxxiG&Cd#OA2ks{SLu=4e^MgkFO$$;P1c7w@9^>W2EnvKEc-SEW{vLftrR z<6ocJg>ec}sW8iQm!wsAcgSVJEY*PFaT%+@GePJOPPC#dixOdhYo0Vs6BfU zF+g_4XgWE^5|RB&A4}nqX4VT4AJpmCcDo7)j>~nqA>feFoXsliWGa-mcK39AfD;EO z3965JmGA~=)OLP@)C_IVGoU9V*7=f z&|jOB7R}ff0??ez0Ams3?@jvCwENw$`nTofTlqDs$ycZkGL)z=b{)$K%qVQQ^sEQ& zOqkLnDM`^5P=*L@&3s)=@#=On_*-;HxM^~9hb#|z8|Q`WCp=?+Nt|)+R~br z=L4`cP@f3)5-a2UXpZR?mLttHEi+`Ya>hl@oWDY=jQ~B@hjG#pNA7)mt?>J@JBm9V zH;EN(!Y?S7F=@xZ`-x^ zJyYq=E{on)ESOyK?^JQ$Z#FO7+mqi0i>=T)%?Oj+xDkj<(|Y%k!<0=1N|mk!S{#aH zlE!EglG-Otpt?emg6s}%wZJZPn6kMc9n1V4X50#HxbE636>NHFsie4W7E=Re>*~0Vc z`P?TbYu=G}yC;OiEh?U${Y!gBRwxq8{oF9ajIHzOtPPNSRX5tHLB6WcUqCuTInCRu zd=`mb{rYSRhZ@}c!LTN7u)i`x7FeYWn2d>^0i3E*if=K^z|Z) zY)AJZ_K6RsH6DWQdJu)+n@G{Qqm;^#Qwu{b`C$ql8sq*E@lDBu-gl+R+n-T0FIX~} zGqR8ixFfdetrHEfD0vEXdTKaw1Mg`Fs)dN|F@Eh*mrm$fB(QL#lA5RDAK8LPdDuO?Edn1ymgP8JauL8ia(5RBBo%CCo)oza0?nX}4%^d9y?)UJ7fx<{5!OWA$XcNA{VpaTf zf!2~872Zo4OjH6LN#0z*y~55mvi`yM!1$12^wX(U(*lHp6D7|_tF5$t!E?C?RG z7lsJ5QR31rB(Ty=2@D2ZQdTKNWl&;_HH$4CXq3{Ot_!JZachGyEhRg|SW~ZRHCi+# zcaL1KSZ~)8B5-9ju<$)NR;tJgBm^We3})I|El@B%ML&Z*H2S=e-W8_Wv*C)dBNabJwTB#iE3yBOH{a zs%+ed!dTr;+a3ZtCmOBG zDaiz7_oKziODI+C9?c8II)EdJo@cl6TDGL|b0v%>tED>C<;y8kFP_T7W*netjkK^| zJ}4h_lJg5=eBDvs+0FX898KKl%86ZR)7xV=|Y1IaN2kfbHi9PvG~YY z7tDDDs+GVGF~BJ%dc__U=G`-)PmI-t)-)pW)f?P7n9MhG{SH|6hWbF`#^>(#A@kEI zzY2UzK2g8pL_;-%P4d$5hh|*pII)8@W!7WdhRt2?BM!9%n3`$>(0S^i^em4FA1){j zQMSepjX2$n6nhlF4N&z_xfke~Qu4-M-f8y?!|Rpp1}z9cHCO|^$ckD|>H#Z#&w(K@ zKWN$>z~BudL{0%Ra3e` zJ>Xma{vZM!^MCtOT3CUfR$N8|aP9urWOe2IQQt&}6ac?(Ir{r~=ksmv_n&0a{4(Mq z!tx3)q(y#4Sbstcn7h6|h(KTYQviQ|6F2&&6o5_8Pbu2Ir}!?1^iK%^0;E4B-2XM< z_ZSAhF&q2p8|DK3>kQ!c{Co0muNog*z-sCzA*R0p{tm44w{H5=9QCXQ%%TEjZEHZu zg?<72))@Z;_;ig1Sgkp`@H^NW1C(q{^nS=RKV{rKQn4!nFf9Ro#J?~)0`l+&M)AMP z@Yj~{DIRE{>xu>-uX2FYw7=kK11!IPz!SCA(Kk0x1c=FtSy>oJSy`DmSpONi99HIv z9$+}D1vK)vKKwg4C|3{8w20AknxVfa7iUEg(hEf!EE+<X!PXU!V1E|bj+erh^FaCfgU}a_hEr^D-w2p}-z=HZCbjH&zK;BOm)C=fMQGm>T z3xM$VQ{$5Wh?@5Y=&2NeSKJ@=-@%_Y<`V{_Yn2#Uuu{yuO{{;Je ztH|(sZ~RtoPXlWFK=su97pVUbUgK&0p9U`Y!Q^f5FPMII`vH{B`sXkPPpO{j#{Zx) zH~uH8|Dq!Q6#l6I`VV+u(|>~h-V*;LhyIl6sgmjsDiYg&LG@Rq{jchJDn|K(LxzEkDJ4svPwLQ_b_AFuym*U(kR3so%zrPI@RaB2mHi()AfdnU{NBX>>H_~$&Zifz ze{fcY|8LGe4_8k;WPf04Wd3i=KlsZ&&Gb`u#2*B&a{dLu&!g0zOYqbg><0l;-fskd z&l3N}jQg}CPn|b@5FHi%M)X^E{io0E>4EqU \(.*\)$'` - 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/04-SimpleFTP/server/gradlew.bat b/04-SimpleFTP/server/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/04-SimpleFTP/server/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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/04-SimpleFTP/server/settings.gradle b/04-SimpleFTP/server/settings.gradle deleted file mode 100644 index c9d3ca4..0000000 --- a/04-SimpleFTP/server/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'server' - diff --git a/04-SimpleFTP/settings.gradle b/04-SimpleFTP/settings.gradle new file mode 100644 index 0000000..9064647 --- /dev/null +++ b/04-SimpleFTP/settings.gradle @@ -0,0 +1,6 @@ +rootProject.name = '04-SimpleFTP' +include 'messages' +include 'server' +include 'console-client' +include 'integration-tests' + From fbc7658da54da3a2c99ec72e22954c8458aad213 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 19:59:59 +0300 Subject: [PATCH 30/69] Add fat-jar building to gradle configuration. --- .gitignore | 2 +- 04-SimpleFTP/console-client/build.gradle | 10 ++++++++++ .../spbau/bachelor2015/veselov/hw04/Client.class | Bin 3495 -> 0 bytes .../spbau/bachelor2015/veselov/hw04/Main.class | Bin 3520 -> 0 bytes .../bachelor2015/veselov/hw04/ServerTest$1.class | Bin 2691 -> 0 bytes .../hw04/ServerTest$FileEntryMatcher.class | Bin 2806 -> 0 bytes .../veselov/hw04/ServerTest$TestMessage.class | Bin 945 -> 0 bytes .../bachelor2015/veselov/hw04/ServerTest.class | Bin 6602 -> 0 bytes .../hw04/FTPListAnswerMessage$Entry.class | Bin 2320 -> 0 bytes .../veselov/hw04/FTPListAnswerMessage.class | Bin 2256 -> 0 bytes .../veselov/hw04/FTPListMessage.class | Bin 1695 -> 0 bytes .../bachelor2015/veselov/hw04/FTPMessage.class | Bin 164 -> 0 bytes .../veselov/hw04/FTPMessageReader.class | Bin 3227 -> 0 bytes .../veselov/hw04/FTPMessageTransmitter.class | Bin 3313 -> 0 bytes .../veselov/hw04/messages/Message.class | Bin 413 -> 0 bytes .../veselov/hw04/messages/MessageReader.class | Bin 2989 -> 0 bytes .../veselov/hw04/messages/MessageWriter.class | Bin 1856 -> 0 bytes .../exceptions/InvalidMessageException.class | Bin 407 -> 0 bytes .../exceptions/MessageNotReadException.class | Bin 407 -> 0 bytes .../MessageWithNegativeLengthException.class | Bin 499 -> 0 bytes .../bachelor2015/veselov/hw04/TestUtils.class | Bin 1492 -> 0 bytes .../hw04/messages/MessageReaderTest$Writer.class | Bin 4414 -> 0 bytes .../hw04/messages/MessageReaderTest.class | Bin 5131 -> 0 bytes .../hw04/messages/MessageWriterTest$Reader.class | Bin 4267 -> 0 bytes .../hw04/messages/MessageWriterTest.class | Bin 3579 -> 0 bytes 04-SimpleFTP/server/build.gradle | 10 ++++++++++ .../veselov/hw04/FTPChannelAttachment.class | Bin 2415 -> 0 bytes .../spbau/bachelor2015/veselov/hw04/Main.class | Bin 2320 -> 0 bytes .../spbau/bachelor2015/veselov/hw04/Server.class | Bin 9597 -> 0 bytes .../exceptions/InvalidFTPMessageException.class | Bin 398 -> 0 bytes .../hw04/exceptions/InvalidPathException.class | Bin 433 -> 0 bytes .../hw04/exceptions/NoSuchMessageException.class | Bin 439 -> 0 bytes .../server/build/resources/main/log4j2.xml | 15 --------------- 33 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class delete mode 100644 04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class delete mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class delete mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$FileEntryMatcher.class delete mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class delete mode 100644 04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.class delete mode 100644 04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class delete mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class delete mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest$Writer.class delete mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class delete mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest$Reader.class delete mode 100644 04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Main.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Server.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class delete mode 100644 04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.class delete mode 100644 04-SimpleFTP/server/build/resources/main/log4j2.xml diff --git a/.gitignore b/.gitignore index 31dd1c8..7318d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /*/out /*/.idea/workspace.xml /*/.idea/tasks.xml -/*/build +/**/build /*/.gradle diff --git a/04-SimpleFTP/console-client/build.gradle b/04-SimpleFTP/console-client/build.gradle index e617f8c..324a1fb 100644 --- a/04-SimpleFTP/console-client/build.gradle +++ b/04-SimpleFTP/console-client/build.gradle @@ -18,4 +18,14 @@ dependencies { compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' +} + +jar { + manifest { + attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.Main' + } + + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } } \ No newline at end of file diff --git a/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class b/04-SimpleFTP/console-client/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/Client.class deleted file mode 100644 index bc9e45b97ac387a529486e7ddab9cdff25115fc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3495 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 diff --git a/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class b/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$1.class deleted file mode 100644 index b076e19686153e1905c509dc1faee1d7f41d9437..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2691 zcmbtW{Z<=A6#oqgY*@AhQmES2cH0Iad~HIh6;mmgf}#n<22rTBZk8cgy4j7plhFDA zzJO2SIkrvpRR8oGAIjsMBoI=gCPz3kd*{yFJHPum`Qy)@e+96JCxaNljEYgrMlh#f zUWI|g5RzC>aRZAgZsJ`P)3_z4_vFTsq~2GN!fiQypkf(!6s#y%Wf%}eJBTG1jEr9~ zf^y!h7w%*63LrJl?Oyujp9*a(a3SX%KdE~h!lz5wq08+Gb~K?C>!5l2&cV$ z&M=&@UA|c<oXcZd_sc$Vqxn7%F7O=eiaWY9KTm-}hQ3<6HeWN-Jzl7u=e2tC7m zSD4d|&0Ud_cn7RH%`nr=rAV=Buvj3A28P;d;jN3&tTAdEd0%z%W~z#-=AWD~>~Y zW3TJkGJUhe1^3&OsX4FWTYTM?;Tdk_!2F?EHHow4T8(c4#WS3?x%G>l=5 z0SqJZpy8Nq!N>`p4k}pJ@DV;%u%Y1-e5xR$A&X4~_cUzbGY$8V)37b4&#|N73+yR) zpy4Y#)bKSPDtM&f8_?}WPiY%VQY3nlklEf01;bF=>RijNlL#@)^`xI+v8z;Uxt-Ej zCS>Ds*Y=D93XHL3iXxRnsK6<^Q&X81w1&%55B|=IH&|^tC@rFO*)}diM0gEF3}aJG z!BY_>v3M7DH|m0_(4jPE$acUP{~v{Ns|yI7YK%&Z{Fe4yLFG;kI5w~%Y{!rlDT~mw zEUL)ZLV~*GT8}YH{e!EIl_sT9)#nZsaMk{f>TJ5{nzk_fmzo=ign~R3oUGL~SNKn} zrl4j{{pb5$5qHXsy{>|DDpg;{L4F*UovCP+ET0O?XyT*HjacM<*{tf#xzi!Cz9XBV zPd*M8I&H4fOW{*URrzH2V!LS4V&-((-OC?xOQbrhmW8(5MN<8X$qb{hSj^{T&#(7g zT2QRRQyX#WYZmrZdeAA}%d38&Qlj+J4?JIAX*OxSeB6=s$%$Z6_YU-lV16RdOO-(A z)bRB@*Inx75fs|`Y{M!Ab_ACrSc%{gy+x$CB<){1ZGVUM&~!JwOV8IL(*vHW?w6 z{Xk!-{_f20P(n2v%tS+>R|wb8{}KZX&!J>zpCdB;6J154hQY>1eTktykc3vlnHtX4 zFf37o>L~Pv&Jz@OaT!nj$cQNs6jA^ zbb`h^G!#ZVv=~uk`VcKQ=g?0Sa5Y*Sc!k5=Q1o$bHym|xyZzBpu7+=aL9qAe1**T% jA&GL5<~~dj9(mO?%@^t;M9y#gjS~06u!=9~y9@O%lr8Uj diff --git a/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$FileEntryMatcher.class b/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$FileEntryMatcher.class deleted file mode 100644 index 2a9e6df7d7304f16d51319c944661a5f0f823dcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2806 zcmbtW+jA3D82_DIy4z%dHkDFtvX)em6uJdLghFV!T1`tOwb-KKNqU-Y+3behO@J9+ zy*%KI#1o&T&h|itr0A zH*L@0%|m0_@u#bnMK<=Ww=sLC(rzbidgo176n)3N!@w38x=xw4>1P=RQkwx=NY4@S zbIzh**p@SGFesNj24BDh^ z3-_GGJx`Ftc+RaFUZudRMuC%r<+w*i4<9pX!lQZ3SiUuS)W{3BM*f87C)XRKh?DCh zp5ZPp3tzZx=~K!91oFAP5v9fLl5x4PLa7)_QyL@9hp7jI1QN{}+DCx+Of@QSWk5VH=$-c-Q%GA|ch zirhFKoK<8oj7dV`b>U!xVb_a=8M^ak$>x65CAzM)3!dekXmE4te}K27$ ziE5?E+lWl5h5<}!=tV+9KXxd1hv9Sw^uIWb8s0^Y%B)FP-giyAq+m+JG%hQc(eNJj zOMh1gkhonTvc;kR*0XzjeUnMM3~eV##*mML*v>; zBMrOjdskwkWoj(qW|dpgLrPw-_Q+cbnhJ+kD#Biz6}Jh=$R5h zQr)$wuio#MsrNSP=d9ycg4>kJnlyHKiJ?EW(3;DJ1bIEw0Z+|JVCYRIldh;ZZqTb~ zF-korHJP5%@F6~m(P!mjDz6E*R4r4t(U%-oA8#~vD%eI((+>=J2XtpiAM!?qJiT1? ze4RcLdO_$meF0Q_(sm!};VUSp=v9$aaY)4_6$2^;RSXkD7-?e61P^vxp2EEf?lP7np;~7ZrG7|7{JXKDxmK~-zLr#_|Pd$ zJ@iQqAt5^njeWH00+l?C+v!okXiKgVvdz#Kq0<5EL>RkhwL&^!8g~r;1tt6h*E5g7 zGQ*D$%ItZB@Q-v9#vXd>busLvnf&bt9I{|04TrFs<_R*d;xlOYoX)=>mtP`H`(ZFO zz|#%ZPiqP2HF~;34XmJX5c^3`qPpKem6fO>glhOtMD8ORemMLGB2x!{rs*?uJ%N(> z38AM@L%4?oZFkc;{5|PBKqUN-EVY8qu7S@Yi6QdXj}%^~rxpBN%IQ}G{%bn@CIGJ? zqN@KOqaZR)Y)RPdQ7H7!Aqa_K7zZ0Mcw{w1vLiBvsEi>Idy04nb;ufVwq|aq?xc(U4?c{({{Tklt4;s_ diff --git a/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class b/04-SimpleFTP/integration-tests/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/ServerTest$TestMessage.class deleted file mode 100644 index 83b4b8c47894f3d3a1adc32883f274c11bff4d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 945 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 Q$~s)mb+s!0igEw`1*R(^`2YX_ diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage$Entry.class deleted file mode 100644 index f08a8b03216ab45162369da0d5fafba6888fbf0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2320 zcmbtU>rNX-6#mAyT^mElnuLagupuTGldup-X-YyuxTH=Dp#dR56t!zJF-zCG*6x}# zeUmS8FX5(yTN1_?Vl~~{VNi;@`kteEEJjbvqGYprX*DcSe z@`ANzxJJq3bCzX$x@Xvy%W%DDI~8r0dnHFVELYQy549EBTdA8S`4~9sWBpC-w4V;c zT`(M8_H5@31KVOq+%qi0n`O9|YlXEnvO%cl?QPC*u4q_%rCu#@XI&?Jf`?t!%?;f# z#5&xJc{>IHjxSoC2$3#W7I)@N-E}!_KPWnN&8?O6x>nN5JKVIL+v5{=v_0;Uyr=EF z9-q>d)>n&$>&;p2Ywj#_*VQXL>-!^)*|Qv1bw{sqk2|LlCRMn%>SwzrH_}RsA(|T@ z_OfRO6=3LG^YrpJ%X%#&l3KItPMI$mg6gGqn8rjI)5t(eBaO~9&O>47JzLyIb;I1| zP8#EwpoFL|wwo1rnTCq15^gix|6h4w=su46th7r7X6W&^3|m{{R3X#&E~pw2r=lkG zT8&%V47b{py)|JW2g?8SM*?LypUq|+Ub7v)U1>2+y_GABY@{)XsT5tHJEwRAg^@7L zFgxc|>Q!!e>MPq(ABG*T)|#bPhlku@)qbT8xno1FTCKaDO1DQXan+)$A>%GX{>Y5F zWyjt=tLt#D?pUGzjEuC5n=<-ks4_B?Fp6B&DXn+gB<#hB4hzyh)0)GXG#+6-h0n0S zFnCaqT56F-yxE}@($6T=_ra``m2E&KEY*Lk%1qO`I2xP!9|i4dRb+R z(V0f!#%XVYUK@5!obUF+%neZ3I}- z!C{C+_!E?YX+IXpMTx4}CKWwFWa@bgkc9}P(JXA^6e{{72@#)e5F*|ZVwRNYZ3uDh zg*YdL@%I=!Kx}j0cNKY$gd)-JJ!C;3E(kQ)B-*f459 zzf$W?i8~umV}JRz1{>)6f!u*82cK{*&pEn>Y_Zo=$n*D*A4?@V-nj_I5BBb>z zQlU%AMeqrqLe4eEW>mSq)<6f%vor^uTQLliz9zN z$`YO(QgOnQHY;kbz^cvJ$J)`2IP&>50eTXQFR29wi9v+m_0cRIgd|3B3CVu|D`?ti diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.class deleted file mode 100644 index 846cd59e122cc6e29789985f15dd5837b8364980..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 zcmbtU?^7F96g@8q*$`4n1EoMwwr!AKmZg>2A~Y6LP?!{}K}Ph0vq@jW;$}CqyP@*e z_)TW~q%%4=GU`WX{73vR#Pc?bgb`a6Jmtf!I04GlNb zh~ZW@x{%W_uHh{W6B;H3x>lUP+ZV{JIga!Sw(0xQ7tkuM6G$fz=qv7;d#2F{EZZnr zey}LeU9zf<88kd8@JX9{spvHfzg{*QM%k?FNZa-9&fU3Z>`9;Yp0V>{Zr)hke5#<9 z9sh;&o=D#}t1=f7S0*nU>=l z=Bd-zaD$D8Z4+ax9bLGst3!IXo@WWzRGBRe34bbOt@h z2;6_gs$~6#$hPTJjgQN_vci_Q{c>PYVGBHbx%mHS34!>e%GYpf85CUGCKq-@Sgcoa zxtu5Kt{0X+7jrD&$+fAi3}*0lnr(kuAiwNY8#Oky{@nHSM^Ufn^^>&g6XX7b?mpMY z{n>F}uQmKYXW!{%sXJ_{6byms|BkUzcHC#}v7Y2-!HMGUq|lSXcnYH_WX~vB3OviH zYPc_uB$=8?RTrZ7g;F;I7Qbv(TZ{UOQ319_Ww3zv(s%%N(aqCztx=+?X`j4$<(rDE zE5$TC6u8>qHYHaU@28Q+BYr{7A(i+Ik}WVFq)||j{T*m(SP>XGg@~H1<@ARFmxx&T z`iWT&I~_NerzH6C<;beKMI4v-8IPeCmpLn6ALlC^DTscAt9TgQj|2v|U*{a-JUsI! zwD>QWoj!z^K0<7J<`D6pk@%6$1P1v(*bKxq3~|LH;gu{j+8Kg2cY0}ErQJ(1DOwqx z8{(NY?(ynW#Bd~J)eWJL70K%ynur(+jN*-m;kr6T=YS$L{Sy-8wN0`KlKp}E@sM1T zz(7P!5m2uOQPjn>OB(4n)p@g%IuwI6`qHWac#=!;E%j9xe~*06e-OL*Q+vuD&CVSl zmA!j_co?B>RX^od_Hgn5S{J>)AsInL(luk0jQVyw`%dWqJ)Gw`H<8ZYHMX4y{XLxT zT^QGueV2Y-&1^1pPoKfkR3`q*6`pnjsnNA%7H+P zrZ{G*B3r}iv8ukNr^D*n1-`TAE{cq`pnOgW>&@{I6FNq=G3ZEhPE+_4Q`U{{e*wH3 B5#9g* diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.class deleted file mode 100644 index 67e16b4c82b209b9bb8cc40115834c04112e7f4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1695 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 Wcj$rt-`jbgxwY%4eS~{-;pA^Nv@L}I diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/Message.class deleted file mode 100644 index 3ccaef442b7cb7f053d4349547d241b2d826b73c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmbVIO;5s55S%TADi#s^Nc;!t!3PQ_jRy%TNyP&Vi6`?~UrI@7OAl!MjPEz)3k7k+)Ngcn_m;?R|MWEpKNOj3v<+Y&omoToO$fmXh;HT);&I zm*ga`;Ie`%0!p#0S(a`J^o}oT%UaGd>|D6!<|cJ*UMraT*ovp04HQQNIwq@@XH@jO zwQRTs#b+$b_B7A1Emz>+xb2j3i@H~EG{bUpG`}v)P1xQ<)ii0N^JN>;D@&X0sD?YP zTP3e7K?sQ30;=gRj8zvFbVs1AhFAg&mT5ax(Op+7g$n}R+aV$x$&lL`P8pWrjS6J@ zYKFHBMgL8K*jamC7uY#&So%b@QqY}gX-^!$4-9XN6yF~<*F zw6C9`YY0NeIOZ9kDNifjy{avRsFLUJ7xg9o{1l7}Buly%Iwirr{<$%MxI=870L_tg za>}kcMg4-|Gu;I6uuLNrT^Ll+f&Bu5|ADK5t12dNO~o5{Q$;&=E4Z$rA0McgL{`NV zrd8Ykq0GLHd3}TEdQ@i&uRNibn7zw-kZ&8oP|=Au1t$KV1LnLuxjL&eIKnbiaSO8o zk-0Gyw=pen;&uFN3c0{8zjjT{D&?*f7WENSoHRrEw_+DR?MP4fzfrMt7%vO(S zyQeSTUrYa*67#O-Uo{A6VoL-4%sjQMxs!T@jlr-=%&i5}SR$ytdY686%X(xM=B*&* zxHYahj<&*Q(X=fBZC&3~$C|q+)-^VV=I-upM_;lXzvFN+AX7Qte^bRAK1{NGek3q@ z#wk@Ry5(gSY$tO%Y)_e`^?J(m_PD(ndm+=~9`127m8$Dy*v&EpJ!7$PByfk_Vq+Ui zux!u2tn27r)v-c-ErIp~E+;UMK-Z>YoAMlnL;<7HKrj`J#7~5Q^ce;UBXdD)>q&>f ztJhLtU@?g@?g|{Jy5lnP+>dW!kY|N7wjY~@SHkdvBXB=>2+qDBwVT4 zvIR^9Re^mq6JZyt+kKC|TKT>MVo1xPM+AE~Yk~OMqPsw$~wUq6E0e!??s4U-8i-5N%eb73Puz z662nxS28aN(JGxb$t7v)#R}MX@KPMdFpT!qQ?}?pLP`<&7pRnZ@vQGG>9Ggvdfmt(b~@*lKKmmLM6*gWjY!$>L@=v%8`8 z&A-DZ-#X*?;*6!JBR)FgA7wpv6B_8yj?-jz&$;)Wd(Q87K9Ya_{rw2QJj!wCNS#AJ z-q$b{M;aNq$VzQmzH;*QK|f|-N^MrdoQCTRTD8F)N7xKg#XY{yO~-Q0?w)U!JuBc9 zTdX_@#A?Sd&oH*xb^@y@3eLXeTXekaIBviL%XNH)YemG5M;GttYM1e)=lyT1|Ki!#!XU$4a!{&ywrzW+Z4>#42C(+NR&C@U~gu)rPQL@A~ZAO>hOrpt zVi-D=`BLB!4h>&YlE`_JQ+gJ<=)=-<4D!1jLMN(~?~pZ}^fM?~EqCvvTgeH!>01+rLE##MgBEb^f%S?KbyvOMoP`XLzq=M1qNeUos%Os`g1VL3K+~06c zK^JfQ2O{|t5%p)X=)l%H)?L^VVw^mH{#MQ-6T*o?xw^!t8WI`R{bF3UE@?8{_lSlL zRuXsm{)B$zC)yjPM}8y>sgLidiMyqz=qLF(Np&ZZ_@cBEO%zIp*!Tkv9)A5CTYrT& e40`9FzM!-aV@1O~4cjj$X|G#RlxuWHLGnKiLbfvi diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.class deleted file mode 100644 index 6b6dbcec20a3b3780cb80f432b502c82c4adfec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmb_YO-sW-5Pg&8Lu0f>uU@>V2e(Q+DPE+45R0JnzDbv6Wt)`UB>J~J2_F0b{wQ%$ zKW^TffycZzpUnHm>l=U(1~GcrjIb4W+VleqCrsxJ_*%+%l7m$Yfq9Q`wW@@u_H)2CM#A9Y6$vXu#Z1cb@|o@l*W~v1pXEi5(7VgABDJ- zkBtqV^y=QnXW!}GKVIJejIkMGfb|F)5r%~DOxLRM&(JXiK! z<`t8z)D*IsNUMAQ4gIFnj&PIOR=7njTanA6RF$#EqoWhiDaUyy%E!@I%$0L;rkqeu zg<3S))J|M~vCK5LN=`3-E=~#YooQ{Mu5{mf=a0I>2ieI4J_17azatQ~`_Dxs>zVi+ u47>1ndHo>{Zp<386H5;S2QQ#!1|A~TkTLkd3Tv{=1FRxuM_6O^kbDBCb!&_O diff --git a/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class b/04-SimpleFTP/messages/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.class deleted file mode 100644 index ad1b06c506aa54dab7fffad05528eba57e44f3b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmcJM%}T>S6ot>ENux1Z@eN%0vv8`^mBo!H2r(O_BCaOsB^gPRl9@zb%a!252k@c9 zn_Arpf-`Wq=VR{WT;~1b^$oxXn*n-Q_p#w)AkZJ{QrlC3-tOK+z&)#`Bru3{NpUkv zsJ>B2!DK6{QdLY;tvkPjuFbU(xR2^ant7rcnW!|UqNGAf6dG@LBte!3`^{;iC4iih!NK I8moiw6ROsak^lez diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/TestUtils.class deleted file mode 100644 index 7d77f134960d05ac927a60d910fb106a9940316a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1492 zcma)5U2_{X6g{%nk+X5r#7Rr*w$xAuoDZ@|n*zn9BrYvAI0=J8XM!IX*_CaDwbrw% z4TJ~&4l_K#OPb-M@Wu>3ig2|KjbQ@QomuJXN;>D>bFcpR^T%fZ*0AluMUmqb7q8-m z9ZGhXbMYEp=P0|F#{$P9#}dQXU8R+|$B-`1KW1?52Tvr!`MT0_EAF>sxFcFVdGht3 zE&RtKRCayhbWBf049oQ}_M$;c#9m9Zd(scWn=7lgy?q&xz3=tDTv_vWWMn=y%8x1x z(S^cYVr(@;L3g4$1 z8_Mbu)uMjJArf8ejJ%1^+Yk0 zCJuE`Q_-`yo5f-l`7AE~9YYdV!-PtAIW~yD6NG(1iQFj{RBO@5`?68`P%q!B=fLu-(e>0mFqesBE4SsJVEA52-X~Fmu!y&JkSu zi%l^|o*q_77MET-;DFhtqwyTAJenEJnT4ldKai2ac^d6DIWdK4nkVTWOFZKQlgA9w z$>opfv^`hgM@SbA;T$4!h_TD!lR;}+>>!Uu=s4>-skVLD;Up&X-zohuNGs7|qB&R3po^$tpXYTiPKi|i_^N)Yu zdKbWBxShgY45V-zCz|-;!;Kiia0(+hEve@ee53(;aHbKX7*p_kBgQe2!V5SnsdFi$ zFe#~zO6p@Nd>rQ`^`iXKQk2X~sv!TS6ciOqE0_^zoYGuv%$l$bR~JYR&1&;nuId`4 z+>qh8Jpv7*#D;XD=55U|ot(D5m>aR&k!q<#9S>~OF}7H#*ONGAn1 z_8%G-hz(d%bacm%Vd^8*a$dK`G+GyE8nOynXs=2&Yn9)m?{b=_ikLTufhxB}IW}*ABTv>M40E1akO=08YCxVg zhq>Hy$PYwGGpD)e>eCE^Kx$n?;Lv+kMnLjjBn5VD8DN3?3RT zS}KV_Mnfi-Kt%3-+o-D*=7zP3hdmQm!4bN6;^l%~@zO$pA@J0_?fG4`CPRse{UKtNFY^VEeqd1UX*^waoa`s8zKK`bk4( z+wM)t&?O5?#X-y}m{UBS+3*ST4h*wXRIk_M*?OV7N<%Yy((UUt-w*?qN-qC z#R6Vdv4{%-+w1F8#eN)6@Cg;4#6^K-Z?(QG**{c#3YQdIR`F@PqT(~SsN%D@q~ddu z`aE7$@C6lL#A|Ym=D#HWI&oOVm+=)9uj8ud`mnQW$hNSS?;CJm z+m$CUHe*{0eql$mvhIClUf=4oZEaCjHIdad!rYae+#KQ{D?ACGF*oY*_oVQ3d_&;j z>>Y(dK9hS7z9|sbDwWbAdsa5AxL7p{UcsIW24e!4yCI#P8@ojuh#Z%xh_~1G=68SkjH{`WL zwim6a$vhy8jXZMJo)o-66oxEou1XL88BX~?f!~=;OYD%DYUDf;R@qBS}Uz>ymp!^_`NLYkm^8>MC>5mPT?B;-QE98L0+L=^Ai^*Vz0<9^Nw zzJGvoh9e2l4DTty)5%rD2e}r7NP13fgYb3u zo^^0d5rNY}p3aC%C&g12#fc0_NYK{}KgZhr^Kn`jjHKGO7GJxi82S+2isldCcQQhOLl7bma$Xf6!8*DrCyn~enQDz%M=FA-?P<}JUpmF zrutD@k=oMj@2+51JL9#C-Atj4_S1NpsKZ0uw?CCm$yVs=iF9xm)FUSLUm+KWoBxXk zw0!OikEWk2A=&h^B}6?5nGy0Q`6VrfETGy*EHQ=2{b%eAOd!j3`I9n|?&f$RJkCa& zem=T{X3oFh+{pQtoPCR1`a{NiI|TFJuv(fxlsAHg;UW6`f;%V^y{eeshr&t4yzeRyKM3m6P0$OzaQQ`BNCgvq6u3hNUYLzuyaJ6RADyk!`HU L@33IMi+%qAU}H?| diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.class deleted file mode 100644 index d81927beb30b680b46e51e1de8c2e6fef65c6346..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5131 zcmbtYX?GLX8Gc5RJ+dsYEn~+v7zCJDUcxwR4RL_jhJc9|iVf6uwy`|61k#K;8X4%` zG~Ju-YudDFy0{HZ8@gZ-5}GePJ*S^~PQUjr^m9Kn^m%8-vb-fge9p{W=DqKIo_D$L zwf^z$o3{ZRz*`Y)$FPc#2u5)xf)C@Yim_@0Fdo4k=L^kJO@33X(S_T=HkEoNL!Y5`Bk%MoXmHq08n!iLm~&3b7g3-lQ##>h6toXr)aP~0Ok0{im)Asvpy|Kr z7z3UlbyeD~W(B?X4~uFdC$1!ooRhZ9yb9W_`E0>-(plqtI-lmAeWqzSy8Br{?T}^9 zX%`E$q~|Sr*%E zR)k5#WywJWPbP@1bIjv2ONR>4jhPoyPj8`mt`D_Io9PV7>! z=dLnJMLr4#1r_sAT*egz^`&)^c>RUhS;LOvDn6#-<57G9pN!&D__T`8MDbZXAH^vQ zs`y+KFW~bE4&V1tA*jC~`+QNwmt>zWtN2P3U&Yr{ycosT@r@|HiEpX+b`;;iccb_o zzAvAD5XBGiqbOd&kE1vO9(Bj>8-pabZ+U_969q>;kS-n_t}!#ZIj4-X=bc!D_7EI&lR$U=?v=*4{e(V zc~Cc*LR%8+t_{iQp`gj%N>1Ws|Mzw<2kVx(44RHHC*?++*E0oUbe6%G7%bQ8OAu7( za>_6jJX+4dN8I5i=o0I^Q<$FSVWN$ia~9h%e@q?Sci{$c-Z>|oA<;U=uQbA-&pSCP zh)+(GwsIS7v?UYGA?iLee_2?bNURUk`%YinjZV_&EHmzVmN}`_tk{z)jNWfq8AGQj z8xxb|ruOHlzd>-M^lZ|mEwp9F2c(QIZC)0PKJwKosHtT=O?|vm*o@$aTrO;9Jf(Bc zwT@q1d#uqaq#|>MQz}uRgzJ&rvX`EdtA&=dvRRg7O+fC~T-W(N4LjCS1~s_lp)3K! z%>*4WvN`9f@9!pt`FbQMx7Ty$T7VlZsMKd>`ZBzxgt@bnCdN^XTagAV(_w9KOJG-G zstnVL5MQ$uE16p*Xp*|Nwl>?yS+-k{IOt){Fj&t=@iKlY7rvh#oPDf+vC=3d{2Jwo_su8$UAWsyZE#bH(BPw_&Echw2ZYYWzDRXwGF3Wo4))n z!srVl7slx@j)ZY)#Zflq*kr8YHPRrSti-|L@;LAWde^nb@+sm=Me#el9>F#IUcs*A zuY;Kk?^l^6;-#}v#T$(Db#@br?Zh7=xQ;)utgq3;ONV2WsrgF;H$<|29hfSLOoC+< z{tcjP^_$$QmA8NStAfJOF1~kjq_I`lR&*{xxz0`id-#relXwvA9JTSObZ46RPH=J1 zUHm#{gZwrX>n$Sq4gy16MTFi##Z6QOP=s1UxHI%NswRTLBCi9BsJ@A402gjy(?r)I zHV=2-Kur;~AwEUa6%pe^eGyxVXegqQ<7G&3Zz~^C70#jqorH6kaJtY<-~zLSkbrGu z*@_34-n<=x!V(+?9Z<3AKmMz9jauIZ#49P0NTIno6k4?OVSFPE!d^jSnYA z-pe+O(Mq6Is<=-K2k`(7Z4Bigp&Tkf`4?1oalZ1c@I){)J`t)IpQxxDA6kMo+`UnR zRMMafp9fY(NjIZp5IiZfE0R!2&w2f=4qizGgTM+mc-Q6MoBz%aiF-=G^a z+X)(Y6t#GaGDmP6$0*T@4Czv)1+S^8dRcP=qrMDvQwC~Al>}jUKYO*Iuc93LGljacL!x-m(|0$fI8GsrD-oO z6=#+kfkEB3iA{hJC*aGU={+ewy+Xc4X4r{SUEfFl*M97t|XZss> zT`2b3_gUA;b?p-suKZ@%s=`}R#2?n>BN&BG;ufw?KD&rNFJSX6+>q`f5&o5*c+cni zpJ<4Oj;px#G#~y}b?pvqqVU%Nc9lD{vENs5^9~P+yB+PgYsr;5-)mi9L!HkNEE86q XTa3Ra$t%Fbj23Gkckg$X z_vRn}e*4b=?!)iX*o%{C3}Yn6g|itHa4wCHqnN=M&MO$-g?3!X;6YqeFp~bZcHKSe`L&IDl$1?Q*`Q@TPx{xt)!P1jEe2tJ8;ka+LGaNyreBG58S6!4cFD@4Obfr2Gfq| z@l?b0Is>sZBojedAa=PR(7DyN3%a9M4YF=>28k~N#Y}EWnP(at5xINRxOIM7t3{SP9S4*>cr)4a64hXdO z6mEimC2%T&O(d1#}s@;#S{3d zWcr$lgZQw5CkfsEA{mIoh7N%PSSw^PXhilF4>XMPm7ZL1?ByVzn|frr2g3YXHS9S0 zicDr=Z0J>iyetWUyM2OST^6YcpJFhLuj46(^X7O7qe2$Sr&(9@TCK7oaG)nDYOZdT z!`$=EgkuI`$A*)(9wv~gG6!r*7Z~h`sI{Z4=wYF#P-&vI?UYfwQei6Cjx^u1gF3!{ zlg6QtbxLZxcblBx2mz%W2oxBIYPwBEG|fWT1iGWn+^99%$`q^Oyx|Qy^Ytog1`jpe z)76?stm)cIoGx-mY-Iq8U>X?as}$tPeTQx|miqEY4j!F;9Rj#0IjxVwvk#$u2* ze(a3t-U3;xCaXZAr%>pn2%a>;`tx4}wt{C=d;{NB@lg=f0~_HjjbAjhqFf%QfHK<#y-oxqO##mpQyCh#S@)jQ*DLg08 zx6Vd4u~KiPbqqd*tdRbN6naw_NTHO%!4&e1n&dk$@Qi|&>0#uW(6kyyk2P-zJ9qX_@yjv5z(O>iC7-LN@Eqj<|AtZ_fQgV zY|n^@xthl7lCpINH5L4}QTKd{!&gm&`wgDe&Nr>V``B{w;zASd;@dWc_hTRXB-i(| zznd)u(F%W-;A$QpAngIJFSC!a@9Y0Nl&0(WVc%O2ef`%Fdz(ABfp`qpk+^|m41b04 zN2J~)brU-I-yU$H3q71s271}}2=(_8JoA32I83@D)axjBk8wqEiWQ1^c4ATt(id^4E;@ow#9**y8i@%KKP@qqDIMJ49i@%Cy z((IXjA|Y1S{?$g!{Nq!S+qY6;G(^>(p?3~Jqd7EU9j&Vvz&$j#70=^de1t}xfW;3L zjrc6H@8u}&V>yB>u{=S_2MF6qLNm(QDSpbF##x-fL;RF^1n2nB86)R7Ul$j615e;t zey2Rg{v}NNxDO$dS|g-Q3fdJssPMZ*DEz8fLpS2oknAlyEvm?|$ zPK}Rli>?;L_V`|GCy5NXs57&})c9E7OxhgtqbAwce+_LCr5kV(1%eg)q&wwU zwu8}@dwvzE+>5Jd@;SP=Cx4P&j%DkOw&W^tfRDXz0JgZ`V9M@+=5TiO9!mCnMCfVq;F;~`KUUx<`*}$Q|i6m z-ofgnhu^|$WPb;*%i(Xx{uh!6KR*A4Jw5SL3SKeTM%mV6so-}VhhmK}6^<4BZVk$N zo^}5pC}R1Y9iSOWB Gxbr``G#gL= diff --git a/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class b/04-SimpleFTP/messages/build/classes/test/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.class deleted file mode 100644 index d0b5b4a355a4fb46c1c9b2cbc4e494c7c3275192..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3579 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 PeG!%N33*sPiSYjc+Y|9v diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.class deleted file mode 100644 index ad5db551eaf69d3e64cdb0e25d796f5af4d97ba4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmb_YO-sW-5Pg&8Lu0g}KR~>x2e(Q+RlJBrC5m9_eUmQDO5Bv)B>J~J2_F0b{wQ%$ z)SEYV;4$y*%)DVfKHuH}46zxbhxG^>5&DGiR2yBN5qf+3Q-Xh9%@m=ZYNKwO$4uFY z%t}_a(khqbR9fBfZ_%#{?FiSYZG>B7vJsig3sqM3cyM$gTID!zMe#Hk3iX_;MXf92 z#Fc4fsb}NK-Hmci&eg@w--r<3SB=fpSa+^Ff0rIU$W|us5fCo_%b&2_jTNOdbMdweJVcBk%ix9;#$=fXSVhc?u*T>i`2teXXMq3! diff --git a/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class b/04-SimpleFTP/server/build/classes/main/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.class deleted file mode 100644 index 40fdda199fbdd0709e62d685826d8e6fbdbef323..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmbu5y-ve06ot=C^8+DJ#Ky=547i{&ff)FyKnkc5Rd*+~h*5|uI|;lN6A}Xtz(XN! zDqv!QYw75mPuIRze*buV12DvTj2>1atVQS(!ed?O`h?Ki-kB2oGc!|!eyS^V(>!F# zPGnXx*+@+;%c-=w%U{s13+)K!scnRtXR;BQ%nMZ-dob8P6s>aXTTwg?hC)5%YF=wo zIdN6BvedJ&tc#0pdPInCO=EL4(%rnx-cOp2Pl^|9P>4ln>3x$fW+i4zHi^ELC&7ac;6sU% zq8ITZI0GN^{g~aE-S>~zHvl6HLiDg1U@JhM;GgMI*XM-Z-u|56UYLa<^b=jGN%N4Z zY9`Zy$#!BgSb5u>#~)FUc|H8 wpHILp9RA!ch?93@_1TG)2fTw9&@%%E0jtj#d|-_=TGbxb5was}usVo70m(df2mk;8 diff --git a/04-SimpleFTP/server/build/resources/main/log4j2.xml b/04-SimpleFTP/server/build/resources/main/log4j2.xml deleted file mode 100644 index b8f1cce..0000000 --- a/04-SimpleFTP/server/build/resources/main/log4j2.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - From 164871ef0be47209e23c3b04008f7fc101c27508 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 20:01:37 +0300 Subject: [PATCH 31/69] Add check for appropriate number of arguments in console client Main class. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 6a64e1d..855cb3e 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -16,6 +16,11 @@ public class Main { * @throws IOException any IO exception which may occur during reading of commands. */ public static void main(String[] args) throws IOException { + if (args.length != 2) { + System.out.println("Two arguments expected"); + return; + } + try (Client client = new Client(args[0], Integer.parseInt(args[1])); InputStreamReader inputStreamReader = new InputStreamReader(System.in); BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { From 35c4afd6be41015facacd0ca1ec4d2e651d6fa4d Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 20:05:40 +0300 Subject: [PATCH 32/69] Fix order of try-with-resources and while loop in server Main class. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index da1e730..7acb262 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -20,11 +20,10 @@ public static void main(String[] args) throws IOException, InterruptedException boolean shouldRun = true; - while (shouldRun) { - try (InputStreamReader inputStreamReader = new InputStreamReader(System.in); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { + try (InputStreamReader inputStreamReader = new InputStreamReader(System.in); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { + while (shouldRun) { String command = bufferedReader.readLine(); - switch (command) { case "start": server.start(); From d263066418a6339596023e58369ccc6bf05c6be6 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 20:08:04 +0300 Subject: [PATCH 33/69] Add log4j configuration to client module. --- .../console-client/src/main/resources/log4j2.xml | 15 +++++++++++++++ .../spbau/bachelor2015/veselov/hw04/Server.java | 1 + 2 files changed, 16 insertions(+) create mode 100644 04-SimpleFTP/console-client/src/main/resources/log4j2.xml diff --git a/04-SimpleFTP/console-client/src/main/resources/log4j2.xml b/04-SimpleFTP/console-client/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b8f1cce --- /dev/null +++ b/04-SimpleFTP/console-client/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 76f4079..d173688 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -26,6 +26,7 @@ * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test * TODO: add javadocs to exceptions + * TODO: server arguments */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From 87c2afe7ea88300898305a05a5e16bcb4da077a0 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 20:10:49 +0300 Subject: [PATCH 34/69] Add command line arguments to server interface. --- .../main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 7 ++++++- .../java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 7acb262..2d6f983 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -16,7 +16,12 @@ public class Main { * @throws IOException any IO exception which may occur during reading of commands. */ public static void main(String[] args) throws IOException, InterruptedException { - Server server = new Server(Paths.get(""), 10000); + if (args.length != 2) { + System.out.println("Two arguments expected"); + return; + } + + Server server = new Server(Paths.get(args[0]), Integer.parseInt(args[1])); boolean shouldRun = true; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index d173688..9b03ea8 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -26,7 +26,7 @@ * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test * TODO: add javadocs to exceptions - * TODO: server arguments + * TODO: check if it is possible to see something outside of a tracked folder */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From df1fc32e1490f1fd22cb0f49bdb17334c3a88711 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 20:45:55 +0300 Subject: [PATCH 35/69] Change info logging in transmitter to debug. --- .../bachelor2015/veselov/hw04/FTPMessageTransmitter.java | 4 ++-- .../java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java index 48fb7a1..2fdb1f7 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java @@ -26,7 +26,7 @@ public class FTPMessageTransmitter { * @param channel a channel to which new transmitter will be writing messages. */ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { - logger.info("New FTPMessageTransmitter ({}) is created", this); + logger.debug("New FTPMessageTransmitter ({}) is created", this); this.channel = channel; } @@ -37,7 +37,7 @@ public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { * @param message a message to add. */ public void addMessage(final @NotNull FTPMessage message) throws IOException { - logger.info("New message is added to FTPMessageTransmitter ({})", this); + logger.debug("New message is added to FTPMessageTransmitter ({})", this); writers.add(new MessageWriter(channel, SerializationUtils.serialize(message))); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 9b03ea8..0ea57f4 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -87,10 +87,10 @@ public Server(final @NotNull Path trackedFolder, final int port) { selector.selectedKeys().clear(); } + + logger.info("Server ({}) is stopped", this); } catch (IOException e) { throw new RuntimeException(e); - } finally { - logger.info("Server ({}) is stopped", this); } } ); @@ -132,6 +132,8 @@ private void readMessage(final @NotNull SelectionKey key) return; } + logger.info("Server ({}) received new message", this); + FTPMessage message = optional.get(); if (message instanceof FTPListMessage) { handleMessage(key, (FTPListMessage) message); From 667202a2ae8801b45dabf5ffc7b502094c8c5131 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 21:50:38 +0300 Subject: [PATCH 36/69] Add closed connections handling. --- 04-SimpleFTP/.idea/uiDesigner.xml | 124 ++++++++++++++++++ .../bachelor2015/veselov/hw04/Client.java | 8 +- .../spbau/bachelor2015/veselov/hw04/Main.java | 4 +- .../veselov/hw04/FTPMessageReader.java | 48 ++++--- .../ConnectionWasClosedException.java | 3 + .../veselov/hw04/messages/MessageReader.java | 25 +++- .../hw04/messages/MessageReaderTest.java | 7 +- .../bachelor2015/veselov/hw04/Server.java | 29 +++- 8 files changed, 217 insertions(+), 31 deletions(-) create mode 100644 04-SimpleFTP/.idea/uiDesigner.xml create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java diff --git a/04-SimpleFTP/.idea/uiDesigner.xml b/04-SimpleFTP/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/04-SimpleFTP/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index b28006c..0189f98 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -1,6 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import java.io.IOException; @@ -48,8 +49,10 @@ public void close() throws IOException { * @param path a path to a directory which content is requested. * @return answer message. * @throws IOException if any IO exception occurs during interaction with server. + * @throws ConnectionWasClosedException if remote side closed the connection. */ - public @NotNull FTPListAnswerMessage list(final @NotNull String path) throws IOException { + public @NotNull FTPListAnswerMessage list(final @NotNull String path) + throws IOException, ConnectionWasClosedException { FTPListMessage message = new FTPListMessage(path); transmitter.addMessage(message); @@ -60,6 +63,9 @@ public void close() throws IOException { } catch (MessageWithNegativeLengthException e) { channel.close(); throw new RuntimeException(e); + } catch (ConnectionWasClosedException e) { + channel.close(); + throw e; } } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 855cb3e..df5a608 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,5 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -15,7 +17,7 @@ public class Main { * @param args first argument is a hostname, second argument is a port. * @throws IOException any IO exception which may occur during reading of commands. */ - public static void main(String[] args) throws IOException { + public static void main(String[] args) throws IOException, ConnectionWasClosedException { if (args.length != 2) { System.out.println("Two arguments expected"); return; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java index e2607fb..78cca3f 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java @@ -2,13 +2,13 @@ import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import java.io.IOException; import java.nio.channels.ReadableByteChannel; -import java.util.Optional; /** * Ftp reader which allows transform sequence of bytes into ftp messages. @@ -26,17 +26,15 @@ public FTPMessageReader(final @NotNull ReadableByteChannel channel) { } /** - * Returns read message or empty Optional if reader was unable to read the whole message. + * Makes an attempt to read a message from a channel. * + * @return a result of reading. It might be READ if message is fully read, NOT_READ is the opposite result. It also + * might be CLOSED if remote side closed the connection. * @throws IOException if any IO exception occurs during reading. * @throws MessageWithNegativeLengthException if the length of the message is negative. */ - public @NotNull Optional read() throws IOException, MessageWithNegativeLengthException { - if (!reader.read()) { - return Optional.empty(); - } - - return Optional.of(getMessage()); + public @NotNull MessageReader.ReadingResult read() throws IOException, MessageWithNegativeLengthException { + return reader.read(); } /** @@ -45,22 +43,42 @@ public FTPMessageReader(final @NotNull ReadableByteChannel channel) { * * @throws IOException if any IO exception occurs during reading. * @throws MessageWithNegativeLengthException if the length of the message is negative. + * @throws ConnectionWasClosedException if remote side closed the connection. */ - public @NotNull FTPMessage waitUntilRead() throws IOException, MessageWithNegativeLengthException { - while (!reader.read()); + public @NotNull FTPMessage waitUntilRead() + throws IOException, MessageWithNegativeLengthException, ConnectionWasClosedException { + boolean shouldTry = true; - return getMessage(); - } + while (shouldTry) { + switch (reader.read()) { + case READ: + shouldTry = false; + break; + + case NOT_READ: + break; + + case CLOSED: + throw new ConnectionWasClosedException(); + } + } - private @NotNull FTPMessage getMessage() { - byte[] data; try { - data = reader.getMessage(); + return getMessage(); } catch (MessageNotReadException e) { throw new RuntimeException(e); } + } + /** + * Returns read message. + * + * @throws MessageNotReadException if message hasn't been read. + */ + public @NotNull FTPMessage getMessage() throws MessageNotReadException { + byte[] data = reader.getMessage(); reader.reset(); + return SerializationUtils.deserialize(data); } } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java new file mode 100644 index 0000000..f735a3d --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class ConnectionWasClosedException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java index 11afd87..e1f60c5 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java @@ -35,15 +35,19 @@ public MessageReader(final @NotNull ReadableByteChannel channel) { /** * Makes an attempt to read a message from a channel. * - * @return true if the message was fully read, false otherwise. + * @return a result of reading. It might be READ if message is fully read, NOT_READ is the opposite result. It also + * might be CLOSED if remote side closed the connection. * @throws IOException if any IO exception occurs during reading. * @throws MessageWithNegativeLengthException if the length of the message is negative. */ - public boolean read() throws IOException, MessageWithNegativeLengthException { + public ReadingResult read() throws IOException, MessageWithNegativeLengthException { if (!isLengthRead) { - channel.read(lengthBuffer); + if (channel.read(lengthBuffer) == -1) { + return ReadingResult.CLOSED; + } + if (lengthBuffer.hasRemaining()) { - return false; + return ReadingResult.NOT_READ; } isLengthRead = true; @@ -58,8 +62,15 @@ public boolean read() throws IOException, MessageWithNegativeLengthException { messageBuffer = ByteBuffer.allocate(length); } - channel.read(messageBuffer); - return !messageBuffer.hasRemaining(); + if (channel.read(messageBuffer) == -1) { + return ReadingResult.CLOSED; + } + + if (messageBuffer.hasRemaining()) { + return ReadingResult.NOT_READ; + } + + return ReadingResult.READ; } /** @@ -83,4 +94,6 @@ public void reset() { lengthBuffer.clear(); messageBuffer = null; } + + public enum ReadingResult { READ, NOT_READ, CLOSED } } diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java index ad00305..e24426b 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java @@ -21,6 +21,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader.ReadingResult.READ; public class MessageReaderTest { @Test @@ -30,7 +31,7 @@ public void testZeroLengthMessage() throws Exception { MessageReader reader = new MessageReader(channel); - assertThat(reader.read(), is(true)); + assertThat(reader.read(), is(READ)); assertThat(toObject(reader.getMessage()), is(emptyArray())); } @@ -62,7 +63,7 @@ public void testCorrectnessOneReading() throws Exception { MessageReader reader = new MessageReader(channel); - assertThat(reader.read(), is(true)); + assertThat(reader.read(), is(READ)); assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); } @@ -74,7 +75,7 @@ public void testCorrectnessMultipleReading() throws Exception { when(channel.read(any())).thenAnswer(write(extrude(ArrayUtils.addAll(TestUtils.toLengthByteArray(3), data)))); MessageReader reader = new MessageReader(channel); - while (!reader.read()); + while (reader.read() != READ); assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 0ea57f4..9993373 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -7,6 +7,7 @@ import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidPathException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoSuchMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import java.io.File; import java.io.IOException; @@ -19,14 +20,15 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import java.util.Optional; /** * TODO: limit a length of an incoming message * TODO: add javadocs to Server * TODO: add FTPMessageTransmitter test + * TODO: add FTPMessageReader test * TODO: add javadocs to exceptions * TODO: check if it is possible to see something outside of a tracked folder + * TODO: check what client will do if server closed connection */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -67,6 +69,9 @@ public Server(final @NotNull Path trackedFolder, final int port) { if (key.isReadable()) { readMessage(key); + if (!key.isValid()) { + continue; + } } if (key.isWritable()) { @@ -103,6 +108,7 @@ public void start() { public void stop() throws InterruptedException { shouldRun = false; + serverThread.interrupt(); serverThread.join(); } @@ -127,14 +133,27 @@ private void readMessage(final @NotNull SelectionKey key) throws IOException, InvalidMessageException, InvalidFTPMessageException { FTPMessageReader reader = ((FTPChannelAttachment) key.attachment()).getReader(); - Optional optional = reader.read(); - if (!optional.isPresent()) { - return; + switch (reader.read()) { + case NOT_READ: + return; + + case CLOSED: + key.channel().close(); + return; + + case READ: + break; } logger.info("Server ({}) received new message", this); - FTPMessage message = optional.get(); + FTPMessage message; + try { + message = reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + if (message instanceof FTPListMessage) { handleMessage(key, (FTPListMessage) message); } else { From 3375366d4297a45f73383fb48ffbb1abf9ea06e1 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sun, 23 Apr 2017 21:58:57 +0300 Subject: [PATCH 37/69] Leave TODO in appropriate place. --- .../src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java | 1 + .../src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 0189f98..0afd423 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -10,6 +10,7 @@ /** * A client class establishes a connection with ftp server and allows to send a request messages to it. + * TODO: client will freeze on write operation if server closed connection for some reason. */ public class Client implements AutoCloseable { private final @NotNull SocketChannel channel; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 9993373..5d9e84a 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -28,7 +28,6 @@ * TODO: add FTPMessageReader test * TODO: add javadocs to exceptions * TODO: check if it is possible to see something outside of a tracked folder - * TODO: check what client will do if server closed connection */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From b11d1367152c6c15c130c72e964dccb7ccb91f85 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 12:51:14 +0300 Subject: [PATCH 38/69] Change architecture of message handling part. --- .../bachelor2015/veselov/hw04/Client.java | 82 ++++++++++---- .../spbau/bachelor2015/veselov/hw04/Main.java | 4 +- .../veselov/hw04/FTPMessageReader.java | 84 --------------- .../veselov/hw04/FTPMessageTransmitter.java | 80 -------------- .../ConnectionWasClosedException.java | 3 - .../ProtocolViolationException.java | 3 + .../veselov/hw04/messages/DataWriter.java | 7 ++ .../hw04/messages/FileTransmitter.java | 58 ++++++++++ .../veselov/hw04/messages/MessageReader.java | 29 +---- .../veselov/hw04/messages/MessageWriter.java | 24 ++--- .../exceptions/InvalidMessageException.java | 4 +- .../hw04/messages/MessageReaderTest.java | 42 -------- .../hw04/messages/MessageWriterTest.java | 33 ------ .../veselov/hw04/FTPChannelAttachment.java | 100 ++++++++++++++++-- .../bachelor2015/veselov/hw04/Server.java | 73 +++++-------- .../NoDataWriterRegisteredException.java | 3 + .../RegisteringSecondDataWriterException.java | 4 + 17 files changed, 272 insertions(+), 361 deletions(-) delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java create mode 100644 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java create mode 100644 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 0afd423..ee5f193 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -1,23 +1,29 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; import java.io.IOException; import java.net.InetSocketAddress; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; import java.nio.channels.SocketChannel; /** * A client class establishes a connection with ftp server and allows to send a request messages to it. * TODO: client will freeze on write operation if server closed connection for some reason. + * TODO: add interests switching */ public class Client implements AutoCloseable { private final @NotNull SocketChannel channel; - private final @NotNull FTPMessageTransmitter transmitter; + private final @NotNull Selector selector; - private final @NotNull FTPMessageReader reader; + private final @NotNull MessageReader reader; /** * Establishes a connection. @@ -27,11 +33,15 @@ public class Client implements AutoCloseable { * @throws IOException if any IO exception occurs during establishment of connection. */ public Client(final @NotNull String host, final int port) throws IOException { + selector = Selector.open(); + channel = SocketChannel.open(); channel.connect(new InetSocketAddress(host, port)); + channel.configureBlocking(false); + + channel.register(selector, SelectionKey.OP_READ | SelectionKey.OP_WRITE); - transmitter = new FTPMessageTransmitter(channel); - reader = new FTPMessageReader(channel); + reader = new MessageReader(channel); } /** @@ -42,6 +52,7 @@ public Client(final @NotNull String host, final int port) throws IOException { @Override public void close() throws IOException { channel.close(); + selector.close(); } /** @@ -50,23 +61,58 @@ public void close() throws IOException { * @param path a path to a directory which content is requested. * @return answer message. * @throws IOException if any IO exception occurs during interaction with server. - * @throws ConnectionWasClosedException if remote side closed the connection. + * @throws ProtocolViolationException if remote side closed the connection. */ public @NotNull FTPListAnswerMessage list(final @NotNull String path) - throws IOException, ConnectionWasClosedException { + throws IOException, ProtocolViolationException { FTPListMessage message = new FTPListMessage(path); - transmitter.addMessage(message); - transmitter.waitUntilWritten(); - - try { - return (FTPListAnswerMessage) reader.waitUntilRead(); - } catch (MessageWithNegativeLengthException e) { - channel.close(); - throw new RuntimeException(e); - } catch (ConnectionWasClosedException e) { - channel.close(); - throw e; + MessageWriter writer = new MessageWriter(channel, message); + + while (true) { + selector.select(); + SelectionKey key = channel.keyFor(selector); + + if (key.isWritable()) { + if (writer.write()) { + break; + } + } + + if (key.isReadable()) { + close(); + throw new ProtocolViolationException(); + } + + selector.selectedKeys().clear(); + } + + while (true) { + selector.select(); + SelectionKey key = channel.keyFor(selector); + + if (key.isReadable()) { + switch (reader.read()) { + case NOT_READ: + break; + + case READ: + FTPListAnswerMessage answer; + + try { + answer = (FTPListAnswerMessage) reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + return answer; + + case CLOSED: + throw new ProtocolViolationException(); + } + } + + selector.selectedKeys().clear(); } } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index df5a608..b1806fb 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,6 +1,6 @@ package ru.spbau.bachelor2015.veselov.hw04; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; import java.io.BufferedReader; import java.io.IOException; @@ -17,7 +17,7 @@ public class Main { * @param args first argument is a hostname, second argument is a port. * @throws IOException any IO exception which may occur during reading of commands. */ - public static void main(String[] args) throws IOException, ConnectionWasClosedException { + public static void main(String[] args) throws IOException, ProtocolViolationException { if (args.length != 2) { System.out.println("Two arguments expected"); return; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java deleted file mode 100644 index 78cca3f..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageReader.java +++ /dev/null @@ -1,84 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04; - -import org.apache.commons.lang3.SerializationUtils; -import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; - -import java.io.IOException; -import java.nio.channels.ReadableByteChannel; - -/** - * Ftp reader which allows transform sequence of bytes into ftp messages. - */ -public class FTPMessageReader { - private final @NotNull MessageReader reader; - - /** - * Creates a new reader for a specified channel. - * - * @param channel a channel which new reader will be tracking. - */ - public FTPMessageReader(final @NotNull ReadableByteChannel channel) { - reader = new MessageReader(channel); - } - - /** - * Makes an attempt to read a message from a channel. - * - * @return a result of reading. It might be READ if message is fully read, NOT_READ is the opposite result. It also - * might be CLOSED if remote side closed the connection. - * @throws IOException if any IO exception occurs during reading. - * @throws MessageWithNegativeLengthException if the length of the message is negative. - */ - public @NotNull MessageReader.ReadingResult read() throws IOException, MessageWithNegativeLengthException { - return reader.read(); - } - - /** - * Returns read message. This method waits until message is fully read. A better performance may be achieved if - * underlying channel is switched to blocking mode. - * - * @throws IOException if any IO exception occurs during reading. - * @throws MessageWithNegativeLengthException if the length of the message is negative. - * @throws ConnectionWasClosedException if remote side closed the connection. - */ - public @NotNull FTPMessage waitUntilRead() - throws IOException, MessageWithNegativeLengthException, ConnectionWasClosedException { - boolean shouldTry = true; - - while (shouldTry) { - switch (reader.read()) { - case READ: - shouldTry = false; - break; - - case NOT_READ: - break; - - case CLOSED: - throw new ConnectionWasClosedException(); - } - } - - try { - return getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } - } - - /** - * Returns read message. - * - * @throws MessageNotReadException if message hasn't been read. - */ - public @NotNull FTPMessage getMessage() throws MessageNotReadException { - byte[] data = reader.getMessage(); - reader.reset(); - - return SerializationUtils.deserialize(data); - } -} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java deleted file mode 100644 index 2fdb1f7..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessageTransmitter.java +++ /dev/null @@ -1,80 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04; - -import org.apache.commons.lang3.SerializationUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; - -import java.io.IOException; -import java.nio.channels.WritableByteChannel; -import java.util.LinkedList; - -/** - * Ftp transmitter can write a queued sequence of ftp messages to a specified channel. - */ -public class FTPMessageTransmitter { - private final static @NotNull Logger logger = LogManager.getLogger(FTPMessageTransmitter.class.getCanonicalName()); - - private final @NotNull WritableByteChannel channel; - - private final @NotNull LinkedList writers = new LinkedList<>(); - - /** - * Creates a new transmitter. - * - * @param channel a channel to which new transmitter will be writing messages. - */ - public FTPMessageTransmitter(final @NotNull WritableByteChannel channel) { - logger.debug("New FTPMessageTransmitter ({}) is created", this); - - this.channel = channel; - } - - /** - * Adds a new message to the queue. - * - * @param message a message to add. - */ - public void addMessage(final @NotNull FTPMessage message) throws IOException { - logger.debug("New message is added to FTPMessageTransmitter ({})", this); - - writers.add(new MessageWriter(channel, SerializationUtils.serialize(message))); - } - - /** - * Makes an attempt to write a message to a channel. - * - * @return true if there is no messages to write left. - * @throws IOException if any IO exception occurs during writing. - */ - public boolean write() throws IOException { - logger.debug("Write method of FTPMessageTransmitter ({}) is called", this); - - if (!writers.isEmpty()) { - MessageWriter writer = writers.getFirst(); - if (writer.write()) { - writers.poll(); - } - } - - return writers.isEmpty(); - } - - /** - * Writes every message in queue into the underlying channel. A better performance may be achieved if - * underlying channel is switched to blocking mode. - * - * @throws IOException if any IO exception occurs during writing. - */ - public void waitUntilWritten() throws IOException { - logger.debug("WaitUntilWritten method of FTPMessageTransmitter ({}) is called", this); - - while (!writers.isEmpty()) { - MessageWriter writer = writers.getFirst(); - while (!writer.write()); - - writers.poll(); - } - } -} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java deleted file mode 100644 index f735a3d..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; - -public class ConnectionWasClosedException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java new file mode 100644 index 0000000..71d2050 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class ProtocolViolationException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java new file mode 100644 index 0000000..7f170de --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java @@ -0,0 +1,7 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import java.io.IOException; + +public interface DataWriter { + boolean write() throws IOException; +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java new file mode 100644 index 0000000..f897d62 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java @@ -0,0 +1,58 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.io.RandomAccessFile; +import java.nio.ByteBuffer; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.WritableByteChannel; +import java.nio.file.Path; + +// TODO: add length writing +public class FileTransmitter implements DataWriter { + private static final int CHUNK_SIZE = 4096; + + private final @NotNull WritableByteChannel channel; + + private final @NotNull ReadableByteChannel fileChannel; + + private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); + + public FileTransmitter(final @NotNull WritableByteChannel channel, final @NotNull Path path) + throws IOException { + this.channel = channel; + + fileChannel = new RandomAccessFile(path.toFile(), "r").getChannel(); + + fillBuffer(); + } + + public boolean write() throws IOException { + while (!isTransmitted()) { + channel.write(buffer); + + if (buffer.hasRemaining()) { + break; + } + + fillBuffer(); + } + + return isTransmitted(); + } + + private boolean isTransmitted() { + return !fileChannel.isOpen() && !buffer.hasRemaining(); + } + + private void fillBuffer() throws IOException { + buffer.clear(); + + if (fileChannel.read(buffer) == -1) { + fileChannel.close(); + } + + buffer.flip(); + } +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java index e1f60c5..a31a99e 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java @@ -1,7 +1,9 @@ package ru.spbau.bachelor2015.veselov.hw04.messages; +import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import ru.spbau.bachelor2015.veselov.hw04.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; @@ -9,11 +11,6 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -/** - * A reader object must be created for reading messages of specific format from a ReadableByteChannel. Message format - * is: four bytes denoting the length of the message, a sequence of bytes which amount is equal to the length denoted by - * first four bytes. - */ public class MessageReader { private final @NotNull ReadableByteChannel channel; @@ -23,23 +20,10 @@ public class MessageReader { private @Nullable ByteBuffer messageBuffer; - /** - * Creates a new MessageReader which will read from a specified channel. - * - * @param channel a channel to read from. - */ public MessageReader(final @NotNull ReadableByteChannel channel) { this.channel = channel; } - /** - * Makes an attempt to read a message from a channel. - * - * @return a result of reading. It might be READ if message is fully read, NOT_READ is the opposite result. It also - * might be CLOSED if remote side closed the connection. - * @throws IOException if any IO exception occurs during reading. - * @throws MessageWithNegativeLengthException if the length of the message is negative. - */ public ReadingResult read() throws IOException, MessageWithNegativeLengthException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { @@ -73,17 +57,12 @@ public ReadingResult read() throws IOException, MessageWithNegativeLengthExcepti return ReadingResult.READ; } - /** - * Returns the content of the read message. - * - * @throws MessageNotReadException if message hasn't been read. - */ - public @NotNull byte[] getMessage() throws MessageNotReadException { + public @NotNull FTPMessage getMessage() throws MessageNotReadException { if (messageBuffer == null || messageBuffer.hasRemaining()) { throw new MessageNotReadException(); } - return messageBuffer.array().clone(); + return SerializationUtils.deserialize(messageBuffer.array()); } /** diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java index d129960..4e622b2 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java @@ -1,41 +1,29 @@ package ru.spbau.bachelor2015.veselov.hw04.messages; +import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.FTPMessage; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -/** - * A writer object must be created for writing messages of specific format to a WritableByteChannel. Message format is - * the same as in MessageReader class. - */ -public class MessageWriter { +public class MessageWriter implements DataWriter { private final @NotNull WritableByteChannel channel; private final @NotNull ByteBuffer buffer; - /** - * Creates a new MessageWriter which will write to a specified channel. - * - * @param channel a channel to write to. - * @param data a data which will be written. - */ - public MessageWriter(final @NotNull WritableByteChannel channel, final @NotNull byte[] data) { + public MessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) { this.channel = channel; + byte[] data = SerializationUtils.serialize(message); + buffer = ByteBuffer.allocate(Message.LENGTH_BYTES + data.length); buffer.putInt(data.length); buffer.put(data); buffer.flip(); } - /** - * Makes an attempt to write a message to a channel. - * - * @return true if the message was fully written, false otherwise. - * @throws IOException if any IO exception occurs during writing. - */ public boolean write() throws IOException { channel.write(buffer); return !buffer.hasRemaining(); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java index 24d9611..cb2ad07 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java @@ -1,4 +1,6 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; -public class InvalidMessageException extends Exception { +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; + +public class InvalidMessageException extends ProtocolViolationException { } diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java index e24426b..8c72658 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java @@ -1,6 +1,5 @@ package ru.spbau.bachelor2015.veselov.hw04.messages; -import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; @@ -15,26 +14,11 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.commons.lang3.ArrayUtils.toObject; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader.ReadingResult.READ; public class MessageReaderTest { - @Test - public void testZeroLengthMessage() throws Exception { - ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(TestUtils.toLengthByteArray(0))); - - MessageReader reader = new MessageReader(channel); - - assertThat(reader.read(), is(READ)); - assertThat(toObject(reader.getMessage()), is(emptyArray())); - } - @Test(expected = MessageWithNegativeLengthException.class) public void testNegativeLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); @@ -54,32 +38,6 @@ public void testGettingOfUnreadMessage() throws Exception { reader.getMessage(); } - @Test - public void testCorrectnessOneReading() throws Exception { - final byte[] data = new byte[] {1, 2, 3}; - - ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(ArrayUtils.addAll(TestUtils.toLengthByteArray(3), data))); - - MessageReader reader = new MessageReader(channel); - - assertThat(reader.read(), is(READ)); - assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); - } - - @Test - public void testCorrectnessMultipleReading() throws Exception { - final byte[] data = new byte[] {1, 2, 3}; - - ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(extrude(ArrayUtils.addAll(TestUtils.toLengthByteArray(3), data)))); - - MessageReader reader = new MessageReader(channel); - while (reader.read() != READ); - - assertThat(toObject(reader.getMessage()), is(arrayContaining(toObject(data)))); - } - private @NotNull byte[][] extrude(final @NotNull byte[] array) { byte[][] result = new byte[array.length][1]; for (int i = 0; i < array.length; i++) { diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java index 15e0033..64bca8a 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java @@ -1,48 +1,15 @@ package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; -import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import ru.spbau.bachelor2015.veselov.hw04.TestUtils; import java.nio.ByteBuffer; -import java.nio.channels.WritableByteChannel; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class MessageWriterTest { - @Test - public void testSingleWriting() throws Exception { - final byte[] data = new byte[] {1, 2, 3}; - - WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())).thenAnswer(read(data.length + Message.LENGTH_BYTES)); - - MessageWriter writer = new MessageWriter(channel, data); - - assertThat(writer.write(), is(true)); - } - - @Test - public void testMultipleWritings() throws Exception { - final byte[] data = new byte[] {1, 2, 3}; - - WritableByteChannel channel = mock(WritableByteChannel.class); - when(channel.write(any())).thenAnswer(read(TestUtils.intArrayOfOnes(data.length + Message.LENGTH_BYTES))); - - MessageWriter writer = new MessageWriter(channel, data); - - while (!writer.write()); - } - private @NotNull Reader read(final @NotNull int... bytesToRead) { return new Reader(bytesToRead); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java index b42484d..753beb9 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java @@ -1,22 +1,104 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; +import ru.spbau.bachelor2015.veselov.hw04.messages.DataWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.FileTransmitter; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; + +import java.io.IOException; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.nio.channels.SocketChannel; +import java.nio.file.Path; public class FTPChannelAttachment { - private final @NotNull FTPMessageReader reader; + private final @NotNull SocketChannel channel; + + private final @NotNull SelectionKey selectionKey; + + private final @NotNull Server server; + + private final @NotNull MessageReader reader; + + private @Nullable DataWriter writer; + + public FTPChannelAttachment(final @NotNull SocketChannel channel, + final @NotNull Selector selector, + final @NotNull Server server) throws IOException { + this.channel = channel; + this.server = server; + + channel.configureBlocking(false); + + selectionKey = channel.register(selector, SelectionKey.OP_READ, this); + + reader = new MessageReader(channel); + } - private final @NotNull FTPMessageTransmitter transmitter; + public void registerMessageWriter(final @NotNull FTPMessage message) throws RegisteringSecondDataWriterException { + if (writer != null) { + throw new RegisteringSecondDataWriterException(); + } - public FTPChannelAttachment(final @NotNull FTPMessageReader reader, final @NotNull FTPMessageTransmitter transmitter) { - this.reader = reader; - this.transmitter = transmitter; + selectionKey.interestOps(selectionKey.interestOps() | SelectionKey.OP_WRITE); + writer = new MessageWriter(channel, message); } - public @NotNull FTPMessageReader getReader() { - return reader; + public void registerFileTransmitter(final @NotNull Path path) + throws RegisteringSecondDataWriterException, IOException { + if (writer != null) { + throw new RegisteringSecondDataWriterException(); + } + + selectionKey.interestOps(selectionKey.interestOps() | SelectionKey.OP_WRITE); + writer = new FileTransmitter(channel, path); + } + + public void read() throws IOException, MessageWithNegativeLengthException { + switch (reader.read()) { + case NOT_READ: + return; + + case READ: + FTPMessage message; + + try { + message = reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + reader.reset(); + + try { + server.handleMessage(channel, message); + } catch (InvalidFTPMessageException e) { + channel.close(); + } + + break; + + case CLOSED: + channel.close(); + break; + } } - public @NotNull FTPMessageTransmitter getTransmitter() { - return transmitter; + public void write() throws IOException, NoDataWriterRegisteredException { + if (writer == null) { + throw new NoDataWriterRegisteredException(); + } + + if (writer.write()) { + writer = null; + selectionKey.interestOps(selectionKey.interestOps() ^ SelectionKey.OP_WRITE); + } } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 5d9e84a..8f7f259 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -3,11 +3,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidPathException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoSuchMessageException; +import org.jetbrains.annotations.Nullable; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.*; import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; import java.io.File; import java.io.IOException; @@ -23,11 +21,10 @@ /** * TODO: limit a length of an incoming message - * TODO: add javadocs to Server - * TODO: add FTPMessageTransmitter test - * TODO: add FTPMessageReader test - * TODO: add javadocs to exceptions * TODO: check if it is possible to see something outside of a tracked folder + * TODO: do refactoring + * TODO: javadocs + * TODO: tests */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -40,6 +37,8 @@ public class Server { private final @NotNull Thread serverThread; + private @Nullable Selector selector; + public Server(final @NotNull Path trackedFolder, final int port) { logger.info("New Server ({}) is created", this); @@ -55,6 +54,8 @@ public Server(final @NotNull Path trackedFolder, final int port) { serverSocketChannel.configureBlocking(false); serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); + this.selector = selector; + logger.info("Server ({}) is started", this); while (shouldRun) { @@ -63,20 +64,24 @@ public Server(final @NotNull Path trackedFolder, final int port) { for (SelectionKey key : selector.selectedKeys()) { try { if (key.isAcceptable()) { - acceptNewConnection(selector, serverSocketChannel); + acceptNewConnection(serverSocketChannel); } if (key.isReadable()) { - readMessage(key); + ((FTPChannelAttachment) key.attachment()).read(); if (!key.isValid()) { continue; } } if (key.isWritable()) { - ((FTPChannelAttachment) key.attachment()).getTransmitter().write(); + try { + ((FTPChannelAttachment) key.attachment()).write(); + } catch (NoDataWriterRegisteredException e) { + throw new RuntimeException(e); + } } - } catch (InvalidMessageException | InvalidFTPMessageException e) { + } catch (InvalidMessageException e) { logger.error("Server ({}) received an invalid message", this); key.channel().close(); @@ -111,50 +116,22 @@ public void stop() throws InterruptedException { serverThread.join(); } - private void acceptNewConnection(final @NotNull Selector selector, - final @NotNull ServerSocketChannel serverSocketChannel) throws IOException { + private void acceptNewConnection(final @NotNull ServerSocketChannel serverSocketChannel) throws IOException { SocketChannel socketChannel = serverSocketChannel.accept(); if (socketChannel == null) { return; } logger.info("Server ({}) accepted new connection", this); - - socketChannel.configureBlocking(false); - - socketChannel.register( - selector, - SelectionKey.OP_READ | SelectionKey.OP_WRITE, - new FTPChannelAttachment(new FTPMessageReader(socketChannel), new FTPMessageTransmitter(socketChannel))); + new FTPChannelAttachment(socketChannel, selector, this); } - private void readMessage(final @NotNull SelectionKey key) - throws IOException, InvalidMessageException, InvalidFTPMessageException { - FTPMessageReader reader = ((FTPChannelAttachment) key.attachment()).getReader(); - - switch (reader.read()) { - case NOT_READ: - return; - - case CLOSED: - key.channel().close(); - return; - - case READ: - break; - } - + void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) + throws InvalidFTPMessageException, IOException { logger.info("Server ({}) received new message", this); - FTPMessage message; - try { - message = reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } - if (message instanceof FTPListMessage) { - handleMessage(key, (FTPListMessage) message); + handleMessage(channel.keyFor(selector), (FTPListMessage) message); } else { throw new NoSuchMessageException(); } @@ -179,6 +156,10 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi } } - ((FTPChannelAttachment) key.attachment()).getTransmitter().addMessage(new FTPListAnswerMessage(entries)); + try { + ((FTPChannelAttachment) key.attachment()).registerMessageWriter(new FTPListAnswerMessage(entries)); + } catch (RegisteringSecondDataWriterException e) { + throw new RuntimeException(e); + } } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java new file mode 100644 index 0000000..c9b2145 --- /dev/null +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class NoDataWriterRegisteredException extends Exception {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java new file mode 100644 index 0000000..c6b6d62 --- /dev/null +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java @@ -0,0 +1,4 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class RegisteringSecondDataWriterException extends Exception { +} From 27a2b9ce36b92b82392b3edb40b856fa1fef7c6b Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 12:57:18 +0300 Subject: [PATCH 39/69] Correct FileTransmitter work. --- .../veselov/hw04/messages/FileTransmitter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java index f897d62..a3b078b 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java @@ -9,7 +9,6 @@ import java.nio.channels.WritableByteChannel; import java.nio.file.Path; -// TODO: add length writing public class FileTransmitter implements DataWriter { private static final int CHUNK_SIZE = 4096; @@ -19,13 +18,14 @@ public class FileTransmitter implements DataWriter { private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); - public FileTransmitter(final @NotNull WritableByteChannel channel, final @NotNull Path path) - throws IOException { + public FileTransmitter(final @NotNull WritableByteChannel channel, final @NotNull Path path) throws IOException { this.channel = channel; - fileChannel = new RandomAccessFile(path.toFile(), "r").getChannel(); + RandomAccessFile file = new RandomAccessFile(path.toFile(), "r"); + fileChannel = file.getChannel(); - fillBuffer(); + buffer.putLong(file.length()); + buffer.flip(); } public boolean write() throws IOException { From d1f6e76558abafb75cd40166a37cb8a588541d3e Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 13:30:32 +0300 Subject: [PATCH 40/69] Refactor messages module. --- .../bachelor2015/veselov/hw04/Client.java | 54 ++++++++++--------- .../spbau/bachelor2015/veselov/hw04/Main.java | 1 + .../ProtocolViolationException.java | 11 ++++ .../bachelor2015/veselov/hw04/ServerTest.java | 8 +-- .../ProtocolViolationException.java | 3 -- .../{ => messages}/FTPListAnswerMessage.java | 2 +- .../hw04/{ => messages}/FTPListMessage.java | 2 +- .../hw04/{ => messages}/FTPMessage.java | 2 +- .../veselov/hw04/messages/Message.java | 5 -- .../exceptions/InvalidMessageException.java | 6 --- .../exceptions/MessageNotReadException.java | 3 -- .../MessageWithNegativeLengthException.java | 3 -- .../hw04/messages/{ => util}/DataWriter.java | 2 +- .../FTPMessageReader.java} | 20 +++---- .../FTPMessageWriter.java} | 10 ++-- .../messages/{ => util}/FileTransmitter.java | 2 +- .../exceptions/InvalidMessageException.java | 3 ++ .../exceptions/MessageNotReadException.java | 3 ++ ...MessageWithNonpositiveLengthException.java | 3 ++ .../bachelor2015/veselov/hw04/TestUtils.java | 3 +- .../FTPMessageReaderTest.java} | 14 ++--- .../FTPMessageWriterTest.java} | 4 +- .../veselov/hw04/FTPChannelAttachment.java | 21 ++++---- .../bachelor2015/veselov/hw04/Server.java | 6 ++- 24 files changed, 101 insertions(+), 90 deletions(-) create mode 100644 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/FTPListAnswerMessage.java (97%) rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/FTPListMessage.java (92%) rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => messages}/FTPMessage.java (79%) delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java delete mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/{ => util}/DataWriter.java (63%) rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/{MessageReader.java => util/FTPMessageReader.java} (75%) rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/{MessageWriter.java => util/FTPMessageWriter.java} (63%) rename 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/{ => util}/FileTransmitter.java (96%) create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java rename 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/{MessageReaderTest.java => util/FTPMessageReaderTest.java} (84%) rename 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/{MessageWriterTest.java => util/FTPMessageWriterTest.java} (94%) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index ee5f193..b2496a2 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -1,11 +1,13 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.io.IOException; import java.net.InetSocketAddress; @@ -23,7 +25,7 @@ public class Client implements AutoCloseable { private final @NotNull Selector selector; - private final @NotNull MessageReader reader; + private final @NotNull FTPMessageReader reader; /** * Establishes a connection. @@ -41,7 +43,7 @@ public Client(final @NotNull String host, final int port) throws IOException { channel.register(selector, SelectionKey.OP_READ | SelectionKey.OP_WRITE); - reader = new MessageReader(channel); + reader = new FTPMessageReader(channel); } /** @@ -67,7 +69,7 @@ public void close() throws IOException { throws IOException, ProtocolViolationException { FTPListMessage message = new FTPListMessage(path); - MessageWriter writer = new MessageWriter(channel, message); + FTPMessageWriter writer = new FTPMessageWriter(channel, message); while (true) { selector.select(); @@ -92,23 +94,27 @@ public void close() throws IOException { SelectionKey key = channel.keyFor(selector); if (key.isReadable()) { - switch (reader.read()) { - case NOT_READ: - break; - - case READ: - FTPListAnswerMessage answer; - - try { - answer = (FTPListAnswerMessage) reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } - - return answer; - - case CLOSED: - throw new ProtocolViolationException(); + try { + switch (reader.read()) { + case NOT_READ: + break; + + case READ: + FTPListAnswerMessage answer; + + try { + answer = (FTPListAnswerMessage) reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + return answer; + + case CLOSED: + throw new ProtocolViolationException(); + } + } catch (MessageWithNonpositiveLengthException e) { + throw new ProtocolViolationException(e); } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index b1806fb..fd9e7e8 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,5 +1,6 @@ package ru.spbau.bachelor2015.veselov.hw04; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; import java.io.BufferedReader; diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java new file mode 100644 index 0000000..ec684f5 --- /dev/null +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java @@ -0,0 +1,11 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +import org.jetbrains.annotations.NotNull; + +public class ProtocolViolationException extends Exception { + public ProtocolViolationException() {} + + public ProtocolViolationException(final @NotNull Exception cause) { + super(cause); + } +} diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 7cc0739..b2dd1f3 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -8,8 +8,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import ru.spbau.bachelor2015.veselov.hw04.messages.Message; - +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -94,7 +94,7 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep } private @NotNull byte[] readMessage(final @NotNull InputStream inputStream) throws IOException { - byte[] rawLength = new byte[Message.LENGTH_BYTES]; + byte[] rawLength = new byte[Integer.BYTES]; if (inputStream.read(rawLength) != rawLength.length) { throw new RuntimeException(); @@ -118,7 +118,7 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep } public static @NotNull byte[] toLengthByteArray(int integer) { - return ByteBuffer.allocate(Message.LENGTH_BYTES).putInt(integer).array().clone(); + return ByteBuffer.allocate(Integer.BYTES).putInt(integer).array().clone(); } private static abstract class TestMessage { diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java deleted file mode 100644 index 71d2050..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; - -public class ProtocolViolationException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java similarity index 97% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java index aa06426..f2636ec 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListAnswerMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java similarity index 92% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java index d285e1f..3166dda 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPListMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import org.jetbrains.annotations.NotNull; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java similarity index 79% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java index 4bbb69e..037d305 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.messages; import java.io.Serializable; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java deleted file mode 100644 index e0ec2ca..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/Message.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; - -public final class Message { - public static final int LENGTH_BYTES = Integer.BYTES; -} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java deleted file mode 100644 index cb2ad07..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/InvalidMessageException.java +++ /dev/null @@ -1,6 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; - -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; - -public class InvalidMessageException extends ProtocolViolationException { -} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java deleted file mode 100644 index dbb0734..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageNotReadException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; - -public class MessageNotReadException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java deleted file mode 100644 index fae272e..0000000 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/exceptions/MessageWithNegativeLengthException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages.exceptions; - -public class MessageWithNegativeLengthException extends InvalidMessageException {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java similarity index 63% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java index 7f170de..ff8fda5 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/DataWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import java.io.IOException; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java similarity index 75% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java index a31a99e..b836a80 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java @@ -1,30 +1,30 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.FTPMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -public class MessageReader { +public class FTPMessageReader { private final @NotNull ReadableByteChannel channel; private boolean isLengthRead = false; - private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(Message.LENGTH_BYTES); + private @NotNull final ByteBuffer lengthBuffer = ByteBuffer.allocate(Integer.BYTES); private @Nullable ByteBuffer messageBuffer; - public MessageReader(final @NotNull ReadableByteChannel channel) { + public FTPMessageReader(final @NotNull ReadableByteChannel channel) { this.channel = channel; } - public ReadingResult read() throws IOException, MessageWithNegativeLengthException { + public ReadingResult read() throws IOException, MessageWithNonpositiveLengthException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { return ReadingResult.CLOSED; @@ -39,8 +39,8 @@ public ReadingResult read() throws IOException, MessageWithNegativeLengthExcepti lengthBuffer.flip(); int length = lengthBuffer.getInt(); - if (length < 0) { - throw new MessageWithNegativeLengthException(); + if (length <= 0) { + throw new MessageWithNonpositiveLengthException(); } messageBuffer = ByteBuffer.allocate(length); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java similarity index 63% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java index 4e622b2..02a852b 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java @@ -1,24 +1,24 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -public class MessageWriter implements DataWriter { +public class FTPMessageWriter implements DataWriter { private final @NotNull WritableByteChannel channel; private final @NotNull ByteBuffer buffer; - public MessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) { + public FTPMessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) { this.channel = channel; byte[] data = SerializationUtils.serialize(message); - buffer = ByteBuffer.allocate(Message.LENGTH_BYTES + data.length); + buffer = ByteBuffer.allocate(Integer.BYTES + data.length); buffer.putInt(data.length); buffer.put(data); buffer.flip(); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java similarity index 96% rename from 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java rename to 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java index a3b078b..cb9e8bb 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FileTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.jetbrains.annotations.NotNull; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java new file mode 100644 index 0000000..42312c2 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; + +public class InvalidMessageException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java new file mode 100644 index 0000000..54b4890 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; + +public class MessageNotReadException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java new file mode 100644 index 0000000..c13e8c0 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; + +public class MessageWithNonpositiveLengthException extends InvalidMessageException {} diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java index 95428ae..13649ac 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java @@ -1,14 +1,13 @@ package ru.spbau.bachelor2015.veselov.hw04; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.messages.Message; import java.nio.ByteBuffer; import java.util.Arrays; public final class TestUtils { public static @NotNull byte[] toLengthByteArray(int integer) { - return ByteBuffer.allocate(Message.LENGTH_BYTES).putInt(integer).array().clone(); + return ByteBuffer.allocate(Integer.BYTES).putInt(integer).array().clone(); } public static @NotNull int[] intArrayOfOnes(final int size) { diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java similarity index 84% rename from 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java rename to 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java index 8c72658..aa1bb64 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageReaderTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java @@ -1,12 +1,12 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import ru.spbau.bachelor2015.veselov.hw04.TestUtils; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; @@ -18,13 +18,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MessageReaderTest { - @Test(expected = MessageWithNegativeLengthException.class) +public class FTPMessageReaderTest { + @Test(expected = MessageWithNonpositiveLengthException.class) public void testNegativeLengthMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); when(channel.read(any())).thenAnswer(write(TestUtils.toLengthByteArray(-1))); - MessageReader reader = new MessageReader(channel); + FTPMessageReader reader = new FTPMessageReader(channel); reader.read(); } @@ -33,7 +33,7 @@ public void testNegativeLengthMessage() throws Exception { public void testGettingOfUnreadMessage() throws Exception { ReadableByteChannel channel = mock(ReadableByteChannel.class); - MessageReader reader = new MessageReader(channel); + FTPMessageReader reader = new FTPMessageReader(channel); reader.getMessage(); } diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java similarity index 94% rename from 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java rename to 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java index 64bca8a..d7c14fb 100644 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/MessageWriterTest.java +++ b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages; +package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.jetbrains.annotations.NotNull; import org.mockito.invocation.InvocationOnMock; @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; -public class MessageWriterTest { +public class FTPMessageWriterTest { private @NotNull Reader read(final @NotNull int... bytesToRead) { return new Reader(bytesToRead); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java index 753beb9..9ff213c 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java @@ -5,12 +5,13 @@ import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; -import ru.spbau.bachelor2015.veselov.hw04.messages.DataWriter; -import ru.spbau.bachelor2015.veselov.hw04.messages.FileTransmitter; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageReader; -import ru.spbau.bachelor2015.veselov.hw04.messages.MessageWriter; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.MessageWithNegativeLengthException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.DataWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FileTransmitter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.io.IOException; import java.nio.channels.SelectionKey; @@ -25,7 +26,7 @@ public class FTPChannelAttachment { private final @NotNull Server server; - private final @NotNull MessageReader reader; + private final @NotNull FTPMessageReader reader; private @Nullable DataWriter writer; @@ -39,7 +40,7 @@ public FTPChannelAttachment(final @NotNull SocketChannel channel, selectionKey = channel.register(selector, SelectionKey.OP_READ, this); - reader = new MessageReader(channel); + reader = new FTPMessageReader(channel); } public void registerMessageWriter(final @NotNull FTPMessage message) throws RegisteringSecondDataWriterException { @@ -48,7 +49,7 @@ public void registerMessageWriter(final @NotNull FTPMessage message) throws Regi } selectionKey.interestOps(selectionKey.interestOps() | SelectionKey.OP_WRITE); - writer = new MessageWriter(channel, message); + writer = new FTPMessageWriter(channel, message); } public void registerFileTransmitter(final @NotNull Path path) @@ -61,7 +62,7 @@ public void registerFileTransmitter(final @NotNull Path path) writer = new FileTransmitter(channel, path); } - public void read() throws IOException, MessageWithNegativeLengthException { + public void read() throws IOException, MessageWithNonpositiveLengthException { switch (reader.read()) { case NOT_READ: return; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 8f7f259..ec78363 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -5,7 +5,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.exceptions.*; -import ru.spbau.bachelor2015.veselov.hw04.messages.exceptions.InvalidMessageException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import java.io.File; import java.io.IOException; @@ -25,6 +28,7 @@ * TODO: do refactoring * TODO: javadocs * TODO: tests + * TODO: check in server tests that server thread stopped correctly */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); From 36c6f4fcf5f4ed3e4e56ce59a27b1bc81a2ef591 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 14:39:36 +0300 Subject: [PATCH 41/69] Refactor server module. --- ...ttachment.java => FTPChannelObserver.java} | 14 ++++---- .../bachelor2015/veselov/hw04/Server.java | 36 +++++++++++-------- .../InvalidFTPMessageException.java | 3 -- .../hw04/exceptions/InvalidPathException.java | 4 ++- .../exceptions/NoSuchMessageException.java | 4 ++- .../RegisteringSecondDataWriterException.java | 3 +- 6 files changed, 35 insertions(+), 29 deletions(-) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{FTPChannelAttachment.java => FTPChannelObserver.java} (88%) delete mode 100644 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java similarity index 88% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java index 9ff213c..570963c 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelAttachment.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java @@ -2,7 +2,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidFTPMessageException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; @@ -10,6 +9,7 @@ import ru.spbau.bachelor2015.veselov.hw04.messages.util.FileTransmitter; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; @@ -19,7 +19,7 @@ import java.nio.channels.SocketChannel; import java.nio.file.Path; -public class FTPChannelAttachment { +public class FTPChannelObserver { private final @NotNull SocketChannel channel; private final @NotNull SelectionKey selectionKey; @@ -30,9 +30,9 @@ public class FTPChannelAttachment { private @Nullable DataWriter writer; - public FTPChannelAttachment(final @NotNull SocketChannel channel, - final @NotNull Selector selector, - final @NotNull Server server) throws IOException { + public FTPChannelObserver(final @NotNull SocketChannel channel, + final @NotNull Selector selector, + final @NotNull Server server) throws IOException { this.channel = channel; this.server = server; @@ -80,7 +80,7 @@ public void read() throws IOException, MessageWithNonpositiveLengthException { try { server.handleMessage(channel, message); - } catch (InvalidFTPMessageException e) { + } catch (InvalidMessageException e) { channel.close(); } @@ -99,7 +99,7 @@ public void write() throws IOException, NoDataWriterRegisteredException { if (writer.write()) { writer = null; - selectionKey.interestOps(selectionKey.interestOps() ^ SelectionKey.OP_WRITE); + selectionKey.interestOps(selectionKey.interestOps() & ~SelectionKey.OP_WRITE); } } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index ec78363..d91143a 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -54,7 +54,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { () -> { try (Selector selector = Selector.open(); ServerSocketChannel serverSocketChannel = ServerSocketChannel.open()) { - serverSocketChannel.socket().bind(new InetSocketAddress(port)); + serverSocketChannel.socket().bind(new InetSocketAddress(this.port)); serverSocketChannel.configureBlocking(false); serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT); @@ -72,27 +72,31 @@ public Server(final @NotNull Path trackedFolder, final int port) { } if (key.isReadable()) { - ((FTPChannelAttachment) key.attachment()).read(); - if (!key.isValid()) { + try { + ((FTPChannelObserver) key.attachment()).read(); + } catch (InvalidMessageException e) { + logger.error("Server ({}) received an invalid message", this); + + key.channel().close(); + } + + if (!key.channel().isOpen()) { continue; } } if (key.isWritable()) { try { - ((FTPChannelAttachment) key.attachment()).write(); + ((FTPChannelObserver) key.attachment()).write(); } catch (NoDataWriterRegisteredException e) { throw new RuntimeException(e); } } - } catch (InvalidMessageException e) { - logger.error("Server ({}) received an invalid message", this); - - key.channel().close(); - } catch (IOException ignored) { + } catch (IOException e) { logger.error( - "IOException occurred during interaction of Server ({}) with a connection", - this); + "IOException occurred during interaction of Server ({})" + + "with a connection.\n{}", + this, e); key.channel().close(); } @@ -104,6 +108,8 @@ public Server(final @NotNull Path trackedFolder, final int port) { logger.info("Server ({}) is stopped", this); } catch (IOException e) { throw new RuntimeException(e); + } finally { + selector = null; } } ); @@ -127,11 +133,11 @@ private void acceptNewConnection(final @NotNull ServerSocketChannel serverSocket } logger.info("Server ({}) accepted new connection", this); - new FTPChannelAttachment(socketChannel, selector, this); + new FTPChannelObserver(socketChannel, selector, this); } void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) - throws InvalidFTPMessageException, IOException { + throws InvalidMessageException, IOException { logger.info("Server ({}) received new message", this); if (message instanceof FTPListMessage) { @@ -142,7 +148,7 @@ void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessa } private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) - throws IOException, InvalidFTPMessageException { + throws IOException, InvalidMessageException { Path path = Paths.get(message.getPath()); if (path.isAbsolute()) { @@ -161,7 +167,7 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi } try { - ((FTPChannelAttachment) key.attachment()).registerMessageWriter(new FTPListAnswerMessage(entries)); + ((FTPChannelObserver) key.attachment()).registerMessageWriter(new FTPListAnswerMessage(entries)); } catch (RegisteringSecondDataWriterException e) { throw new RuntimeException(e); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java deleted file mode 100644 index f8e1045..0000000 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidFTPMessageException.java +++ /dev/null @@ -1,3 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; - -public class InvalidFTPMessageException extends Exception {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java index 6b0f514..5d09972 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java @@ -1,3 +1,5 @@ package ru.spbau.bachelor2015.veselov.hw04.exceptions; -public class InvalidPathException extends InvalidFTPMessageException {} +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; + +public class InvalidPathException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java index 8a14ffb..5d561e5 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java @@ -1,3 +1,5 @@ package ru.spbau.bachelor2015.veselov.hw04.exceptions; -public class NoSuchMessageException extends InvalidFTPMessageException {} +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; + +public class NoSuchMessageException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java index c6b6d62..c041514 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java @@ -1,4 +1,3 @@ package ru.spbau.bachelor2015.veselov.hw04.exceptions; -public class RegisteringSecondDataWriterException extends Exception { -} +public class RegisteringSecondDataWriterException extends Exception {} From 1f7e1bd5028aa21bd2a15ca52c6f9389608d71a3 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 16:00:03 +0300 Subject: [PATCH 42/69] Refactor client module. --- .../bachelor2015/veselov/hw04/Client.java | 73 +++++++++++++------ .../spbau/bachelor2015/veselov/hw04/Main.java | 16 ++-- .../ConnectionWasClosedException.java | 3 + .../ProtocolViolationException.java | 11 --- .../bachelor2015/veselov/hw04/ServerTest.java | 69 +++++++++++------- .../exceptions/InvalidMessageException.java | 10 ++- .../bachelor2015/veselov/hw04/Server.java | 8 +- 7 files changed, 118 insertions(+), 72 deletions(-) create mode 100644 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java delete mode 100644 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index b2496a2..5d12739 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -1,26 +1,32 @@ package ru.spbau.bachelor2015.veselov.hw04; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.io.IOException; import java.net.InetSocketAddress; +import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; +import java.util.List; /** * A client class establishes a connection with ftp server and allows to send a request messages to it. * TODO: client will freeze on write operation if server closed connection for some reason. - * TODO: add interests switching */ public class Client implements AutoCloseable { + private final static @NotNull Logger logger = LogManager.getLogger(Client.class.getCanonicalName()); + private final @NotNull SocketChannel channel; private final @NotNull Selector selector; @@ -41,9 +47,11 @@ public Client(final @NotNull String host, final int port) throws IOException { channel.connect(new InetSocketAddress(host, port)); channel.configureBlocking(false); - channel.register(selector, SelectionKey.OP_READ | SelectionKey.OP_WRITE); + channel.register(selector, SelectionKey.OP_READ); reader = new FTPMessageReader(channel); + + logger.info("Client ({}) established a connection with a server on {}:{}", this, host, port); } /** @@ -57,23 +65,24 @@ public void close() throws IOException { selector.close(); } - /** - * Send a list request to a server. - * - * @param path a path to a directory which content is requested. - * @return answer message. - * @throws IOException if any IO exception occurs during interaction with server. - * @throws ProtocolViolationException if remote side closed the connection. - */ - public @NotNull FTPListAnswerMessage list(final @NotNull String path) - throws IOException, ProtocolViolationException { - FTPListMessage message = new FTPListMessage(path); + public @NotNull List list(final @NotNull String path) + throws IOException, InvalidMessageException, ConnectionWasClosedException { + writeMessage(new FTPListMessage(path)); + + return ((FTPListAnswerMessage) readMessage()).getContent(); + } + + private void writeMessage(final @NotNull FTPListMessage message) + throws IOException, InvalidMessageException, ConnectionWasClosedException { + logger.info("Client ({}) began sending a message to server", this); FTPMessageWriter writer = new FTPMessageWriter(channel, message); + SelectionKey key = channel.keyFor(selector); + key.interestOps(key.interestOps() | SelectionKey.OP_WRITE); + while (true) { selector.select(); - SelectionKey key = channel.keyFor(selector); if (key.isWritable()) { if (writer.write()) { @@ -82,13 +91,28 @@ public void close() throws IOException { } if (key.isReadable()) { + int bytesRead = channel.read((ByteBuffer) null); + close(); - throw new ProtocolViolationException(); + + if (bytesRead == -1) { + throw new ConnectionWasClosedException(); + } else { + throw new InvalidMessageException(); + } } selector.selectedKeys().clear(); } + key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE); + logger.info("Client ({}) sent a message to server", this); + } + + private @NotNull FTPMessage readMessage() + throws IOException, InvalidMessageException, ConnectionWasClosedException { + logger.info("Client ({}) began waiting a message from server", this); + while (true) { selector.select(); SelectionKey key = channel.keyFor(selector); @@ -100,21 +124,26 @@ public void close() throws IOException { break; case READ: - FTPListAnswerMessage answer; + FTPMessage answer; try { - answer = (FTPListAnswerMessage) reader.getMessage(); + answer = reader.getMessage(); } catch (MessageNotReadException e) { throw new RuntimeException(e); } + reader.reset(); + + logger.info("Client ({}) received a message from server", this); return answer; case CLOSED: - throw new ProtocolViolationException(); + throw new ConnectionWasClosedException(); } - } catch (MessageWithNonpositiveLengthException e) { - throw new ProtocolViolationException(e); + } catch (InvalidMessageException | ConnectionWasClosedException e) { + channel.close(); + + throw e; } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index fd9e7e8..8043d8d 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -1,24 +1,20 @@ package ru.spbau.bachelor2015.veselov.hw04; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ProtocolViolationException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.Scanner; +import java.util.List; /** * Entry point of a client program. This class allows to make requests to server. */ public class Main { - /** - * Entry method. - * - * @param args first argument is a hostname, second argument is a port. - * @throws IOException any IO exception which may occur during reading of commands. - */ - public static void main(String[] args) throws IOException, ProtocolViolationException { + public static void main(String[] args) throws IOException, ConnectionWasClosedException, InvalidMessageException { if (args.length != 2) { System.out.println("Two arguments expected"); return; @@ -48,8 +44,8 @@ public static void main(String[] args) throws IOException, ProtocolViolationExce break; } - FTPListAnswerMessage answer = client.list(scanner.next()); - for (FTPListAnswerMessage.Entry entry : answer.getContent()) { + List answer = client.list(scanner.next()); + for (FTPListAnswerMessage.Entry entry : answer) { System.out.println(entry); } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java new file mode 100644 index 0000000..f735a3d --- /dev/null +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.exceptions; + +public class ConnectionWasClosedException extends Exception {} diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java deleted file mode 100644 index ec684f5..0000000 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ProtocolViolationException.java +++ /dev/null @@ -1,11 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; - -import org.jetbrains.annotations.NotNull; - -public class ProtocolViolationException extends Exception { - public ProtocolViolationException() {} - - public ProtocolViolationException(final @NotNull Exception cause) { - super(cause); - } -} diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index b2dd1f3..c8c7b5f 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -13,8 +13,10 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.List; import static org.apache.commons.lang3.ArrayUtils.addAll; import static org.hamcrest.MatcherAssert.assertThat; @@ -25,47 +27,41 @@ public class ServerTest { @Rule public TemporaryFolder serverFolder = new TemporaryFolder(); - private final String fileName = "file"; + private final int directoriesInRootFolder = 10; - private Path pathToRoot; + private final String fileNamePrefix = "file"; + + private final String directoryNamePrefix = "dir"; - private Path pathToFile; + private Path pathToRoot; @Before public void folderInitialization() throws Exception { pathToRoot = serverFolder.getRoot().toPath(); - pathToFile = serverFolder.newFile(fileName).toPath(); - } - private final TestMessage listTestMessage = - new TestMessage() { - @Override - public void test(final @NotNull Client client) throws Exception { - FTPListAnswerMessage answer = client.list(Paths.get("").toString()); - - assertThat(answer.getContent(), is(contains(fileEntry(pathToRoot.relativize(pathToFile), - false)))); - } - }; + for (int i = 0; i < directoriesInRootFolder; i++) { + String stringedIndex = Integer.toString(i); + Path path = serverFolder.newFolder(directoryNamePrefix + stringedIndex).toPath(); + Files.createFile(path.resolve(fileNamePrefix + stringedIndex)); + } + } @Test public void testFTPListMessage() throws Exception { - processMessages(new TestMessage[] { listTestMessage }); + processMessages(new MessageTest[] { new SubDirTest(0) }); } @Test public void testFTPListMessages() throws Exception { - final int numberOfMessages = 10; - - TestMessage[] messages = new TestMessage[numberOfMessages]; - for (int i = 0; i < numberOfMessages; i++) { - messages[i] = listTestMessage; + MessageTest[] messages = new MessageTest[directoriesInRootFolder]; + for (int i = 0; i < directoriesInRootFolder; i++) { + messages[i] = new SubDirTest(i); } processMessages(messages); } - private void processMessages(final @NotNull TestMessage[] messages) throws Exception { + private void processMessages(final @NotNull MessageTest[] messages) throws Exception { final int port = 10000; Server server = new Server(pathToRoot, port); server.start(); @@ -79,7 +75,7 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep } } - for (TestMessage testMessage : messages) { + for (MessageTest testMessage : messages) { testMessage.test(client); } @@ -121,8 +117,31 @@ private void processMessages(final @NotNull TestMessage[] messages) throws Excep return ByteBuffer.allocate(Integer.BYTES).putInt(integer).array().clone(); } - private static abstract class TestMessage { - public abstract void test(final @NotNull Client client) throws Exception; + private class SubDirTest implements MessageTest { + private final int subDirIndex; + + public SubDirTest(final int index) { + subDirIndex = index; + } + + @Override + public void test(final @NotNull Client client) throws Exception { + String stringedIndex = Integer.toString(subDirIndex); + String directoryName = directoryNamePrefix + stringedIndex; + String fileName = fileNamePrefix + stringedIndex; + + List answer = + client.list(Paths.get("").resolve(directoryName).toString()); + + assertThat(answer, is(contains( + fileEntry(pathToRoot.relativize(pathToRoot.resolve(directoryName) + .resolve(fileName)), + false)))); + } + } + + private interface MessageTest { + void test(final @NotNull Client client) throws Exception; } private static class FileEntryMatcher extends BaseMatcher { diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java index 42312c2..e0b386c 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java @@ -1,3 +1,11 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; -public class InvalidMessageException extends Exception {} +import org.jetbrains.annotations.NotNull; + +public class InvalidMessageException extends Exception { + public InvalidMessageException() {} + + public InvalidMessageException(final @NotNull Exception cause) { + super(cause); + } +} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index d91143a..62bbea1 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -29,6 +29,7 @@ * TODO: javadocs * TODO: tests * TODO: check in server tests that server thread stopped correctly + * TODO: logging */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -94,7 +95,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { } } catch (IOException e) { logger.error( - "IOException occurred during interaction of Server ({})" + + "IOException occurred during interaction of Server ({}) " + "with a connection.\n{}", this, e); @@ -110,6 +111,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { throw new RuntimeException(e); } finally { selector = null; + shouldRun = false; } } ); @@ -122,7 +124,7 @@ public void start() { public void stop() throws InterruptedException { shouldRun = false; - serverThread.interrupt(); + selector.wakeup(); serverThread.join(); } @@ -169,7 +171,7 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi try { ((FTPChannelObserver) key.attachment()).registerMessageWriter(new FTPListAnswerMessage(entries)); } catch (RegisteringSecondDataWriterException e) { - throw new RuntimeException(e); + throw new InvalidMessageException(e); } } } From 1f419c522d7b7596b532c58c5d4b52c5e18a7b3b Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 19:58:55 +0300 Subject: [PATCH 43/69] Limit a length of a message --- .../veselov/hw04/messages/FTPMessage.java | 7 ++- .../hw04/messages/util/FTPMessageReader.java | 8 ++- .../hw04/messages/util/FTPMessageWriter.java | 8 ++- .../util/exceptions/LongMessageException.java | 3 ++ .../veselov/hw04/FTPChannelObserver.java | 53 ++++++++++--------- .../bachelor2015/veselov/hw04/Server.java | 10 +--- 6 files changed, 53 insertions(+), 36 deletions(-) create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java index 037d305..8c64060 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPMessage.java @@ -5,4 +5,9 @@ /** * An interface which represents an abstract message which ftp server can use to interact on its' connections. */ -public interface FTPMessage extends Serializable {} +public interface FTPMessage extends Serializable { + /** + * Maximal possible length of a message. A longer message considered to be invalid. + */ + int MAXIMAL_MESSAGE_LENGTH = 1024 * 1024; // 1 Mb +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java index b836a80..634d348 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java @@ -4,6 +4,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.LongMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; @@ -24,7 +26,7 @@ public FTPMessageReader(final @NotNull ReadableByteChannel channel) { this.channel = channel; } - public ReadingResult read() throws IOException, MessageWithNonpositiveLengthException { + public ReadingResult read() throws IOException, InvalidMessageException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { return ReadingResult.CLOSED; @@ -43,6 +45,10 @@ public ReadingResult read() throws IOException, MessageWithNonpositiveLengthExce throw new MessageWithNonpositiveLengthException(); } + if (length > FTPMessage.MAXIMAL_MESSAGE_LENGTH) { + throw new LongMessageException(); + } + messageBuffer = ByteBuffer.allocate(length); } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java index 02a852b..88f2d74 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java @@ -3,6 +3,7 @@ import org.apache.commons.lang3.SerializationUtils; import org.jetbrains.annotations.NotNull; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.LongMessageException; import java.io.IOException; import java.nio.ByteBuffer; @@ -13,11 +14,16 @@ public class FTPMessageWriter implements DataWriter { private final @NotNull ByteBuffer buffer; - public FTPMessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) { + public FTPMessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) + throws LongMessageException { this.channel = channel; byte[] data = SerializationUtils.serialize(message); + if (data.length > FTPMessage.MAXIMAL_MESSAGE_LENGTH) { + throw new LongMessageException(); + } + buffer = ByteBuffer.allocate(Integer.BYTES + data.length); buffer.putInt(data.length); buffer.put(data); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java new file mode 100644 index 0000000..98dbb17 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java @@ -0,0 +1,3 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; + +public class LongMessageException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java index 570963c..5793876 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java @@ -6,12 +6,12 @@ import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.util.DataWriter; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.FileTransmitter; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FileTransmitter; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.LongMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; import java.io.IOException; import java.nio.channels.SelectionKey; @@ -43,7 +43,8 @@ public FTPChannelObserver(final @NotNull SocketChannel channel, reader = new FTPMessageReader(channel); } - public void registerMessageWriter(final @NotNull FTPMessage message) throws RegisteringSecondDataWriterException { + public void registerMessageWriter(final @NotNull FTPMessage message) + throws RegisteringSecondDataWriterException, LongMessageException { if (writer != null) { throw new RegisteringSecondDataWriterException(); } @@ -62,33 +63,37 @@ public void registerFileTransmitter(final @NotNull Path path) writer = new FileTransmitter(channel, path); } - public void read() throws IOException, MessageWithNonpositiveLengthException { - switch (reader.read()) { - case NOT_READ: - return; + public void read() throws IOException { + try { + switch (reader.read()) { + case NOT_READ: + return; - case READ: - FTPMessage message; + case READ: + FTPMessage message; - try { - message = reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } + try { + message = reader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } - reader.reset(); + reader.reset(); - try { - server.handleMessage(channel, message); - } catch (InvalidMessageException e) { - channel.close(); - } + try { + server.handleMessage(channel, message); + } catch (InvalidMessageException e) { + channel.close(); + } - break; + break; - case CLOSED: - channel.close(); - break; + case CLOSED: + channel.close(); + break; + } + } catch (InvalidMessageException e) { + channel.close(); } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 62bbea1..145d2bf 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -23,12 +23,10 @@ import java.util.List; /** - * TODO: limit a length of an incoming message * TODO: check if it is possible to see something outside of a tracked folder * TODO: do refactoring * TODO: javadocs * TODO: tests - * TODO: check in server tests that server thread stopped correctly * TODO: logging */ public class Server { @@ -73,13 +71,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { } if (key.isReadable()) { - try { - ((FTPChannelObserver) key.attachment()).read(); - } catch (InvalidMessageException e) { - logger.error("Server ({}) received an invalid message", this); - - key.channel().close(); - } + ((FTPChannelObserver) key.attachment()).read(); if (!key.channel().isOpen()) { continue; From 11ce144f37525c03a7e30413aaf43c6b215313b7 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 22:40:36 +0300 Subject: [PATCH 44/69] Add to Server checking of received path on its validness. --- .../bachelor2015/veselov/hw04/Client.java | 4 + .../bachelor2015/veselov/hw04/ServerTest.java | 137 +++++++++--------- .../bachelor2015/veselov/hw04/Server.java | 10 +- 3 files changed, 76 insertions(+), 75 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 5d12739..833b059 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -65,6 +65,10 @@ public void close() throws IOException { selector.close(); } + public boolean isOpen() { + return channel.isOpen(); + } + public @NotNull List list(final @NotNull String path) throws IOException, InvalidMessageException, ConnectionWasClosedException { writeMessage(new FTPListMessage(path)); diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index c8c7b5f..d4df9fc 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -1,72 +1,67 @@ package ru.spbau.bachelor2015.veselov.hw04; -import org.apache.commons.lang3.SerializationUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; +import org.hamcrest.Matcher; import org.jetbrains.annotations.NotNull; +import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; + import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import static org.apache.commons.lang3.ArrayUtils.addAll; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; public class ServerTest { @Rule - public TemporaryFolder serverFolder = new TemporaryFolder(); + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private final String trackedFolderName = "tracked"; - private final int directoriesInRootFolder = 10; + private final int foldersInRootFolder = 10; private final String fileNamePrefix = "file"; - private final String directoryNamePrefix = "dir"; + private final String folderNamePrefix = "dir"; - private Path pathToRoot; + private Path[] relativePathToFolderInRoot; - @Before - public void folderInitialization() throws Exception { - pathToRoot = serverFolder.getRoot().toPath(); + private Path pathToTrackedFolder; - for (int i = 0; i < directoriesInRootFolder; i++) { - String stringedIndex = Integer.toString(i); - Path path = serverFolder.newFolder(directoryNamePrefix + stringedIndex).toPath(); - Files.createFile(path.resolve(fileNamePrefix + stringedIndex)); - } - } + private final int port = 10000; - @Test - public void testFTPListMessage() throws Exception { - processMessages(new MessageTest[] { new SubDirTest(0) }); - } + private Server server; - @Test - public void testFTPListMessages() throws Exception { - MessageTest[] messages = new MessageTest[directoriesInRootFolder]; - for (int i = 0; i < directoriesInRootFolder; i++) { - messages[i] = new SubDirTest(i); - } + private Client client; + + private void folderInitialization() throws Exception { + pathToTrackedFolder = temporaryFolder.newFolder(trackedFolderName).toPath(); + + relativePathToFolderInRoot = new Path[foldersInRootFolder]; + for (int i = 0; i < foldersInRootFolder; i++) { + Path path = Files.createDirectory(pathToTrackedFolder.resolve(folderNamePrefix + i)); + Files.createFile(path.resolve(fileNamePrefix + i)); - processMessages(messages); + relativePathToFolderInRoot[i] = pathToTrackedFolder.relativize(path); + } } - private void processMessages(final @NotNull MessageTest[] messages) throws Exception { - final int port = 10000; - Server server = new Server(pathToRoot, port); + private void serverInitialization() { + server = new Server(pathToTrackedFolder, port); server.start(); + } - Client client = null; + private void clientInitialization() { + client = null; while (client == null) { try { @@ -74,38 +69,49 @@ private void processMessages(final @NotNull MessageTest[] messages) throws Excep } catch (IOException ignore) { } } + } - for (MessageTest testMessage : messages) { - testMessage.test(client); - } + @Before + public void before() throws Exception { + folderInitialization(); + serverInitialization(); + clientInitialization(); + } + @After + public void after() throws IOException, InterruptedException { client.close(); server.stop(); } - private @NotNull byte[] prepareMessage(final @NotNull FTPMessage message) { - byte[] content = SerializationUtils.serialize(message); - - return addAll(toLengthByteArray(content.length), content); + @Test + public void testFTPListMessage() throws Exception { + new SubDirTestMessage(0).test(client); } - private @NotNull byte[] readMessage(final @NotNull InputStream inputStream) throws IOException { - byte[] rawLength = new byte[Integer.BYTES]; - - if (inputStream.read(rawLength) != rawLength.length) { - throw new RuntimeException(); + @Test + public void testFTPListMessages() throws Exception { + for (int i = 0; i < foldersInRootFolder; i++) { + new SubDirTestMessage(i).test(client); } + } - ByteBuffer buffer = ByteBuffer.allocate(rawLength.length); - buffer.put(rawLength).flip(); - int length = buffer.getInt(); + @Test + public void testListRequestOfRootFolder() throws Exception { + List entries = this.client.list( + pathToTrackedFolder.relativize(pathToTrackedFolder).toString()); - byte[] message = new byte[length]; - if (inputStream.read(message) != message.length) { - throw new RuntimeException(); + Matcher[] matchers = new Matcher[foldersInRootFolder]; + for (int i = 0; i < foldersInRootFolder; i++) { + matchers[i] = fileEntry(relativePathToFolderInRoot[i], true); } - return message; + assertThat(entries, containsInAnyOrder(matchers)); + } + + @Test(expected = ConnectionWasClosedException.class) + public void testListRequestOfForbiddenFolder() throws Exception { + client.list(pathToTrackedFolder.relativize(temporaryFolder.getRoot().toPath()).toString()); } private @NotNull FileEntryMatcher fileEntry(final @NotNull Path path, @@ -113,37 +119,24 @@ private void processMessages(final @NotNull MessageTest[] messages) throws Excep return new FileEntryMatcher(path, isDirectory); } - public static @NotNull byte[] toLengthByteArray(int integer) { - return ByteBuffer.allocate(Integer.BYTES).putInt(integer).array().clone(); - } - - private class SubDirTest implements MessageTest { + private class SubDirTestMessage { private final int subDirIndex; - public SubDirTest(final int index) { + public SubDirTestMessage(final int index) { subDirIndex = index; } - @Override public void test(final @NotNull Client client) throws Exception { - String stringedIndex = Integer.toString(subDirIndex); - String directoryName = directoryNamePrefix + stringedIndex; - String fileName = fileNamePrefix + stringedIndex; + String fileName = fileNamePrefix + subDirIndex; List answer = - client.list(Paths.get("").resolve(directoryName).toString()); + client.list(relativePathToFolderInRoot[subDirIndex].toString()); assertThat(answer, is(contains( - fileEntry(pathToRoot.relativize(pathToRoot.resolve(directoryName) - .resolve(fileName)), - false)))); + fileEntry(relativePathToFolderInRoot[subDirIndex].resolve(fileName), false)))); } } - private interface MessageTest { - void test(final @NotNull Client client) throws Exception; - } - private static class FileEntryMatcher extends BaseMatcher { private final @NotNull Path path; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 145d2bf..689cc53 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -23,11 +23,10 @@ import java.util.List; /** - * TODO: check if it is possible to see something outside of a tracked folder - * TODO: do refactoring * TODO: javadocs * TODO: tests * TODO: logging + * TODO: do refactoring */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -149,7 +148,12 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi throw new InvalidPathException(); } - File[] files = trackedFolder.resolve(path).toFile().listFiles(); + path = trackedFolder.resolve(path).normalize(); + if (!trackedFolder.equals(path) && trackedFolder.startsWith(path)) { + throw new InvalidPathException(); + } + + File[] files = path.toFile().listFiles(); List entries = new ArrayList<>(); From 771c55ef622ab80dec82795bcb55ce2ff64cbb38 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Wed, 26 Apr 2017 23:41:15 +0300 Subject: [PATCH 45/69] Add get command. --- .../bachelor2015/veselov/hw04/Client.java | 64 +++++++++------- .../spbau/bachelor2015/veselov/hw04/Main.java | 25 ++++++- .../veselov/hw04/messages/FTPGetMessage.java | 15 ++++ .../hw04/messages/util/DataReader.java | 11 +++ .../hw04/messages/util/FTPMessageReader.java | 17 ++--- .../hw04/messages/util/FileReceiver.java | 75 +++++++++++++++++++ .../exceptions/InvalidMessageException.java | 4 +- .../bachelor2015/veselov/hw04/Server.java | 44 ++++++++--- 8 files changed, 205 insertions(+), 50 deletions(-) create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 833b059..2be22eb 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -4,11 +4,14 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPGetMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.DataReader; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageWriter; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.FileReceiver; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; @@ -18,11 +21,13 @@ import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; +import java.nio.file.Path; import java.util.List; /** * A client class establishes a connection with ftp server and allows to send a request messages to it. * TODO: client will freeze on write operation if server closed connection for some reason. + * TODO: some exceptions look weired */ public class Client implements AutoCloseable { private final static @NotNull Logger logger = LogManager.getLogger(Client.class.getCanonicalName()); @@ -31,7 +36,7 @@ public class Client implements AutoCloseable { private final @NotNull Selector selector; - private final @NotNull FTPMessageReader reader; + private final @NotNull FTPMessageReader messageReader; /** * Establishes a connection. @@ -49,7 +54,7 @@ public Client(final @NotNull String host, final int port) throws IOException { channel.register(selector, SelectionKey.OP_READ); - reader = new FTPMessageReader(channel); + messageReader = new FTPMessageReader(channel); logger.info("Client ({}) established a connection with a server on {}:{}", this, host, port); } @@ -65,19 +70,39 @@ public void close() throws IOException { selector.close(); } - public boolean isOpen() { - return channel.isOpen(); - } - public @NotNull List list(final @NotNull String path) - throws IOException, InvalidMessageException, ConnectionWasClosedException { + throws IOException, ConnectionWasClosedException { writeMessage(new FTPListMessage(path)); - return ((FTPListAnswerMessage) readMessage()).getContent(); + read(messageReader); + + FTPMessage answer; + + try { + answer = messageReader.getMessage(); + } catch (MessageNotReadException e) { + throw new RuntimeException(e); + } + + messageReader.reset(); + + logger.info("Client ({}) received a message from server", this); + + return ((FTPListAnswerMessage) answer).getContent(); } - private void writeMessage(final @NotNull FTPListMessage message) - throws IOException, InvalidMessageException, ConnectionWasClosedException { + public void get(final @NotNull String pathToSource, final @NotNull Path pathToDestination) + throws ConnectionWasClosedException, IOException { + writeMessage(new FTPGetMessage(pathToSource)); + + FileReceiver receiver = new FileReceiver(channel, pathToDestination); + read(receiver); + + logger.info("Client ({}) received a file from server", this); + } + + private void writeMessage(final @NotNull FTPMessage message) + throws IOException, ConnectionWasClosedException { logger.info("Client ({}) began sending a message to server", this); FTPMessageWriter writer = new FTPMessageWriter(channel, message); @@ -113,9 +138,9 @@ private void writeMessage(final @NotNull FTPListMessage message) logger.info("Client ({}) sent a message to server", this); } - private @NotNull FTPMessage readMessage() - throws IOException, InvalidMessageException, ConnectionWasClosedException { - logger.info("Client ({}) began waiting a message from server", this); + private void read(final @NotNull DataReader reader) + throws IOException, ConnectionWasClosedException { + logger.info("Client ({}) began waiting data from server", this); while (true) { selector.select(); @@ -128,18 +153,7 @@ private void writeMessage(final @NotNull FTPListMessage message) break; case READ: - FTPMessage answer; - - try { - answer = reader.getMessage(); - } catch (MessageNotReadException e) { - throw new RuntimeException(e); - } - - reader.reset(); - - logger.info("Client ({}) received a message from server", this); - return answer; + return; case CLOSED: throw new ConnectionWasClosedException(); diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 8043d8d..a5c765b 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -2,19 +2,19 @@ import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.util.Scanner; +import java.nio.file.Paths; import java.util.List; +import java.util.Scanner; /** * Entry point of a client program. This class allows to make requests to server. */ public class Main { - public static void main(String[] args) throws IOException, ConnectionWasClosedException, InvalidMessageException { + public static void main(String[] args) throws IOException, ConnectionWasClosedException { if (args.length != 2) { System.out.println("Two arguments expected"); return; @@ -51,6 +51,25 @@ public static void main(String[] args) throws IOException, ConnectionWasClosedEx break; + case "get": + if (!scanner.hasNext()) { + System.out.println("Two arguments expected"); + break; + } + + String source = scanner.next(); + + if (!scanner.hasNext()) { + System.out.println("Two arguments expected"); + break; + } + + String destination = scanner.next(); + + client.get(source, Paths.get(destination)); + + break; + default: System.out.println("Unknown command: " + command); } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java new file mode 100644 index 0000000..677f3b9 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java @@ -0,0 +1,15 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages; + +import org.jetbrains.annotations.NotNull; + +public class FTPGetMessage implements FTPMessage { + private final @NotNull String path; + + public FTPGetMessage(final @NotNull String path) { + this.path = path; + } + + public @NotNull String getPath() { + return path; + } +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java new file mode 100644 index 0000000..254f865 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java @@ -0,0 +1,11 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util; + +import java.io.IOException; + +public interface DataReader { + ReadingResult read() throws IOException; + + enum ReadingResult { + READ, NOT_READ, CLOSED + } +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java index 634d348..2da311b 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java @@ -4,7 +4,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.LongMessageException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; @@ -13,7 +12,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -public class FTPMessageReader { +public class FTPMessageReader implements DataReader { private final @NotNull ReadableByteChannel channel; private boolean isLengthRead = false; @@ -26,14 +25,14 @@ public FTPMessageReader(final @NotNull ReadableByteChannel channel) { this.channel = channel; } - public ReadingResult read() throws IOException, InvalidMessageException { + public DataReader.ReadingResult read() throws IOException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { - return ReadingResult.CLOSED; + return DataReader.ReadingResult.CLOSED; } if (lengthBuffer.hasRemaining()) { - return ReadingResult.NOT_READ; + return DataReader.ReadingResult.NOT_READ; } isLengthRead = true; @@ -53,14 +52,14 @@ public ReadingResult read() throws IOException, InvalidMessageException { } if (channel.read(messageBuffer) == -1) { - return ReadingResult.CLOSED; + return DataReader.ReadingResult.CLOSED; } if (messageBuffer.hasRemaining()) { - return ReadingResult.NOT_READ; + return DataReader.ReadingResult.NOT_READ; } - return ReadingResult.READ; + return DataReader.ReadingResult.READ; } public @NotNull FTPMessage getMessage() throws MessageNotReadException { @@ -79,6 +78,4 @@ public void reset() { lengthBuffer.clear(); messageBuffer = null; } - - public enum ReadingResult { READ, NOT_READ, CLOSED } } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java new file mode 100644 index 0000000..62f8a0a --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java @@ -0,0 +1,75 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util; + +import org.jetbrains.annotations.NotNull; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.channels.ReadableByteChannel; +import java.nio.file.Path; + +public class FileReceiver implements DataReader { + private static final int CHUNK_SIZE = 4096; + + private final @NotNull ReadableByteChannel channel; + + private final @NotNull FileChannel fileChannel; + + private boolean isLengthRead = false; + + private long bytesLeft; + + private final @NotNull ByteBuffer lengthBuffer = ByteBuffer.allocate(Long.BYTES); + + private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); + + public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull Path path) { + this.channel = channel; + + try { + fileChannel = new RandomAccessFile(path.toString(), "w").getChannel(); + } catch (FileNotFoundException e) { + /* Documentation for RandomAccessFile claims that FileNotFoundException might be thrown only if mode + contains 'r'. + */ + throw new RuntimeException(e); + } + } + + public @NotNull DataReader.ReadingResult read() throws IOException { + if (!isLengthRead) { + if (channel.read(lengthBuffer) == -1) { + return DataReader.ReadingResult.CLOSED; + } + + if (lengthBuffer.hasRemaining()) { + return DataReader.ReadingResult.NOT_READ; + } + + bytesLeft = lengthBuffer.getLong(); + isLengthRead = true; + } + + while (bytesLeft > 0) { + int bytesRead = channel.read(buffer); + if (bytesRead == -1) { + return DataReader.ReadingResult.CLOSED; + } + + bytesLeft -= bytesRead; + if (buffer.hasRemaining() && bytesRead > 0) { + return DataReader.ReadingResult.NOT_READ; + } + + buffer.flip(); + + fileChannel.write(buffer); + + buffer.clear(); + } + + return DataReader.ReadingResult.READ; + } +} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java index e0b386c..a8008ca 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java @@ -2,7 +2,9 @@ import org.jetbrains.annotations.NotNull; -public class InvalidMessageException extends Exception { +import java.io.IOException; + +public class InvalidMessageException extends IOException { public InvalidMessageException() {} public InvalidMessageException(final @NotNull Exception cause) { diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 689cc53..62ca15f 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -4,7 +4,11 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.*; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidPathException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoSuchMessageException; +import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; +import ru.spbau.bachelor2015.veselov.hw04.messages.FTPGetMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; @@ -133,8 +137,11 @@ void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessa throws InvalidMessageException, IOException { logger.info("Server ({}) received new message", this); + // TODO: add double dispatch if (message instanceof FTPListMessage) { handleMessage(channel.keyFor(selector), (FTPListMessage) message); + } else if (message instanceof FTPGetMessage) { + handleMessage(channel.keyFor(selector), (FTPGetMessage) message); } else { throw new NoSuchMessageException(); } @@ -142,16 +149,7 @@ void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessa private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) throws IOException, InvalidMessageException { - Path path = Paths.get(message.getPath()); - - if (path.isAbsolute()) { - throw new InvalidPathException(); - } - - path = trackedFolder.resolve(path).normalize(); - if (!trackedFolder.equals(path) && trackedFolder.startsWith(path)) { - throw new InvalidPathException(); - } + Path path = realPath(Paths.get(message.getPath())); File[] files = path.toFile().listFiles(); @@ -170,4 +168,28 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi throw new InvalidMessageException(e); } } + + private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPGetMessage message) + throws InvalidMessageException, IOException { + Path path = realPath(Paths.get(message.getPath())); + + try { + ((FTPChannelObserver) key.attachment()).registerFileTransmitter(path); + } catch (RegisteringSecondDataWriterException e) { + throw new InvalidMessageException(e); + } + } + + private @NotNull Path realPath(final @NotNull Path path) throws InvalidPathException { + if (path.isAbsolute()) { + throw new InvalidPathException(); + } + + Path real = trackedFolder.resolve(path).normalize(); + if (!trackedFolder.equals(real) && trackedFolder.startsWith(real)) { + throw new InvalidPathException(); + } + + return real; + } } From a61fd14c39ec4bb5bc2ec6a0a83ded8b5731fa98 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 01:20:20 +0300 Subject: [PATCH 46/69] Fix bug in FileReceiver. --- .../Gradle__commons_io_commons_io_2_5.xml | 11 ++++++++ .../integration-tests_main.iml | 1 + .../integration-tests_test.iml | 1 + .../bachelor2015/veselov/hw04/Client.java | 27 +++++++++---------- 04-SimpleFTP/integration-tests/build.gradle | 1 + .../bachelor2015/veselov/hw04/ServerTest.java | 27 ++++++++++++++----- .../hw04/messages/util/FileReceiver.java | 21 ++++++++------- .../bachelor2015/veselov/hw04/Server.java | 6 +++-- 8 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 04-SimpleFTP/.idea/libraries/Gradle__commons_io_commons_io_2_5.xml diff --git a/04-SimpleFTP/.idea/libraries/Gradle__commons_io_commons_io_2_5.xml b/04-SimpleFTP/.idea/libraries/Gradle__commons_io_commons_io_2_5.xml new file mode 100644 index 0000000..12ab8e6 --- /dev/null +++ b/04-SimpleFTP/.idea/libraries/Gradle__commons_io_commons_io_2_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml index 7ce9466..91721e7 100644 --- a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml +++ b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_main.iml @@ -17,6 +17,7 @@ + diff --git a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml index bb81d2a..14e379e 100644 --- a/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml +++ b/04-SimpleFTP/.idea/modules/integration-tests/integration-tests_test.iml @@ -18,6 +18,7 @@ + diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 2be22eb..3ccbf23 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -144,25 +144,22 @@ private void read(final @NotNull DataReader reader) while (true) { selector.select(); - SelectionKey key = channel.keyFor(selector); - if (key.isReadable()) { - try { - switch (reader.read()) { - case NOT_READ: - break; - - case READ: - return; + try { + switch (reader.read()) { + case NOT_READ: + break; - case CLOSED: - throw new ConnectionWasClosedException(); - } - } catch (InvalidMessageException | ConnectionWasClosedException e) { - channel.close(); + case READ: + return; - throw e; + case CLOSED: + throw new ConnectionWasClosedException(); } + } catch (InvalidMessageException | ConnectionWasClosedException e) { + channel.close(); + + throw e; } selector.selectedKeys().clear(); diff --git a/04-SimpleFTP/integration-tests/build.gradle b/04-SimpleFTP/integration-tests/build.gradle index 5a0307e..2808797 100644 --- a/04-SimpleFTP/integration-tests/build.gradle +++ b/04-SimpleFTP/integration-tests/build.gradle @@ -20,4 +20,5 @@ dependencies { compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' + compile group: 'commons-io', name: 'commons-io', version: '2.5' } \ No newline at end of file diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index d4df9fc..fd2709f 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -21,6 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; +// TODO: add timeouts public class ServerTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @@ -35,6 +36,8 @@ public class ServerTest { private Path[] relativePathToFolderInRoot; + private Path[] relativePathToFilesInRootSubFolders; + private Path pathToTrackedFolder; private final int port = 10000; @@ -47,11 +50,15 @@ private void folderInitialization() throws Exception { pathToTrackedFolder = temporaryFolder.newFolder(trackedFolderName).toPath(); relativePathToFolderInRoot = new Path[foldersInRootFolder]; + relativePathToFilesInRootSubFolders = new Path[foldersInRootFolder]; + for (int i = 0; i < foldersInRootFolder; i++) { - Path path = Files.createDirectory(pathToTrackedFolder.resolve(folderNamePrefix + i)); - Files.createFile(path.resolve(fileNamePrefix + i)); + Path pathToFolder = Files.createDirectory(pathToTrackedFolder.resolve(folderNamePrefix + i)); + Path pathToFile = Files.createFile(pathToFolder.resolve(fileNamePrefix + i)); + Files.write(pathToFile, new byte[] { (byte) i }); - relativePathToFolderInRoot[i] = pathToTrackedFolder.relativize(path); + relativePathToFolderInRoot[i] = pathToTrackedFolder.relativize(pathToFolder); + relativePathToFilesInRootSubFolders[i] = pathToTrackedFolder.relativize(pathToFile); } } @@ -114,6 +121,16 @@ public void testListRequestOfForbiddenFolder() throws Exception { client.list(pathToTrackedFolder.relativize(temporaryFolder.getRoot().toPath()).toString()); } + @Test + public void testGetRequestOnSmallFile() throws Exception { + final Path pathToDestination = temporaryFolder.newFile().toPath(); + + client.get(relativePathToFilesInRootSubFolders[0].toString(), pathToDestination); + + assertThat(Files.readAllBytes(pathToTrackedFolder.resolve(relativePathToFilesInRootSubFolders[0])), + is(equalTo(Files.readAllBytes(pathToDestination)))); + } + private @NotNull FileEntryMatcher fileEntry(final @NotNull Path path, final boolean isDirectory) { return new FileEntryMatcher(path, isDirectory); @@ -127,13 +144,11 @@ public SubDirTestMessage(final int index) { } public void test(final @NotNull Client client) throws Exception { - String fileName = fileNamePrefix + subDirIndex; - List answer = client.list(relativePathToFolderInRoot[subDirIndex].toString()); assertThat(answer, is(contains( - fileEntry(relativePathToFolderInRoot[subDirIndex].resolve(fileName), false)))); + fileEntry(relativePathToFilesInRootSubFolders[subDirIndex], false)))); } } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java index 62f8a0a..74698d9 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java @@ -25,17 +25,12 @@ public class FileReceiver implements DataReader { private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); - public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull Path path) { + public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull Path path) + throws FileNotFoundException { this.channel = channel; - try { - fileChannel = new RandomAccessFile(path.toString(), "w").getChannel(); - } catch (FileNotFoundException e) { - /* Documentation for RandomAccessFile claims that FileNotFoundException might be thrown only if mode - contains 'r'. - */ - throw new RuntimeException(e); - } + fileChannel = new RandomAccessFile(path.toString(), "rw").getChannel(); + } public @NotNull DataReader.ReadingResult read() throws IOException { @@ -48,18 +43,24 @@ public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull P return DataReader.ReadingResult.NOT_READ; } + lengthBuffer.flip(); bytesLeft = lengthBuffer.getLong(); + + // TODO: handle negative length + isLengthRead = true; } while (bytesLeft > 0) { int bytesRead = channel.read(buffer); + if (bytesRead == -1) { return DataReader.ReadingResult.CLOSED; } bytesLeft -= bytesRead; - if (buffer.hasRemaining() && bytesRead > 0) { + + if (buffer.hasRemaining() && bytesLeft > 0) { return DataReader.ReadingResult.NOT_READ; } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 62ca15f..4127000 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -27,6 +27,8 @@ import java.util.List; /** + * TODO: remove logging in client interface + * TODO: add friendly user interface * TODO: javadocs * TODO: tests * TODO: logging @@ -43,7 +45,7 @@ public class Server { private final @NotNull Thread serverThread; - private @Nullable Selector selector; + private volatile @Nullable Selector selector; public Server(final @NotNull Path trackedFolder, final int port) { logger.info("New Server ({}) is created", this); @@ -170,7 +172,7 @@ private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPLi } private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPGetMessage message) - throws InvalidMessageException, IOException { + throws IOException { Path path = realPath(Paths.get(message.getPath())); try { From 5387f52a501367320d4adbd1039e5947867cfadc Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 01:44:59 +0300 Subject: [PATCH 47/69] Fix problem with freezing cient. --- .../spbau/bachelor2015/veselov/hw04/Client.java | 16 +++++++++------- .../bachelor2015/veselov/hw04/ServerTest.java | 7 +++++++ .../spbau/bachelor2015/veselov/hw04/Server.java | 10 +++++++++- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java index 3ccbf23..ba1cedf 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java @@ -26,7 +26,6 @@ /** * A client class establishes a connection with ftp server and allows to send a request messages to it. - * TODO: client will freeze on write operation if server closed connection for some reason. * TODO: some exceptions look weired */ public class Client implements AutoCloseable { @@ -110,17 +109,18 @@ private void writeMessage(final @NotNull FTPMessage message) SelectionKey key = channel.keyFor(selector); key.interestOps(key.interestOps() | SelectionKey.OP_WRITE); - while (true) { + boolean shouldRun = true; + while (shouldRun) { selector.select(); if (key.isWritable()) { if (writer.write()) { - break; + shouldRun = false; } } - if (key.isReadable()) { - int bytesRead = channel.read((ByteBuffer) null); + if (shouldRun && key.isReadable()) { + int bytesRead = channel.read(ByteBuffer.allocate(1)); close(); @@ -142,7 +142,8 @@ private void read(final @NotNull DataReader reader) throws IOException, ConnectionWasClosedException { logger.info("Client ({}) began waiting data from server", this); - while (true) { + boolean shouldRun = true; + while (shouldRun) { selector.select(); try { @@ -151,7 +152,8 @@ private void read(final @NotNull DataReader reader) break; case READ: - return; + shouldRun = false; + break; case CLOSED: throw new ConnectionWasClosedException(); diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index fd2709f..ca19801 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -131,6 +131,13 @@ public void testGetRequestOnSmallFile() throws Exception { is(equalTo(Files.readAllBytes(pathToDestination)))); } + @Test(expected = ConnectionWasClosedException.class, timeout = 1000) + public void serverDisconnects() throws Exception { + server.stop(); + + client.list(pathToTrackedFolder.relativize(pathToTrackedFolder).toString()); + } + private @NotNull FileEntryMatcher fileEntry(final @NotNull Path path, final boolean isDirectory) { return new FileEntryMatcher(path, isDirectory); diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 4127000..81440de 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -27,12 +27,12 @@ import java.util.List; /** - * TODO: remove logging in client interface * TODO: add friendly user interface * TODO: javadocs * TODO: tests * TODO: logging * TODO: do refactoring + * TODO: remove logging in client interface */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -103,6 +103,10 @@ public Server(final @NotNull Path trackedFolder, final int port) { selector.selectedKeys().clear(); } + for (SelectionKey key : selector.keys()) { + key.channel().close(); + } + logger.info("Server ({}) is stopped", this); } catch (IOException e) { throw new RuntimeException(e); @@ -120,6 +124,10 @@ public void start() { } public void stop() throws InterruptedException { + if (!serverThread.isAlive()) { + return; + } + shouldRun = false; selector.wakeup(); serverThread.join(); From f152167aedfeae7872e9e8a4105a4b5c0f3b58ec Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 02:01:48 +0300 Subject: [PATCH 48/69] Add hints to console interface. --- .../java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 8 ++++---- .../java/ru/spbau/bachelor2015/veselov/hw04/Main.java | 4 ++-- .../ru/spbau/bachelor2015/veselov/hw04/Server.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index a5c765b..fd8bb83 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -16,7 +16,7 @@ public class Main { public static void main(String[] args) throws IOException, ConnectionWasClosedException { if (args.length != 2) { - System.out.println("Two arguments expected"); + System.out.println("Two arguments expected: "); return; } @@ -40,7 +40,7 @@ public static void main(String[] args) throws IOException, ConnectionWasClosedEx case "list": if (!scanner.hasNext()) { - System.out.println("Argument expected"); + System.out.println("Argument expected: "); break; } @@ -53,14 +53,14 @@ public static void main(String[] args) throws IOException, ConnectionWasClosedEx case "get": if (!scanner.hasNext()) { - System.out.println("Two arguments expected"); + System.out.println("Two arguments expected: "); break; } String source = scanner.next(); if (!scanner.hasNext()) { - System.out.println("Two arguments expected"); + System.out.println("Two arguments expected: "); break; } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java index 2d6f983..b2a19f7 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java @@ -17,7 +17,7 @@ public class Main { */ public static void main(String[] args) throws IOException, InterruptedException { if (args.length != 2) { - System.out.println("Two arguments expected"); + System.out.println("Two arguments expected: "); return; } @@ -43,7 +43,7 @@ public static void main(String[] args) throws IOException, InterruptedException break; default: - System.out.println("Unknown command"); + System.out.println("Unknown command: " + command); } } } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java index 81440de..ddaff51 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java @@ -27,12 +27,13 @@ import java.util.List; /** - * TODO: add friendly user interface + * TODO: split everything on packages * TODO: javadocs - * TODO: tests * TODO: logging * TODO: do refactoring + * TODO: tests * TODO: remove logging in client interface + * TODO: look at gradle files */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -143,8 +144,7 @@ private void acceptNewConnection(final @NotNull ServerSocketChannel serverSocket new FTPChannelObserver(socketChannel, selector, this); } - void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) - throws InvalidMessageException, IOException { + void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) throws IOException { logger.info("Server ({}) received new message", this); // TODO: add double dispatch @@ -158,7 +158,7 @@ void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessa } private void handleMessage(final @NotNull SelectionKey key, final @NotNull FTPListMessage message) - throws IOException, InvalidMessageException { + throws IOException { Path path = realPath(Paths.get(message.getPath())); File[] files = path.toFile().listFiles(); From 701c338bc4e6443e6eb6afc6dc3bb1facf61c9ac Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 02:04:52 +0300 Subject: [PATCH 49/69] Put classes in different modules into different packages. --- .../veselov/hw04/{ => client}/Client.java | 4 ++-- .../bachelor2015/veselov/hw04/{ => client}/Main.java | 4 ++-- .../exceptions/ConnectionWasClosedException.java | 2 +- .../spbau/bachelor2015/veselov/hw04/ServerTest.java | 4 +++- .../veselov/hw04/{ => server}/FTPChannelObserver.java | 6 +++--- .../bachelor2015/veselov/hw04/{ => server}/Main.java | 2 +- .../veselov/hw04/{ => server}/Server.java | 11 +++++------ .../{ => server}/exceptions/InvalidPathException.java | 2 +- .../exceptions/NoDataWriterRegisteredException.java | 2 +- .../exceptions/NoSuchMessageException.java | 2 +- .../RegisteringSecondDataWriterException.java | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) rename 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => client}/Client.java (97%) rename 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => client}/Main.java (94%) rename 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => client}/exceptions/ConnectionWasClosedException.java (50%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/FTPChannelObserver.java (93%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/Main.java (96%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/Server.java (94%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/exceptions/InvalidPathException.java (72%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/exceptions/NoDataWriterRegisteredException.java (51%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/exceptions/NoSuchMessageException.java (72%) rename 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{ => server}/exceptions/RegisteringSecondDataWriterException.java (53%) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java similarity index 97% rename from 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java rename to 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java index ba1cedf..7a64e2b 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java @@ -1,9 +1,9 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.client; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.client.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPGetMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java similarity index 94% rename from 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java rename to 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java index fd8bb83..2996ac0 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java @@ -1,6 +1,6 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.client; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.client.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import java.io.BufferedReader; diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java similarity index 50% rename from 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java rename to 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java index f735a3d..86c15fe 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/ConnectionWasClosedException.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.client.exceptions; public class ConnectionWasClosedException extends Exception {} diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index ca19801..9c0a1e1 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -9,8 +9,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.ConnectionWasClosedException; +import ru.spbau.bachelor2015.veselov.hw04.client.Client; +import ru.spbau.bachelor2015.veselov.hw04.client.exceptions.ConnectionWasClosedException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; +import ru.spbau.bachelor2015.veselov.hw04.server.Server; import java.io.IOException; import java.nio.file.Files; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java similarity index 93% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java index 5793876..170da9f 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/FTPChannelObserver.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java @@ -1,9 +1,9 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.server; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.NoDataWriterRegisteredException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.RegisteringSecondDataWriterException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.util.DataWriter; import ru.spbau.bachelor2015.veselov.hw04.messages.util.FTPMessageReader; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java similarity index 96% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java index b2a19f7..a06560e 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Main.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.server; import java.io.BufferedReader; import java.io.IOException; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java similarity index 94% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index ddaff51..ea98735 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -1,13 +1,13 @@ -package ru.spbau.bachelor2015.veselov.hw04; +package ru.spbau.bachelor2015.veselov.hw04.server; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.InvalidPathException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoDataWriterRegisteredException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.NoSuchMessageException; -import ru.spbau.bachelor2015.veselov.hw04.exceptions.RegisteringSecondDataWriterException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.InvalidPathException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.NoDataWriterRegisteredException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.NoSuchMessageException; +import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.RegisteringSecondDataWriterException; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPGetMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListAnswerMessage; import ru.spbau.bachelor2015.veselov.hw04.messages.FTPListMessage; @@ -27,7 +27,6 @@ import java.util.List; /** - * TODO: split everything on packages * TODO: javadocs * TODO: logging * TODO: do refactoring diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java similarity index 72% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java index 5d09972..10fd131 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/InvalidPathException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java similarity index 51% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java index c9b2145..a5e8e89 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoDataWriterRegisteredException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; public class NoDataWriterRegisteredException extends Exception {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java similarity index 72% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java index 5d561e5..e4ad00e 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/NoSuchMessageException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java @@ -1,4 +1,4 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java similarity index 53% rename from 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java rename to 04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java index c041514..2fcf023 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/exceptions/RegisteringSecondDataWriterException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java @@ -1,3 +1,3 @@ -package ru.spbau.bachelor2015.veselov.hw04.exceptions; +package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; public class RegisteringSecondDataWriterException extends Exception {} From 5ecd7dcd626a6acd8380c2027b74e324d4e11c6b Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 04:17:11 +0300 Subject: [PATCH 50/69] Add javadocs. --- .../veselov/hw04/client/Client.java | 24 +++++++++-- .../veselov/hw04/client/Main.java | 11 ++++- .../ConnectionWasClosedException.java | 3 ++ .../veselov/hw04/messages/FTPGetMessage.java | 11 +++++ .../hw04/messages/FTPListAnswerMessage.java | 4 +- .../veselov/hw04/messages/FTPListMessage.java | 2 +- .../hw04/messages/util/DataReader.java | 12 ++++++ .../hw04/messages/util/DataWriter.java | 10 +++++ .../hw04/messages/util/FTPMessageReader.java | 19 +++++++++ .../hw04/messages/util/FTPMessageWriter.java | 16 ++++++++ .../hw04/messages/util/FileReceiver.java | 22 +++++++++- .../hw04/messages/util/FileTransmitter.java | 17 ++++++++ .../FileWithNegativeLengthException.java | 8 ++++ .../exceptions/InvalidMessageException.java | 11 +++++ .../util/exceptions/LongMessageException.java | 4 ++ .../exceptions/MessageNotReadException.java | 4 ++ ...MessageWithNonpositiveLengthException.java | 3 ++ .../hw04/server/FTPChannelObserver.java | 40 ++++++++++++++++++- .../veselov/hw04/server/Main.java | 6 ++- .../veselov/hw04/server/Server.java | 21 +++++++++- .../exceptions/InvalidPathException.java | 3 ++ .../NoDataWriterRegisteredException.java | 4 ++ .../exceptions/NoSuchMessageException.java | 3 ++ .../RegisteringSecondDataWriterException.java | 4 ++ 24 files changed, 247 insertions(+), 15 deletions(-) create mode 100644 04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/FileWithNegativeLengthException.java diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java index 7a64e2b..399b6e5 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java @@ -25,8 +25,8 @@ import java.util.List; /** - * A client class establishes a connection with ftp server and allows to send a request messages to it. - * TODO: some exceptions look weired + * A client class establishes a connection with ftp server and allows to send a request messages to it and receive + * responses. */ public class Client implements AutoCloseable { private final static @NotNull Logger logger = LogManager.getLogger(Client.class.getCanonicalName()); @@ -42,7 +42,7 @@ public class Client implements AutoCloseable { * * @param host a host to connect to. * @param port a port to connect to. - * @throws IOException if any IO exception occurs during establishment of connection. + * @throws IOException if any IO exception occurs during establishment of the connection. */ public Client(final @NotNull String host, final int port) throws IOException { selector = Selector.open(); @@ -69,6 +69,14 @@ public void close() throws IOException { selector.close(); } + /** + * Performs a list request. This request asks a content of a specified folder. + * + * @param path a path to a folder which content is requested. + * @return a list of entries which denotes a requested content. + * @throws IOException if any IO exception occurs during client interaction with a server. + * @throws ConnectionWasClosedException if in the middle of the process connection was closed. + */ public @NotNull List list(final @NotNull String path) throws IOException, ConnectionWasClosedException { writeMessage(new FTPListMessage(path)); @@ -90,8 +98,16 @@ public void close() throws IOException { return ((FTPListAnswerMessage) answer).getContent(); } + /** + * Performs a get request. This request asks a content of a specified file. + * + * @param pathToSource a string representation of a path to a file which content is requested. + * @param pathToDestination a path to a file in which downloaded data will be written. + * @throws IOException if any IO exception occurs during client interaction with a server. + * @throws ConnectionWasClosedException if in the middle of the process connection was closed. + */ public void get(final @NotNull String pathToSource, final @NotNull Path pathToDestination) - throws ConnectionWasClosedException, IOException { + throws IOException, ConnectionWasClosedException { writeMessage(new FTPGetMessage(pathToSource)); FileReceiver receiver = new FileReceiver(channel, pathToDestination); diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java index 2996ac0..0978909 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Main.java @@ -14,7 +14,14 @@ * Entry point of a client program. This class allows to make requests to server. */ public class Main { - public static void main(String[] args) throws IOException, ConnectionWasClosedException { + /** + * Entry point. + * + * @param args two arguments are expected. First is a string representation of a host, second is port. Together they + * form an address of a server to which client will be connected. + * @throws IOException if any IO exception occurs during application work. + */ + public static void main(String[] args) throws IOException { if (args.length != 2) { System.out.println("Two arguments expected: "); return; @@ -74,6 +81,8 @@ public static void main(String[] args) throws IOException, ConnectionWasClosedEx System.out.println("Unknown command: " + command); } } + } catch (ConnectionWasClosedException e) { + System.out.println("You were disconnected"); } } } diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java index 86c15fe..df0b006 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java @@ -1,3 +1,6 @@ package ru.spbau.bachelor2015.veselov.hw04.client.exceptions; +/** + * An exception which might be thrown by Client if a connection was suddenly closed. + */ public class ConnectionWasClosedException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java index 677f3b9..54c350e 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPGetMessage.java @@ -2,13 +2,24 @@ import org.jetbrains.annotations.NotNull; +/** + * An ftp request message. This message asks server to send a content of a specified file. + */ public class FTPGetMessage implements FTPMessage { private final @NotNull String path; + /** + * Creates a message. + * + * @param path a string representation of a path to a file which content will be requested. + */ public FTPGetMessage(final @NotNull String path) { this.path = path; } + /** + * Returns a string representation of a path to a file which content will be requested. + */ public @NotNull String getPath() { return path; } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java index f2636ec..0f96c10 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListAnswerMessage.java @@ -40,7 +40,7 @@ public static class Entry implements Serializable { /** * Creates an entry. * - * @param path a string representation of a file. + * @param path a string representation of a path to a file. * @param isDirectory a flag which tells whether or not this entry represents a directory. */ public Entry(final @NotNull String path, final boolean isDirectory) { @@ -49,7 +49,7 @@ public Entry(final @NotNull String path, final boolean isDirectory) { } /** - * Returns a string representation of a file. + * Returns a string representation of a path to a file. */ public @NotNull String getPath() { return path; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java index 3166dda..025dc0c 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/FTPListMessage.java @@ -18,7 +18,7 @@ public FTPListMessage(final @NotNull String path) { } /** - * Returns string representation of a path to a folder. + * Returns string representation of a path to a folder which content will be requested. */ public @NotNull String getPath() { return path; diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java index 254f865..000a0c4 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataReader.java @@ -2,9 +2,21 @@ import java.io.IOException; +/** + * An interface which represents an entity which has an ability to read. It is assumed that such entity reads from a + * socket channel. + */ public interface DataReader { + /** + * Makes an attempt to read data from data source and returns the result of reading. + * + * @throws IOException if any IO exception occurs during reading process. + */ ReadingResult read() throws IOException; + /** + * Possible results of reading operation. CLOSED means that peer has closed the connection. + */ enum ReadingResult { READ, NOT_READ, CLOSED } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java index ff8fda5..2a6af1d 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/DataWriter.java @@ -2,6 +2,16 @@ import java.io.IOException; +/** + * An interface which represents an entity which has an ability to write. It is assumed that such entity writes to a + * socket channel. + */ public interface DataWriter { + /** + * Makes an attempt to write data to data consumer and returns the result of writing which is true in case when + * writer has written all the data it had. + * + * @throws IOException if any IO exception occurs during writing process. + */ boolean write() throws IOException; } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java index 2da311b..a4d937f 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReader.java @@ -12,6 +12,9 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; +/** + * Message reader is a data reader which is responsible for reading a single ftp message from a specified channel. + */ public class FTPMessageReader implements DataReader { private final @NotNull ReadableByteChannel channel; @@ -21,10 +24,21 @@ public class FTPMessageReader implements DataReader { private @Nullable ByteBuffer messageBuffer; + /** + * Creates a message reader for a specified channel. + * + * @param channel a channel which this reader will be reading from. + */ public FTPMessageReader(final @NotNull ReadableByteChannel channel) { this.channel = channel; } + /** + * Makes an attempt to read a message. + * + * @return the result of current attempt. + * @throws IOException if any IO exception occurs during reading process or if an invalid message was received. + */ public DataReader.ReadingResult read() throws IOException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { @@ -62,6 +76,11 @@ public DataReader.ReadingResult read() throws IOException { return DataReader.ReadingResult.READ; } + /** + * Returns a read ftp message. + * + * @throws MessageNotReadException if the message hasn't been read yet. + */ public @NotNull FTPMessage getMessage() throws MessageNotReadException { if (messageBuffer == null || messageBuffer.hasRemaining()) { throw new MessageNotReadException(); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java index 88f2d74..c13c33f 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriter.java @@ -9,11 +9,21 @@ import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; +/** + * Message writer is a data writer which is responsible for writing a single ftp message to a specified channel. + */ public class FTPMessageWriter implements DataWriter { private final @NotNull WritableByteChannel channel; private final @NotNull ByteBuffer buffer; + /** + * Creates a new message writer. + * + * @param channel a channel to which this message writer will be writing. + * @param message a message which this writer is responsible for. + * @throws LongMessageException if a given message is to long and can't be sent. + */ public FTPMessageWriter(final @NotNull WritableByteChannel channel, final @NotNull FTPMessage message) throws LongMessageException { this.channel = channel; @@ -30,6 +40,12 @@ public FTPMessageWriter(final @NotNull WritableByteChannel channel, final @NotNu buffer.flip(); } + /** + * Makes an attempt to write stored message to channel. + * + * @return true if message was fully written. + * @throws IOException if any IO exception occurs during writing process. + */ public boolean write() throws IOException { channel.write(buffer); return !buffer.hasRemaining(); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java index 74698d9..772da02 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileReceiver.java @@ -1,6 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.util; import org.jetbrains.annotations.NotNull; +import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.FileWithNegativeLengthException; import java.io.FileNotFoundException; import java.io.IOException; @@ -10,6 +11,9 @@ import java.nio.channels.ReadableByteChannel; import java.nio.file.Path; +/** + * File receiver is a data reader which is responsible for reading a content of a file from channel to a specified file. + */ public class FileReceiver implements DataReader { private static final int CHUNK_SIZE = 4096; @@ -25,6 +29,13 @@ public class FileReceiver implements DataReader { private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); + /** + * Creates a new file receiver. + * + * @param channel a channel from which file receiver will be reading content of a file. + * @param path a path in a local file system where file receiver will be writing received data. + * @throws FileNotFoundException if opening of a file has failed. + */ public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull Path path) throws FileNotFoundException { this.channel = channel; @@ -33,6 +44,12 @@ public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull P } + /** + * Makes an attempt to read a content of a file. + * + * @return the result of reading. + * @throws IOException if any IO exception occurs during reading process or if an invalid data was received. + */ public @NotNull DataReader.ReadingResult read() throws IOException { if (!isLengthRead) { if (channel.read(lengthBuffer) == -1) { @@ -46,7 +63,10 @@ public FileReceiver(final @NotNull ReadableByteChannel channel, final @NotNull P lengthBuffer.flip(); bytesLeft = lengthBuffer.getLong(); - // TODO: handle negative length + if (bytesLeft < 0) { + fileChannel.close(); + throw new FileWithNegativeLengthException(); + } isLengthRead = true; } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java index cb9e8bb..063273a 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FileTransmitter.java @@ -9,6 +9,10 @@ import java.nio.channels.WritableByteChannel; import java.nio.file.Path; +/** + * File transmitter is a data writer which is responsible for writing a content of a specified file to a specified + * channel. + */ public class FileTransmitter implements DataWriter { private static final int CHUNK_SIZE = 4096; @@ -18,6 +22,13 @@ public class FileTransmitter implements DataWriter { private final @NotNull ByteBuffer buffer = ByteBuffer.allocate(CHUNK_SIZE); + /** + * Creates a new file transmitter. + * + * @param channel a channel to which this transmitter will be writing. + * @param path a path to a file which content transmitter will be writing. + * @throws IOException if any IO exception occurs during file opening. + */ public FileTransmitter(final @NotNull WritableByteChannel channel, final @NotNull Path path) throws IOException { this.channel = channel; @@ -28,6 +39,12 @@ public FileTransmitter(final @NotNull WritableByteChannel channel, final @NotNul buffer.flip(); } + /** + * Makes an attempt to write file content to channel. + * + * @return true if file content was fully written. + * @throws IOException if any IO exception occurs during writing process. + */ public boolean write() throws IOException { while (!isTransmitted()) { channel.write(buffer); diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/FileWithNegativeLengthException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/FileWithNegativeLengthException.java new file mode 100644 index 0000000..269bd60 --- /dev/null +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/FileWithNegativeLengthException.java @@ -0,0 +1,8 @@ +package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; + +import java.io.IOException; + +/** + * An exception which might be thrown by FileReceiver when a length of file appeared to be negative. + */ +public class FileWithNegativeLengthException extends IOException {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java index a8008ca..2f4c1eb 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/InvalidMessageException.java @@ -4,9 +4,20 @@ import java.io.IOException; +/** + * An exception which might be thrown by DataReaders when they have read invalid data. + */ public class InvalidMessageException extends IOException { + /** + * An empty constructor. + */ public InvalidMessageException() {} + /** + * Constructor from cause. + * + * @param cause cause of the exception. + */ public InvalidMessageException(final @NotNull Exception cause) { super(cause); } diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java index 98dbb17..19cdda3 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/LongMessageException.java @@ -1,3 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; +/** + * An exception which might be thrown by DataReaders and DataWriters when they encounter a message which length exceeds + * a predefined limit. + */ public class LongMessageException extends InvalidMessageException {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java index 54b4890..4961d53 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageNotReadException.java @@ -1,3 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; +/** + * An exception which might be thrown by a FTPMessageReader if it's getMessage method invoked while the actual message + * hasn't been read. + */ public class MessageNotReadException extends Exception {} diff --git a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java index c13e8c0..9f8a444 100644 --- a/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java +++ b/04-SimpleFTP/messages/src/main/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/exceptions/MessageWithNonpositiveLengthException.java @@ -1,3 +1,6 @@ package ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions; +/** + * An exception which might be thrown by FTPMessageReader if length of a message appeared to be nonpositive. + */ public class MessageWithNonpositiveLengthException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java index 170da9f..d0e1d9c 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java @@ -19,6 +19,9 @@ import java.nio.channels.SocketChannel; import java.nio.file.Path; +/** + * Channel observer handles all operations on a particular socket channel and manages this socket channel lifecycle. + */ public class FTPChannelObserver { private final @NotNull SocketChannel channel; @@ -30,9 +33,17 @@ public class FTPChannelObserver { private @Nullable DataWriter writer; + /** + * Creates a new observer. + * + * @param channel a channel for which a new observer will be created. + * @param server a server which established a connection this channel represents. + * @param selector a selector of a server. + * @throws IOException if any IO exception occurs during observer creation. + */ public FTPChannelObserver(final @NotNull SocketChannel channel, - final @NotNull Selector selector, - final @NotNull Server server) throws IOException { + final @NotNull Server server, + final @NotNull Selector selector) throws IOException { this.channel = channel; this.server = server; @@ -43,6 +54,13 @@ public FTPChannelObserver(final @NotNull SocketChannel channel, reader = new FTPMessageReader(channel); } + /** + * Registers a message writer for stored channel. + * + * @param message a message which this writer will be writing. + * @throws RegisteringSecondDataWriterException if there is already a registered writer. + * @throws LongMessageException if a message is too long. + */ public void registerMessageWriter(final @NotNull FTPMessage message) throws RegisteringSecondDataWriterException, LongMessageException { if (writer != null) { @@ -53,6 +71,13 @@ public void registerMessageWriter(final @NotNull FTPMessage message) writer = new FTPMessageWriter(channel, message); } + /** + * Registers a file transmitter for stored channel. + * + * @param path a path to a file which content will be transmitted. + * @throws RegisteringSecondDataWriterException if there is already a registered writer. + * @throws IOException if any IO exception occurs during file opening. + */ public void registerFileTransmitter(final @NotNull Path path) throws RegisteringSecondDataWriterException, IOException { if (writer != null) { @@ -63,6 +88,11 @@ public void registerFileTransmitter(final @NotNull Path path) writer = new FileTransmitter(channel, path); } + /** + * Makes an attempt to read a message from stored channel. + * + * @throws IOException if any IO exception occurs during reading process. + */ public void read() throws IOException { try { switch (reader.read()) { @@ -97,6 +127,12 @@ public void read() throws IOException { } } + /** + * Makes an attempt to write something with registered writer. + * + * @throws IOException if any IO exception occurs during writing process. + * @throws NoDataWriterRegisteredException if there is no data writer registered. + */ public void write() throws IOException, NoDataWriterRegisteredException { if (writer == null) { throw new NoDataWriterRegisteredException(); diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java index a06560e..8000900 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Main.java @@ -6,14 +6,16 @@ import java.nio.file.Paths; /** - * Entry point of a program. This class allows to start and stop server through a console. + * Entry point of a server application. This class allows to start and stop server through a console. */ public class Main { /** * Entry method. * - * @param args arguments are ignored. + * @param args two arguments are expected. First is a path to a folder which will be tracked by server, second is a + * port which the server will be bound to. * @throws IOException any IO exception which may occur during reading of commands. + * @throws InterruptedException if main thread was interrupted. */ public static void main(String[] args) throws IOException, InterruptedException { if (args.length != 2) { diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index ea98735..7a42b25 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -27,12 +27,15 @@ import java.util.List; /** - * TODO: javadocs + * Server class can accept a connections and deal with them by answering on requests. + * + * TODO: edit access rights * TODO: logging * TODO: do refactoring * TODO: tests * TODO: remove logging in client interface * TODO: look at gradle files + * TODO: travis */ public class Server { private final static @NotNull Logger logger = LogManager.getLogger(Server.class.getCanonicalName()); @@ -47,6 +50,12 @@ public class Server { private volatile @Nullable Selector selector; + /** + * Creates a new server. + * + * @param trackedFolder a folder which is tracked by this new server. Server can give content only of this folder. + * @param port a port which this server will be bound to. + */ public Server(final @NotNull Path trackedFolder, final int port) { logger.info("New Server ({}) is created", this); @@ -118,11 +127,19 @@ public Server(final @NotNull Path trackedFolder, final int port) { ); } + /** + * Starts this server in a new thread. + */ public void start() { shouldRun = true; serverThread.start(); } + /** + * Stops this server thread. + * + * @throws InterruptedException if this thread was interrupted while waiting for server thread to join. + */ public void stop() throws InterruptedException { if (!serverThread.isAlive()) { return; @@ -140,7 +157,7 @@ private void acceptNewConnection(final @NotNull ServerSocketChannel serverSocket } logger.info("Server ({}) accepted new connection", this); - new FTPChannelObserver(socketChannel, selector, this); + new FTPChannelObserver(socketChannel, this, selector); } void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) throws IOException { diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java index 10fd131..89d1419 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/InvalidPathException.java @@ -2,4 +2,7 @@ import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; +/** + * An exception which might be thrown by server if path in incoming request is invalid. + */ public class InvalidPathException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java index a5e8e89..793a07b 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoDataWriterRegisteredException.java @@ -1,3 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; +/** + * An exception which might be thrown by FTPChannelObserver if it's write method is invoked while no DataWriter was + * registered. + */ public class NoDataWriterRegisteredException extends Exception {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java index e4ad00e..d33c28f 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/NoSuchMessageException.java @@ -2,4 +2,7 @@ import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.InvalidMessageException; +/** + * An exception which might be thrown by a Server if it can't recognize an incoming message. + */ public class NoSuchMessageException extends InvalidMessageException {} diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java index 2fcf023..7113abe 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/exceptions/RegisteringSecondDataWriterException.java @@ -1,3 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.server.exceptions; +/** + * An exception which might be thrown by a FTPChannelObserver if there is an attempt to register DataWriter while + * another one already registered. + */ public class RegisteringSecondDataWriterException extends Exception {} From ec9e1beed0106a93b57acd18f018abe95458b86f Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 04:25:57 +0300 Subject: [PATCH 51/69] Polish logging. --- .../veselov/hw04/client/Client.java | 12 ++++-------- .../veselov/hw04/server/Server.java | 19 ++++++++----------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java index 399b6e5..4fe51d0 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java @@ -55,7 +55,7 @@ public Client(final @NotNull String host, final int port) throws IOException { messageReader = new FTPMessageReader(channel); - logger.info("Client ({}) established a connection with a server on {}:{}", this, host, port); + logger.info("A new client has established a connection with a server on {}:{}", host, port); } /** @@ -93,7 +93,7 @@ public void close() throws IOException { messageReader.reset(); - logger.info("Client ({}) received a message from server", this); + logger.info("Client has received a message from server"); return ((FTPListAnswerMessage) answer).getContent(); } @@ -113,13 +113,11 @@ public void get(final @NotNull String pathToSource, final @NotNull Path pathToDe FileReceiver receiver = new FileReceiver(channel, pathToDestination); read(receiver); - logger.info("Client ({}) received a file from server", this); + logger.info("Client has received a file from server"); } private void writeMessage(final @NotNull FTPMessage message) throws IOException, ConnectionWasClosedException { - logger.info("Client ({}) began sending a message to server", this); - FTPMessageWriter writer = new FTPMessageWriter(channel, message); SelectionKey key = channel.keyFor(selector); @@ -151,13 +149,11 @@ private void writeMessage(final @NotNull FTPMessage message) } key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE); - logger.info("Client ({}) sent a message to server", this); + logger.info("Client has sent a message to server"); } private void read(final @NotNull DataReader reader) throws IOException, ConnectionWasClosedException { - logger.info("Client ({}) began waiting data from server", this); - boolean shouldRun = true; while (shouldRun) { selector.select(); diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index 7a42b25..1127446 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -28,9 +28,7 @@ /** * Server class can accept a connections and deal with them by answering on requests. - * - * TODO: edit access rights - * TODO: logging + * * TODO: do refactoring * TODO: tests * TODO: remove logging in client interface @@ -57,7 +55,7 @@ public class Server { * @param port a port which this server will be bound to. */ public Server(final @NotNull Path trackedFolder, final int port) { - logger.info("New Server ({}) is created", this); + logger.info("New Server has been created"); this.trackedFolder = trackedFolder; this.port = port; @@ -73,7 +71,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { this.selector = selector; - logger.info("Server ({}) is started", this); + logger.info("Server has been started"); while (shouldRun) { selector.select(); @@ -101,9 +99,8 @@ public Server(final @NotNull Path trackedFolder, final int port) { } } catch (IOException e) { logger.error( - "IOException occurred during interaction of Server ({}) " + - "with a connection.\n{}", - this, e); + "IOException has occurred during interaction of Server " + + "with a connection.\n{}", e); key.channel().close(); } @@ -116,7 +113,7 @@ public Server(final @NotNull Path trackedFolder, final int port) { key.channel().close(); } - logger.info("Server ({}) is stopped", this); + logger.info("Server has been stopped"); } catch (IOException e) { throw new RuntimeException(e); } finally { @@ -156,12 +153,12 @@ private void acceptNewConnection(final @NotNull ServerSocketChannel serverSocket return; } - logger.info("Server ({}) accepted new connection", this); + logger.info("Server has accepted a new connection"); new FTPChannelObserver(socketChannel, this, selector); } void handleMessage(final @NotNull SocketChannel channel, final @NotNull FTPMessage message) throws IOException { - logger.info("Server ({}) received new message", this); + logger.info("Server has received a new message"); // TODO: add double dispatch if (message instanceof FTPListMessage) { From 1f862a1db22ff9aa0ea70aeb903dfb649f1c2f4b Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 04:56:36 +0300 Subject: [PATCH 52/69] Polish tests. --- 04-SimpleFTP/integration-tests/big-file | 0 .../bachelor2015/veselov/hw04/ServerTest.java | 51 ++++++---- .../bachelor2015/veselov/hw04/TestUtils.java | 19 ---- .../messages/util/FTPMessageReaderTest.java | 94 ------------------- .../messages/util/FTPMessageWriterTest.java | 57 ----------- .../hw04/server/FTPChannelObserver.java | 21 +++-- .../veselov/hw04/server/Server.java | 2 - 7 files changed, 50 insertions(+), 194 deletions(-) create mode 100644 04-SimpleFTP/integration-tests/big-file delete mode 100644 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java delete mode 100644 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java delete mode 100644 04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java diff --git a/04-SimpleFTP/integration-tests/big-file b/04-SimpleFTP/integration-tests/big-file new file mode 100644 index 0000000..e69de29 diff --git a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java index 9c0a1e1..7af91f1 100644 --- a/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java +++ b/04-SimpleFTP/integration-tests/src/test/java/ru/spbau/bachelor2015/veselov/hw04/ServerTest.java @@ -23,19 +23,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -// TODO: add timeouts public class ServerTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); - private final String trackedFolderName = "tracked"; - private final int foldersInRootFolder = 10; - private final String fileNamePrefix = "file"; - - private final String folderNamePrefix = "dir"; - private Path[] relativePathToFolderInRoot; private Path[] relativePathToFilesInRootSubFolders; @@ -49,6 +42,10 @@ public class ServerTest { private Client client; private void folderInitialization() throws Exception { + String trackedFolderName = "tracked"; + String folderNamePrefix = "dir"; + String fileNamePrefix = "file"; + pathToTrackedFolder = temporaryFolder.newFolder(trackedFolderName).toPath(); relativePathToFolderInRoot = new Path[foldersInRootFolder]; @@ -93,19 +90,19 @@ public void after() throws IOException, InterruptedException { server.stop(); } - @Test + @Test(timeout = 1000) public void testFTPListMessage() throws Exception { new SubDirTestMessage(0).test(client); } - @Test + @Test(timeout = 2000) public void testFTPListMessages() throws Exception { for (int i = 0; i < foldersInRootFolder; i++) { new SubDirTestMessage(i).test(client); } } - @Test + @Test(timeout = 1000) public void testListRequestOfRootFolder() throws Exception { List entries = this.client.list( pathToTrackedFolder.relativize(pathToTrackedFolder).toString()); @@ -118,19 +115,32 @@ public void testListRequestOfRootFolder() throws Exception { assertThat(entries, containsInAnyOrder(matchers)); } - @Test(expected = ConnectionWasClosedException.class) + @Test(expected = ConnectionWasClosedException.class, timeout = 1000) public void testListRequestOfForbiddenFolder() throws Exception { client.list(pathToTrackedFolder.relativize(temporaryFolder.getRoot().toPath()).toString()); } - @Test + @Test(timeout = 1000) public void testGetRequestOnSmallFile() throws Exception { - final Path pathToDestination = temporaryFolder.newFile().toPath(); + testGetOnFile(relativePathToFilesInRootSubFolders[0]); + } + + @Test(timeout = 4000) + public void testGetRequestOnBigFile() throws Exception { + final String fileName = "big-file"; + + Path pathToFile = pathToTrackedFolder.resolve(fileName); - client.get(relativePathToFilesInRootSubFolders[0].toString(), pathToDestination); + Files.createFile(pathToFile); - assertThat(Files.readAllBytes(pathToTrackedFolder.resolve(relativePathToFilesInRootSubFolders[0])), - is(equalTo(Files.readAllBytes(pathToDestination)))); + byte[] data = new byte[1024 * 1024 * 10]; // 10 Mb + for (int i = 0; i < data.length; i++) { + data[i] = (byte) i; + } + + Files.write(pathToFile, data); + + testGetOnFile(pathToTrackedFolder.relativize(pathToFile)); } @Test(expected = ConnectionWasClosedException.class, timeout = 1000) @@ -140,6 +150,15 @@ public void serverDisconnects() throws Exception { client.list(pathToTrackedFolder.relativize(pathToTrackedFolder).toString()); } + private void testGetOnFile(final @NotNull Path pathToSource) throws Exception { + final Path pathToDestination = temporaryFolder.newFile().toPath(); + + client.get(pathToSource.toString(), pathToDestination); + + assertThat(Files.readAllBytes(pathToTrackedFolder.resolve(pathToSource)), + is(equalTo(Files.readAllBytes(pathToDestination)))); + } + private @NotNull FileEntryMatcher fileEntry(final @NotNull Path path, final boolean isDirectory) { return new FileEntryMatcher(path, isDirectory); diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java deleted file mode 100644 index 13649ac..0000000 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/TestUtils.java +++ /dev/null @@ -1,19 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04; - -import org.jetbrains.annotations.NotNull; - -import java.nio.ByteBuffer; -import java.util.Arrays; - -public final class TestUtils { - public static @NotNull byte[] toLengthByteArray(int integer) { - return ByteBuffer.allocate(Integer.BYTES).putInt(integer).array().clone(); - } - - public static @NotNull int[] intArrayOfOnes(final int size) { - int[] array = new int[size]; - Arrays.fill(array, 1); - - return array; - } -} diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java deleted file mode 100644 index aa1bb64..0000000 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageReaderTest.java +++ /dev/null @@ -1,94 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages.util; - -import org.jetbrains.annotations.NotNull; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import ru.spbau.bachelor2015.veselov.hw04.TestUtils; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageNotReadException; -import ru.spbau.bachelor2015.veselov.hw04.messages.util.exceptions.MessageWithNonpositiveLengthException; - -import java.nio.ByteBuffer; -import java.nio.channels.ReadableByteChannel; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class FTPMessageReaderTest { - @Test(expected = MessageWithNonpositiveLengthException.class) - public void testNegativeLengthMessage() throws Exception { - ReadableByteChannel channel = mock(ReadableByteChannel.class); - when(channel.read(any())).thenAnswer(write(TestUtils.toLengthByteArray(-1))); - - FTPMessageReader reader = new FTPMessageReader(channel); - - reader.read(); - } - - @Test(expected = MessageNotReadException.class) - public void testGettingOfUnreadMessage() throws Exception { - ReadableByteChannel channel = mock(ReadableByteChannel.class); - - FTPMessageReader reader = new FTPMessageReader(channel); - - reader.getMessage(); - } - - private @NotNull byte[][] extrude(final @NotNull byte[] array) { - byte[][] result = new byte[array.length][1]; - for (int i = 0; i < array.length; i++) { - result[i][0] = array[i]; - } - - return result; - } - - private @NotNull Writer write(final @NotNull byte[]... dataToWrite) { - return new Writer(dataToWrite); - } - - private static class Writer implements Answer { - private final @NotNull List dataToWrite; - - public Writer(final @NotNull byte[][] dataToWrite) { - this.dataToWrite = Arrays.stream(dataToWrite) - .map(bytes -> (ByteBuffer) ByteBuffer.allocate(bytes.length).put(bytes).flip()) - .collect(Collectors.toList()); - } - - @Override - public @NotNull Integer answer(final @NotNull InvocationOnMock invocation) throws Throwable { - ByteBuffer buffer = invocation.getArgument(0); - - if (dataToWrite.isEmpty()) { - return 0; - } - - ByteBuffer currentDataBuffer = dataToWrite.get(0); - if (!currentDataBuffer.hasRemaining()) { - if (buffer.hasRemaining()) { - return 0; - } - - dataToWrite.remove(0); - return 0; - } - - int bytesToWrite = Math.min(currentDataBuffer.remaining(), buffer.remaining()); - - byte[] data = new byte[bytesToWrite]; - currentDataBuffer.get(data); - if (!currentDataBuffer.hasRemaining()) { - dataToWrite.remove(0); - } - - buffer.put(data); - - return bytesToWrite; - } - } -} \ No newline at end of file diff --git a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java b/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java deleted file mode 100644 index d7c14fb..0000000 --- a/04-SimpleFTP/messages/src/test/java/ru/spbau/bachelor2015/veselov/hw04/messages/util/FTPMessageWriterTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package ru.spbau.bachelor2015.veselov.hw04.messages.util; - -import org.jetbrains.annotations.NotNull; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -public class FTPMessageWriterTest { - private @NotNull Reader read(final @NotNull int... bytesToRead) { - return new Reader(bytesToRead); - } - - private static class Reader implements Answer { - private final @NotNull List bytesToReadList; - - public Reader(final @NotNull int[] bytesToRead) { - this.bytesToReadList = Arrays.stream(bytesToRead) - .mapToObj(n -> n) - .collect(Collectors.toList()); - } - - @Override - public @NotNull Integer answer(final @NotNull InvocationOnMock invocation) throws Throwable { - ByteBuffer buffer = invocation.getArgument(0); - - if (bytesToReadList.isEmpty()) { - return 0; - } - - int currentBytesToRead = bytesToReadList.get(0); - if (currentBytesToRead == 0) { - if (buffer.hasRemaining()) { - return 0; - } - - bytesToReadList.remove(0); - return 0; - } - - int bytesToRead = Math.min(currentBytesToRead, buffer.remaining()); - - if (currentBytesToRead == bytesToRead) { - bytesToReadList.remove(0); - } - - for (int i = 0; i < bytesToRead; i++) { - buffer.get(); - } - - return bytesToRead; - } - } -} \ No newline at end of file diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java index d0e1d9c..1ec9164 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/FTPChannelObserver.java @@ -1,5 +1,7 @@ package ru.spbau.bachelor2015.veselov.hw04.server; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.spbau.bachelor2015.veselov.hw04.server.exceptions.NoDataWriterRegisteredException; @@ -23,6 +25,8 @@ * Channel observer handles all operations on a particular socket channel and manages this socket channel lifecycle. */ public class FTPChannelObserver { + private final static @NotNull Logger logger = LogManager.getLogger(FTPChannelObserver.class.getCanonicalName()); + private final @NotNull SocketChannel channel; private final @NotNull SelectionKey selectionKey; @@ -44,6 +48,8 @@ public class FTPChannelObserver { public FTPChannelObserver(final @NotNull SocketChannel channel, final @NotNull Server server, final @NotNull Selector selector) throws IOException { + logger.info("A new FTPChannelObserver ({}) has been created", this); + this.channel = channel; this.server = server; @@ -67,6 +73,8 @@ public void registerMessageWriter(final @NotNull FTPMessage message) throw new RegisteringSecondDataWriterException(); } + logger.info("A new FTPMessageWriter has been registered in {}", this); + selectionKey.interestOps(selectionKey.interestOps() | SelectionKey.OP_WRITE); writer = new FTPMessageWriter(channel, message); } @@ -84,6 +92,8 @@ public void registerFileTransmitter(final @NotNull Path path) throw new RegisteringSecondDataWriterException(); } + logger.info("A new FileTransmitter has been registered in {}", this); + selectionKey.interestOps(selectionKey.interestOps() | SelectionKey.OP_WRITE); writer = new FileTransmitter(channel, path); } @@ -110,12 +120,7 @@ public void read() throws IOException { reader.reset(); - try { - server.handleMessage(channel, message); - } catch (InvalidMessageException e) { - channel.close(); - } - + server.handleMessage(channel, message); break; case CLOSED: @@ -123,6 +128,8 @@ public void read() throws IOException { break; } } catch (InvalidMessageException e) { + logger.info("{} has read an invalid message", this); + channel.close(); } } @@ -139,6 +146,8 @@ public void write() throws IOException, NoDataWriterRegisteredException { } if (writer.write()) { + logger.info("{} has written data to a channel", this); + writer = null; selectionKey.interestOps(selectionKey.interestOps() & ~SelectionKey.OP_WRITE); } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index 1127446..cedbad5 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -29,8 +29,6 @@ /** * Server class can accept a connections and deal with them by answering on requests. * - * TODO: do refactoring - * TODO: tests * TODO: remove logging in client interface * TODO: look at gradle files * TODO: travis From 62790ab3ffb2522a6f47e7ae8ca67fc9a588b038 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 05:08:12 +0300 Subject: [PATCH 53/69] Redirect logging to file. --- 04-SimpleFTP/console-client/build.gradle | 2 +- .../console-client/src/main/resources/log4j2.xml | 16 ++++++++++++---- 04-SimpleFTP/server/build.gradle | 2 +- .../bachelor2015/veselov/hw04/server/Server.java | 1 - .../server/src/main/resources/log4j2.xml | 16 ++++++++++++---- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/04-SimpleFTP/console-client/build.gradle b/04-SimpleFTP/console-client/build.gradle index 324a1fb..364f036 100644 --- a/04-SimpleFTP/console-client/build.gradle +++ b/04-SimpleFTP/console-client/build.gradle @@ -22,7 +22,7 @@ dependencies { jar { manifest { - attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.Main' + attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.client.Main' } from { diff --git a/04-SimpleFTP/console-client/src/main/resources/log4j2.xml b/04-SimpleFTP/console-client/src/main/resources/log4j2.xml index b8f1cce..6ad75d3 100644 --- a/04-SimpleFTP/console-client/src/main/resources/log4j2.xml +++ b/04-SimpleFTP/console-client/src/main/resources/log4j2.xml @@ -2,14 +2,22 @@ - - - + + + %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n + + + + + + - + diff --git a/04-SimpleFTP/server/build.gradle b/04-SimpleFTP/server/build.gradle index 324a1fb..1064c12 100644 --- a/04-SimpleFTP/server/build.gradle +++ b/04-SimpleFTP/server/build.gradle @@ -22,7 +22,7 @@ dependencies { jar { manifest { - attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.Main' + attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.server.Main' } from { diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index cedbad5..7635c5b 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -29,7 +29,6 @@ /** * Server class can accept a connections and deal with them by answering on requests. * - * TODO: remove logging in client interface * TODO: look at gradle files * TODO: travis */ diff --git a/04-SimpleFTP/server/src/main/resources/log4j2.xml b/04-SimpleFTP/server/src/main/resources/log4j2.xml index b8f1cce..6ad75d3 100644 --- a/04-SimpleFTP/server/src/main/resources/log4j2.xml +++ b/04-SimpleFTP/server/src/main/resources/log4j2.xml @@ -2,14 +2,22 @@ - - - + + + %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n + + + + + + - + From addd6cc41e9569534236607bc3ffc2b7fcd97cef Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 05:12:55 +0300 Subject: [PATCH 54/69] Clean gradle files. --- 04-SimpleFTP/console-client/build.gradle | 6 +- 04-SimpleFTP/integration-tests/build.gradle | 7 +- 04-SimpleFTP/integration-tests/logs/app.log | 580 ++++++++++++++++++ 04-SimpleFTP/messages/build.gradle | 4 +- 04-SimpleFTP/server/build.gradle | 4 +- .../veselov/hw04/server/Server.java | 1 - 6 files changed, 586 insertions(+), 16 deletions(-) create mode 100644 04-SimpleFTP/integration-tests/logs/app.log diff --git a/04-SimpleFTP/console-client/build.gradle b/04-SimpleFTP/console-client/build.gradle index 364f036..fe25e74 100644 --- a/04-SimpleFTP/console-client/build.gradle +++ b/04-SimpleFTP/console-client/build.gradle @@ -12,17 +12,15 @@ repositories { dependencies { compile project(":messages") - compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' } jar { manifest { - attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.client.Main' + attributes 'Main-Class': 'ru.spbau.bachelor2015.veselov.hw04.Main' } from { diff --git a/04-SimpleFTP/integration-tests/build.gradle b/04-SimpleFTP/integration-tests/build.gradle index 2808797..318119f 100644 --- a/04-SimpleFTP/integration-tests/build.gradle +++ b/04-SimpleFTP/integration-tests/build.gradle @@ -14,11 +14,8 @@ dependencies { compile project(":server") compile project(":console-client") - compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' + testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' - compile group: 'commons-io', name: 'commons-io', version: '2.5' } \ No newline at end of file diff --git a/04-SimpleFTP/integration-tests/logs/app.log b/04-SimpleFTP/integration-tests/logs/app.log new file mode 100644 index 0000000..a6c2607 --- /dev/null +++ b/04-SimpleFTP/integration-tests/logs/app.log @@ -0,0 +1,580 @@ +05:09:32.564 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.568 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.569 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.571 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.571 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328) has been created +05:09:32.575 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.576 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.577 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.590 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.590 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.590 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.590 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.591 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.591 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.592 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.593 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.593 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.593 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.593 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.594 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.594 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.594 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.594 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.595 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 +05:09:32.595 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel +05:09:32.595 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.596 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.601 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.605 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.606 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.606 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.606 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198) has been created +05:09:32.608 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.608 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.608 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 has read an invalid message +05:09:32.609 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.614 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.615 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e) has been created +05:09:32.616 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.616 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.616 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e +05:09:32.617 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e has written data to a channel +05:09:32.617 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:09:32.618 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.621 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.621 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.621 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb) has been created +05:09:32.622 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.623 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb +05:09:32.623 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb has written data to a channel +05:09:32.624 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.625 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.629 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.629 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.629 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816) has been created +05:09:32.630 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816 +05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816 has written data to a channel +05:09:32.631 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.637 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.638 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86) has been created +05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:09:32.639 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.642 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:09:32.642 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:09:32.642 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:09:32.643 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:09:32.643 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418) has been created +05:09:32.679 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:09:32.679 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:09:32.679 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418 +05:09:32.700 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418 has written data to a channel +05:09:32.703 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:09:34.313 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.576 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.653 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.656 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.658 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.659 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa) has been created +05:10:30.666 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.665 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.668 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.672 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.677 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.687 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.687 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.688 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.688 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.689 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.689 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.695 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.696 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.696 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.697 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.697 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.699 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.700 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.700 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.701 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.703 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.705 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.705 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.705 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.706 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.706 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.706 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.707 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.707 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.707 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.708 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.708 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.708 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.710 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.710 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.710 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.711 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.711 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.711 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.712 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.714 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.715 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:10:30.715 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:10:30.716 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.716 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.723 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.734 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.734 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.735 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.735 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@493f12af) has been created +05:10:30.735 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.737 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.738 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@493f12af has read an invalid message +05:10:30.739 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.744 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.744 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143) has been created +05:10:30.746 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.746 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.746 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143 +05:10:30.747 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143 has written data to a channel +05:10:30.747 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:10:30.749 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.769 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.772 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494) has been created +05:10:30.773 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.773 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494 +05:10:30.773 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.775 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494 has written data to a channel +05:10:30.776 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.778 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.782 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.809 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.809 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.810 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.810 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148) has been created +05:10:30.810 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.811 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.811 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148 +05:10:30.812 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148 has written data to a channel +05:10:30.818 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:10:30.819 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.823 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.836 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.836 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.837 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.837 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@d088afc) has been created +05:10:30.838 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:10:30.838 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.847 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:10:30.853 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:10:30.854 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:10:30.854 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b) has been created +05:10:30.853 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:10:30.930 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:10:30.929 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:10:30.930 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b +05:10:30.982 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b has written data to a channel +05:10:30.986 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:10:34.572 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.925 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.930 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.930 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.932 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.932 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa) has been created +05:11:33.936 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.937 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.937 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.940 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.940 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.943 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.943 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.944 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.944 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.944 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.944 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.945 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.946 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.947 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.947 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.947 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.947 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.948 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.948 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.948 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.949 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.950 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.951 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.951 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.951 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.951 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.952 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.952 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.952 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.953 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.954 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa +05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel +05:11:33.954 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.955 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.964 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.966 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@f42c8d2) has been created +05:11:33.967 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@f42c8d2 has read an invalid message +05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.973 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.973 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.973 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.974 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.974 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198) has been created +05:11:33.975 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.975 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.975 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 +05:11:33.976 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 has written data to a channel +05:11:33.976 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:11:33.977 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.981 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.981 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f) has been created +05:11:33.982 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.982 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.982 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f +05:11:33.983 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f has written data to a channel +05:11:33.983 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.985 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.989 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.989 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.989 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730) has been created +05:11:33.990 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730 +05:11:33.991 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730 has written data to a channel +05:11:33.991 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:33.991 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.995 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:33.995 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816) has been created +05:11:33.996 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:33.996 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:34.001 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:34.002 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:34.001 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:34.002 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:34.002 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86) has been created +05:11:34.042 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:34.042 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:34.042 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86 +05:11:34.065 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86 has written data to a channel +05:11:34.068 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:11:35.658 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.559 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.564 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.564 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.565 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.565 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c) has been created +05:11:58.569 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.570 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.571 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.573 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.574 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.577 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.577 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.578 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.578 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.578 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.579 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.580 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.580 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.581 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.581 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.581 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.588 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c +05:11:58.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel +05:11:58.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.594 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.595 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e) has been created +05:11:58.596 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.596 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.597 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e has read an invalid message +05:11:58.597 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.601 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.601 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.604 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.604 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.604 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e) has been created +05:11:58.605 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.605 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.605 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e +05:11:58.606 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e has written data to a channel +05:11:58.606 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:11:58.607 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.610 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.610 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.610 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4) has been created +05:11:58.611 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.612 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4 +05:11:58.612 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4 has written data to a channel +05:11:58.613 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.614 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.618 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.619 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.619 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b) has been created +05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b +05:11:58.621 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b has written data to a channel +05:11:58.621 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.624 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:11:58.624 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.627 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.628 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@55a9788f) has been created +05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:11:58.629 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.632 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:11:58.632 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:11:58.632 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:11:58.633 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:11:58.641 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d) has been created +05:11:58.666 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:11:58.666 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:11:58.666 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d +05:11:58.687 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d has written data to a channel +05:11:58.694 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:12:00.263 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.436 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.442 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.442 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.444 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.444 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa) has been created +05:12:35.447 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.448 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.449 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.451 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.452 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.456 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.456 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.456 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.457 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.457 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.458 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.458 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.459 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.459 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.459 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.459 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.460 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.460 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.460 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.460 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.461 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.461 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.462 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.463 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.463 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.464 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.465 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.465 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa +05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel +05:12:35.466 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.466 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.470 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.471 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2428e0cf) has been created +05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.471 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.472 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2428e0cf has read an invalid message +05:12:35.472 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.475 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.475 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.475 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.476 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.476 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789) has been created +05:12:35.477 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.477 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.477 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789 +05:12:35.478 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:12:35.478 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789 has written data to a channel +05:12:35.479 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.482 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.482 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.482 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a) has been created +05:12:35.483 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.484 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a +05:12:35.484 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a has written data to a channel +05:12:35.485 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.486 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.490 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.490 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.490 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb) has been created +05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.491 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb +05:12:35.492 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb has written data to a channel +05:12:35.493 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server +05:12:35.493 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.496 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.497 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@5ccf7fa0) has been created +05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped +05:12:35.498 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.501 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created +05:12:35.502 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 +05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started +05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection +05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d) has been created +05:12:35.536 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server +05:12:35.536 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message +05:12:35.537 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d +05:12:35.558 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d has written data to a channel +05:12:35.564 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server +05:12:37.108 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped diff --git a/04-SimpleFTP/messages/build.gradle b/04-SimpleFTP/messages/build.gradle index 28d0f71..e77f8de 100644 --- a/04-SimpleFTP/messages/build.gradle +++ b/04-SimpleFTP/messages/build.gradle @@ -10,10 +10,8 @@ repositories { } dependencies { - compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' } \ No newline at end of file diff --git a/04-SimpleFTP/server/build.gradle b/04-SimpleFTP/server/build.gradle index 1064c12..3f3a372 100644 --- a/04-SimpleFTP/server/build.gradle +++ b/04-SimpleFTP/server/build.gradle @@ -12,11 +12,9 @@ repositories { dependencies { compile project(":messages") - compile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'org.mockito', name: 'mockito-core', version: '2.7.17' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.2' } diff --git a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java index 7635c5b..97454d9 100644 --- a/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java +++ b/04-SimpleFTP/server/src/main/java/ru/spbau/bachelor2015/veselov/hw04/server/Server.java @@ -29,7 +29,6 @@ /** * Server class can accept a connections and deal with them by answering on requests. * - * TODO: look at gradle files * TODO: travis */ public class Server { From 7d0115a2547b6647a916b610a8a082e79eb44b36 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Thu, 27 Apr 2017 05:14:05 +0300 Subject: [PATCH 55/69] Add project to travis config file. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cc945a4..dc6c09c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ jdk: env: - PROJECT_DIR=01-Lazy + - PROJECT_DIR=04-SimpleFTP before_install: cd $PROJECT_DIR From 193176165eaed3eb477d47bffa22ef311ac609d5 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 29 Apr 2017 14:55:32 +0300 Subject: [PATCH 56/69] Remove junk file. --- 04-SimpleFTP/integration-tests/big-file | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 04-SimpleFTP/integration-tests/big-file diff --git a/04-SimpleFTP/integration-tests/big-file b/04-SimpleFTP/integration-tests/big-file deleted file mode 100644 index e69de29..0000000 From af7f58ebc396a72f930992760e8979cddc46ad39 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 29 Apr 2017 15:03:04 +0300 Subject: [PATCH 57/69] Fix order of channel abilities checks in client writeMessage method. --- .../bachelor2015/veselov/hw04/client/Client.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java index 4fe51d0..207c247 100644 --- a/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java +++ b/04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java @@ -127,13 +127,7 @@ private void writeMessage(final @NotNull FTPMessage message) while (shouldRun) { selector.select(); - if (key.isWritable()) { - if (writer.write()) { - shouldRun = false; - } - } - - if (shouldRun && key.isReadable()) { + if (key.isReadable()) { int bytesRead = channel.read(ByteBuffer.allocate(1)); close(); @@ -145,6 +139,12 @@ private void writeMessage(final @NotNull FTPMessage message) } } + if (key.isWritable()) { + if (writer.write()) { + shouldRun = false; + } + } + selector.selectedKeys().clear(); } From 320dcc26d78967f119f48eadf66176504db71cd2 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 29 Apr 2017 15:07:14 +0300 Subject: [PATCH 58/69] Remove logs from repository. --- .gitignore | 1 + 04-SimpleFTP/integration-tests/logs/app.log | 580 -------------------- 2 files changed, 1 insertion(+), 580 deletions(-) delete mode 100644 04-SimpleFTP/integration-tests/logs/app.log diff --git a/.gitignore b/.gitignore index 7318d9e..20f0307 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /*/.idea/workspace.xml /*/.idea/tasks.xml /**/build +/**/logs /*/.gradle diff --git a/04-SimpleFTP/integration-tests/logs/app.log b/04-SimpleFTP/integration-tests/logs/app.log deleted file mode 100644 index a6c2607..0000000 --- a/04-SimpleFTP/integration-tests/logs/app.log +++ /dev/null @@ -1,580 +0,0 @@ -05:09:32.564 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.568 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.569 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.571 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.571 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328) has been created -05:09:32.575 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.576 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.577 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.590 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.590 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.590 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.590 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.591 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.591 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.592 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.592 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.593 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.593 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.593 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.593 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.594 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.594 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.594 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.594 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.595 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 -05:09:32.595 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2e5c3328 has written data to a channel -05:09:32.595 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.596 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.601 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.605 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.606 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.606 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.606 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198) has been created -05:09:32.608 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.608 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.608 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 has read an invalid message -05:09:32.609 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.614 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.615 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.615 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e) has been created -05:09:32.616 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.616 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.616 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e -05:09:32.617 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e has written data to a channel -05:09:32.617 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:09:32.618 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.621 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.621 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.621 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb) has been created -05:09:32.622 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.622 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.623 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb -05:09:32.623 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@38c2b0fb has written data to a channel -05:09:32.624 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.625 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.629 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.629 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.629 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816) has been created -05:09:32.630 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.630 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816 -05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816 has written data to a channel -05:09:32.631 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:09:32.631 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.637 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.638 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86) has been created -05:09:32.638 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:09:32.639 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.642 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:09:32.642 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:09:32.642 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:09:32.643 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:09:32.643 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418) has been created -05:09:32.679 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:09:32.679 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:09:32.679 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418 -05:09:32.700 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ed7f418 has written data to a channel -05:09:32.703 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:09:34.313 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.576 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.653 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.656 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.658 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.659 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa) has been created -05:10:30.666 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.665 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.668 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.672 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.677 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.687 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.687 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.688 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.688 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.689 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.689 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.695 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.696 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.696 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.697 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.697 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.699 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.700 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.700 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.701 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.703 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.704 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.705 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.705 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.705 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.706 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.706 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.706 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.707 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.707 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.707 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.708 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.708 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.708 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.709 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.710 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.710 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.710 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.711 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.711 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.711 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.712 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.714 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.715 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:10:30.715 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:10:30.716 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.716 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.723 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.734 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.734 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.735 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.735 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@493f12af) has been created -05:10:30.735 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.737 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.738 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@493f12af has read an invalid message -05:10:30.739 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.744 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.744 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.744 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143) has been created -05:10:30.746 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.746 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.746 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143 -05:10:30.747 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@17236143 has written data to a channel -05:10:30.747 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:10:30.749 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.769 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.772 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.772 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494) has been created -05:10:30.773 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.773 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494 -05:10:30.773 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.775 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42d98494 has written data to a channel -05:10:30.776 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.778 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.782 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.809 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.809 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.810 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.810 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148) has been created -05:10:30.810 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.811 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.811 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148 -05:10:30.812 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@65812148 has written data to a channel -05:10:30.818 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:10:30.819 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.823 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.836 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.836 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.837 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.837 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@d088afc) has been created -05:10:30.838 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:10:30.838 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.847 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:10:30.853 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:10:30.854 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:10:30.854 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b) has been created -05:10:30.853 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:10:30.930 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:10:30.929 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:10:30.930 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b -05:10:30.982 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b has written data to a channel -05:10:30.986 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:10:34.572 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.925 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.930 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.930 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.932 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.932 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa) has been created -05:11:33.936 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.937 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.937 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.940 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.940 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.943 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.943 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.944 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.944 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.944 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.944 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.945 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.945 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.946 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.946 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.947 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.947 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.947 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.947 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.948 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.948 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.948 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.949 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.949 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.950 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.950 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.951 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.951 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.951 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.951 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.952 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.952 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.952 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.953 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.953 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.954 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa -05:11:33.954 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@3aad1caa has written data to a channel -05:11:33.954 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.955 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.964 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.966 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.966 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@f42c8d2) has been created -05:11:33.967 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@f42c8d2 has read an invalid message -05:11:33.967 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.973 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.973 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.973 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.974 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.974 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198) has been created -05:11:33.975 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.975 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.975 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 -05:11:33.976 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@4ce67198 has written data to a channel -05:11:33.976 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:11:33.977 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.981 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.981 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.981 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f) has been created -05:11:33.982 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.982 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.982 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f -05:11:33.983 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@7f5d03f has written data to a channel -05:11:33.983 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.985 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.989 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.989 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.989 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730) has been created -05:11:33.990 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:33.990 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730 -05:11:33.991 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@41e06730 has written data to a channel -05:11:33.991 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:33.991 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.995 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:33.995 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:33.995 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@13ade816) has been created -05:11:33.996 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:33.996 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:34.001 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:34.002 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:34.001 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:34.002 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:34.002 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86) has been created -05:11:34.042 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:34.042 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:34.042 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86 -05:11:34.065 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2b79de86 has written data to a channel -05:11:34.068 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:11:35.658 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.559 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.564 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.564 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.565 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.565 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c) has been created -05:11:58.569 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.570 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.571 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.573 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.574 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.577 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.577 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.578 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.578 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.578 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.579 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.579 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.580 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.580 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.580 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.581 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.581 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.581 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.582 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.583 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.583 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.584 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.584 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.585 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.585 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.586 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.586 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.587 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.587 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.588 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.588 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c -05:11:58.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be7147c has written data to a channel -05:11:58.589 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.589 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.594 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.595 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.595 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e) has been created -05:11:58.596 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.596 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.597 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@66ac188e has read an invalid message -05:11:58.597 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.601 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.601 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.604 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.604 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.604 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e) has been created -05:11:58.605 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.605 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.605 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e -05:11:58.606 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2ea5098e has written data to a channel -05:11:58.606 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:11:58.607 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.610 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.610 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.610 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4) has been created -05:11:58.611 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.611 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.612 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4 -05:11:58.612 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@359644e4 has written data to a channel -05:11:58.613 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.614 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.618 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.619 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.619 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b) has been created -05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.620 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b -05:11:58.621 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2af3094b has written data to a channel -05:11:58.621 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.624 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:11:58.624 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.627 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.628 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@55a9788f) has been created -05:11:58.628 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:11:58.629 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.632 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:11:58.632 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:11:58.632 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:11:58.633 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:11:58.641 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d) has been created -05:11:58.666 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:11:58.666 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:11:58.666 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d -05:11:58.687 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@73d8ce4d has written data to a channel -05:11:58.694 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:12:00.263 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.436 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.442 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.442 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.444 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.444 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa) has been created -05:12:35.447 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.448 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.449 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.451 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.452 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.456 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.456 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.456 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.457 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.457 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.457 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.458 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.458 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.458 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.459 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.459 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.459 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.459 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.460 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.460 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.460 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.460 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.461 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.461 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.461 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.462 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.462 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.463 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.463 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.463 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.464 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.464 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.465 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.465 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa -05:12:35.465 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@be9e6fa has written data to a channel -05:12:35.466 [Thread-5] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.466 [Thread-4] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.470 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.471 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2428e0cf) has been created -05:12:35.471 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.471 [Thread-7] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.472 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@2428e0cf has read an invalid message -05:12:35.472 [Thread-6] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.475 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.475 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.475 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.476 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.476 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789) has been created -05:12:35.477 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.477 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.477 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789 -05:12:35.478 [Thread-9] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:12:35.478 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@53c93789 has written data to a channel -05:12:35.479 [Thread-8] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.482 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.482 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.482 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a) has been created -05:12:35.483 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.483 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.484 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a -05:12:35.484 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@449d5c5a has written data to a channel -05:12:35.485 [Thread-11] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.486 [Thread-10] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.490 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.490 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.490 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb) has been created -05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.491 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.491 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPMessageWriter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb -05:12:35.492 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@42ec44fb has written data to a channel -05:12:35.493 [Thread-13] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a message from server -05:12:35.493 [Thread-12] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.496 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.497 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@5ccf7fa0) has been created -05:12:35.497 [Thread-14] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped -05:12:35.498 [Thread-15] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.501 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - New Server has been created -05:12:35.502 [Test worker] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - A new client has established a connection with a server on localhost:10000 -05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been started -05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has accepted a new connection -05:12:35.502 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FTPChannelObserver (ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d) has been created -05:12:35.536 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has sent a message to server -05:12:35.536 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has received a new message -05:12:35.537 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - A new FileTransmitter has been registered in ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d -05:12:35.558 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver - ru.spbau.bachelor2015.veselov.hw04.server.FTPChannelObserver@6532d10d has written data to a channel -05:12:35.564 [Thread-17] INFO ru.spbau.bachelor2015.veselov.hw04.client.Client - Client has received a file from server -05:12:37.108 [Thread-16] INFO ru.spbau.bachelor2015.veselov.hw04.server.Server - Server has been stopped From 4c8e152fcab8f5bc3df5b2f3904a102e9f10f0d1 Mon Sep 17 00:00:00 2001 From: Ivan Veselov Date: Sat, 29 Apr 2017 20:38:06 +0300 Subject: [PATCH 59/69] Change project structure. Add graphic client skeleton. --- 04-SimpleFTP/.idea/compiler.xml | 4 +++ 04-SimpleFTP/.idea/gradle.xml | 2 ++ .../Gradle__commons_io_commons_io_2_5.xml | 11 ------- ...radle__net_bytebuddy_byte_buddy_1_6_11.xml | 11 ------- ..._net_bytebuddy_byte_buddy_agent_1_6_11.xml | 11 ------- ...radle__org_mockito_mockito_core_2_7_17.xml | 11 ------- .../Gradle__org_objenesis_objenesis_2_5.xml | 11 ------- 04-SimpleFTP/.idea/modules.xml | 6 ++++ 04-SimpleFTP/.idea/modules/client/client.iml | 12 ++++++++ .../.idea/modules/client/client_main.iml | 18 ++++++++++++ .../.idea/modules/client/client_test.iml | 22 ++++++++++++++ .../console-client/console-client_main.iml | 11 ++----- .../console-client/console-client_test.iml | 12 +++----- .../modules/graphic-client/graphic-client.iml | 12 ++++++++ .../graphic-client/graphic-client_main.iml | 19 ++++++++++++ .../graphic-client/graphic-client_test.iml | 23 +++++++++++++++ .../integration-tests_main.iml | 9 +----- .../integration-tests_test.iml | 11 ++----- .../.idea/modules/messages/messages_main.iml | 8 ----- .../.idea/modules/messages/messages_test.iml | 7 ----- .../.idea/modules/server/server_main.iml | 8 +---- .../.idea/modules/server/server_test.iml | 9 ++---- 04-SimpleFTP/client/build.gradle | 29 +++++++++++++++++++ .../veselov/hw04/client/Client.java | 0 .../ConnectionWasClosedException.java | 0 04-SimpleFTP/console-client/build.gradle | 2 +- .../hw04/{client => cclient}/Main.java | 3 +- 04-SimpleFTP/graphic-client/build.gradle | 18 ++++++++++++ .../hw04/gclient/ClientApplication.java | 23 +++++++++++++++ .../hw04/gclient/MainSceneProducer.java | 16 ++++++++++ .../veselov/hw04/gclient/ToolBarProducer.java | 13 +++++++++ 04-SimpleFTP/integration-tests/build.gradle | 2 +- 04-SimpleFTP/settings.gradle | 3 ++ 33 files changed, 238 insertions(+), 119 deletions(-) delete mode 100644 04-SimpleFTP/.idea/libraries/Gradle__commons_io_commons_io_2_5.xml delete mode 100644 04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_6_11.xml delete mode 100644 04-SimpleFTP/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_6_11.xml delete mode 100644 04-SimpleFTP/.idea/libraries/Gradle__org_mockito_mockito_core_2_7_17.xml delete mode 100644 04-SimpleFTP/.idea/libraries/Gradle__org_objenesis_objenesis_2_5.xml create mode 100644 04-SimpleFTP/.idea/modules/client/client.iml create mode 100644 04-SimpleFTP/.idea/modules/client/client_main.iml create mode 100644 04-SimpleFTP/.idea/modules/client/client_test.iml create mode 100644 04-SimpleFTP/.idea/modules/graphic-client/graphic-client.iml create mode 100644 04-SimpleFTP/.idea/modules/graphic-client/graphic-client_main.iml create mode 100644 04-SimpleFTP/.idea/modules/graphic-client/graphic-client_test.iml create mode 100644 04-SimpleFTP/client/build.gradle rename 04-SimpleFTP/{console-client => client}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/Client.java (100%) rename 04-SimpleFTP/{console-client => client}/src/main/java/ru/spbau/bachelor2015/veselov/hw04/client/exceptions/ConnectionWasClosedException.java (100%) rename 04-SimpleFTP/console-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/{client => cclient}/Main.java (96%) create mode 100644 04-SimpleFTP/graphic-client/build.gradle create mode 100644 04-SimpleFTP/graphic-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/gclient/ClientApplication.java create mode 100644 04-SimpleFTP/graphic-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/gclient/MainSceneProducer.java create mode 100644 04-SimpleFTP/graphic-client/src/main/java/ru/spbau/bachelor2015/veselov/hw04/gclient/ToolBarProducer.java diff --git a/04-SimpleFTP/.idea/compiler.xml b/04-SimpleFTP/.idea/compiler.xml index 370ddc4..16653db 100644 --- a/04-SimpleFTP/.idea/compiler.xml +++ b/04-SimpleFTP/.idea/compiler.xml @@ -4,8 +4,12 @@ + + + + diff --git a/04-SimpleFTP/.idea/gradle.xml b/04-SimpleFTP/.idea/gradle.xml index ead5fc3..16d8f01 100644 --- a/04-SimpleFTP/.idea/gradle.xml +++ b/04-SimpleFTP/.idea/gradle.xml @@ -10,7 +10,9 @@