diff --git a/build.gradle b/build.gradle index 77cfa67b56..bbfeb03c22 100644 --- a/build.gradle +++ b/build.gradle @@ -1,111 +1 @@ -plugins { - id 'org.springframework.boot' version '1.5.8.RELEASE' - id 'com.github.kt3k.coveralls' version '2.6.3' -} - -springBoot { - mainClass = "ru.atom.chat.ChatApplication" -} - -// constants declaration -ext { - jdkVersion = 1.8 - - junitVersion = "4.12" - log4jVersion = "2.7" - jetbrainsAnnotationVersion = "15.0" - okhttpVersion = "3.6.0" - gsonjVersion = "2.7" - postgresVersion = "9.4-1200-jdbc41" - jetbrainsAnnotationVersion = "15.0" - hibernateVersion = "5.1.10.Final" - jolVersion = "0.8" -} - -allprojects { - group = "technoatom" - version = "1.0-SNAPSHOT" - - apply plugin: 'java' - apply plugin: 'checkstyle' - apply plugin: 'jacoco' - - repositories { - mavenCentral() - } - - sourceCompatibility = jdkVersion - targetCompatibility = jdkVersion -} - -subprojects { - if (!project.name.equals('bomberman/frontend')) - apply plugin: 'org.springframework.boot' - - - checkstyle { - ignoreFailures = false - toolVersion = '7.5' - configFile = rootProject.file('config/checkstyle/checkstyle.xml') - } - - tasks.withType(Checkstyle) { - reports { - xml.enabled false - html.destination "$rootProject.buildDir/report/${project.name}.html" - html.stylesheet resources.text.fromFile(rootProject.file('config/checkstyle/checkstyle-custom.xsl')) - } - } - -} - -// common libraries declaration -ext.libraries = [ - spring_boot : [ - "org.springframework.boot:spring-boot-starter-web", - "org.springframework.boot:spring-boot-starter-actuator", - ], - - spring_boot_test : "org.springframework.boot:spring-boot-starter-test", - - spring_boot_websocket: "org.springframework.boot:spring-boot-starter-websocket", - spring_boot_jpa: "org.springframework.boot:spring-boot-starter-data-jpa", - - junit: "junit:junit:$junitVersion", - log4j: [ - "org.apache.logging.log4j:log4j-api:$log4jVersion", - "org.apache.logging.log4j:log4j-core:$log4jVersion" - ], - jetbrainsAnnotations: "org.jetbrains:annotations:$jetbrainsAnnotationVersion", - okhttp: "com.squareup.okhttp3:okhttp:$okhttpVersion", - gson: "com.google.code.gson:gson:$gsonjVersion", - postgres: "org.postgresql:postgresql:$postgresVersion", - hibernate: "org.hibernate:hibernate-core:$hibernateVersion", - jol: "org.openjdk.jol:jol-core:$jolVersion", - jol_samples: "org.openjdk.jol:jol-samples:$jolVersion" -] - -// code coverage settings -jacocoTestReport { - additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs) - sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) - classDirectories = files(subprojects.sourceSets.main.output) - executionData = files(subprojects.jacocoTestReport.executionData) - onlyIf = { - true - } - - reports { - xml.enabled = true - html.enabled = true - } - doFirst { - executionData = files(executionData.findAll { - it.exists() - }) - } -} - -coveralls { - sourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs).files.absolutePath -} +apply plugin: 'java' diff --git a/lecture01/build.gradle b/lecture01/build.gradle index fcf825dd7d..83a96b30b8 100644 --- a/lecture01/build.gradle +++ b/lecture01/build.gradle @@ -1,16 +1,22 @@ +repositories { + mavenCentral() +} + +apply plugin: 'java' +apply plugin: 'checkstyle' + dependencies { - testCompile rootProject.libraries.junit + // https://mvnrepository.com/artifact/junit/junit + testCompile group: 'junit', name: 'junit', version: '4.4' } -sourceSets { - main { - java { - srcDirs = ['src/main/java'] - } - } - test { - java { - srcDirs = ['src/test/java'] - } - } -} \ No newline at end of file +checkstyle { + ignoreFailures = false + toolVersion = '7.5' + configFile = new File('../config/checkstyle/checkstyle.xml') +} + +jar { + from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + manifest { attributes 'Main-Class': 'ru.atom.HelloWorld' } +} diff --git a/lecture01/gradle/wrapper/gradle-wrapper.jar b/lecture01/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..ed88a042a2 Binary files /dev/null and b/lecture01/gradle/wrapper/gradle-wrapper.jar differ diff --git a/lecture01/gradle/wrapper/gradle-wrapper.properties b/lecture01/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..f51202dd25 --- /dev/null +++ b/lecture01/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/lecture01/gradlew b/lecture01/gradlew new file mode 100755 index 0000000000..cccdd3d517 --- /dev/null +++ b/lecture01/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/lecture01/gradlew.bat b/lecture01/gradlew.bat new file mode 100644 index 0000000000..e95643d6a2 --- /dev/null +++ b/lecture01/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/lecture01/src/test/java/ru/atom/HelloWorldTest.java b/lecture01/src/test/java/ru/atom/HelloWorldTest.java index f7652d6182..c5b5f07a8f 100644 --- a/lecture01/src/test/java/ru/atom/HelloWorldTest.java +++ b/lecture01/src/test/java/ru/atom/HelloWorldTest.java @@ -2,15 +2,12 @@ import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.core.IsNot.not; +import static junit.framework.Assert.assertEquals; public class HelloWorldTest { + @Test - public void getHelloWorld() throws Exception { - assertThat(HelloWorld.getHelloWorld(), is(equalTo("Hello, World!"))); - assertThat(HelloWorld.getHelloWorld(), is(not(equalTo("Some strange string")))); + public void getHelloWorld() { + assertEquals("Hello, World!", HelloWorld.getHelloWorld()); } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c9e92c1eb9..930059b4c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,15 +1,2 @@ rootProject.name = 'atom' include 'lecture01' -include 'lecture02' -include 'lecture03' -include 'lecture04' -include 'lecture05' -include 'lecture06' -include 'lecture07' -include 'lecture08' -include 'lecture09' -include 'lecture10' -include 'lecture11' -include 'lecture12' -include 'bomberman/frontend' -include 'homeworks/HW2'