From f1c11281dc67e5c61a5d0c66cfdb6d6aca9c1eba Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Fri, 21 Jul 2017 09:26:37 -0600 Subject: [PATCH 01/37] Initial commit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..4fa332f5c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +build +.gradle +.idea +*.iml +ci/variables.yml From 62b2864a982d60c16f19468577afa317be6b83a5 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 10:20:57 +0530 Subject: [PATCH 02/37] Simple Spring Boot app --- gradle.setting | 1 + .../pivotal/pal/tracker/PalTrackerApplication.java | 12 ++++++++++++ .../io/pivotal/pal/tracker/WelcomeController.java | 0 3 files changed, 13 insertions(+) create mode 100644 gradle.setting create mode 100644 src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java create mode 100644 src/main/java/io/pivotal/pal/tracker/WelcomeController.java diff --git a/gradle.setting b/gradle.setting new file mode 100644 index 000000000..ef961960e --- /dev/null +++ b/gradle.setting @@ -0,0 +1 @@ +rootProject.name = "pal-tracker" \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java new file mode 100644 index 000000000..80f2a72a5 --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java @@ -0,0 +1,12 @@ +package io.pivotal.pal.tracker; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PalTrackerApplication { + + public static void main(String[] args) { + SpringApplication.run(PalTrackerApplication.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java new file mode 100644 index 000000000..e69de29bb From a3b0d0a9b840f8a5a9da97e8e2e232fd679aa698 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 13:56:50 -0600 Subject: [PATCH 03/37] Add tests for deployment lab --- .../pal/tracker/EnvControllerTest.java | 28 +++++++++++++++++++ .../pal/tracker/WelcomeControllerTest.java | 16 +++++++++++ .../pal/trackerapi/WelcomeApiTest.java | 26 +++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java new file mode 100644 index 000000000..fda0f0f34 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java @@ -0,0 +1,28 @@ +package test.pivotal.pal.tracker; + +import org.junit.Test; + +import java.util.Map; +import io.pivotal.pal.tracker.EnvController; + +import static org.assertj.core.api.Assertions.assertThat; + +public class EnvControllerTest { + @Test + public void getEnv() throws Exception { + EnvController controller = new EnvController( + "8675", + "12G", + "34", + "123.sesame.street" + ); + + Map env = controller.getEnv(); + + assertThat(env.get("PORT")).isEqualTo("8675"); + assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G"); + assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34"); + assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street"); + } + +} diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java new file mode 100644 index 000000000..bfa8271a0 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java @@ -0,0 +1,16 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.WelcomeController; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class WelcomeControllerTest { + + @Test + public void itSaysHello() throws Exception { + WelcomeController controller = new WelcomeController("A welcome message"); + + assertThat(controller.sayHello()).isEqualTo("A welcome message"); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java new file mode 100644 index 000000000..cc7091ed4 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java @@ -0,0 +1,26 @@ +package test.pivotal.pal.trackerapi; + +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class WelcomeApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void exampleTest() { + String body = this.restTemplate.getForObject("/", String.class); + assertThat(body).isEqualTo("Hello from test"); + } +} From 1b4efc7a26cdb70504402f0e78e8deb6f36eb676 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 13:56:50 -0600 Subject: [PATCH 04/37] Commiting all files --- build.gradle | 22 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ .../pal/tracker/WelcomeController.java | 13 ++ 6 files changed, 296 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..7a6c185c9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,22 @@ +plugins { + id "java" + id "org.springframework.boot" version "1.5.4.RELEASE" +} + +repositories { + mavenCentral() +} + +dependencies { + compile("org.springframework.boot:spring-boot-starter-web") + testCompile("org.springframework.boot:spring-boot-starter-test") +} + +bootRun.environment([ + "WELCOME_MESSAGE": "hello", +]) + +test.environment([ + "WELCOME_MESSAGE": "Hello from test", +]) + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 GIT binary patch literal 54708 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

_x$+l{{cH8$W#CT literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..f16d26666 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java index e69de29bb..2d477ae71 100644 --- a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java +++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java @@ -0,0 +1,13 @@ +package io.pivotal.pal.tracker; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class WelcomeController { + + @GetMapping("/") + public String sayHello() { + return "hello"; + } +} \ No newline at end of file From 355d2c4dda1dddf7a80542db9ebebd2f125271f0 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 12:49:08 +0530 Subject: [PATCH 05/37] Updated the Files --- .../pal/tracker/EnvControllerTest.java | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java deleted file mode 100644 index fda0f0f34..000000000 --- a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package test.pivotal.pal.tracker; - -import org.junit.Test; - -import java.util.Map; -import io.pivotal.pal.tracker.EnvController; - -import static org.assertj.core.api.Assertions.assertThat; - -public class EnvControllerTest { - @Test - public void getEnv() throws Exception { - EnvController controller = new EnvController( - "8675", - "12G", - "34", - "123.sesame.street" - ); - - Map env = controller.getEnv(); - - assertThat(env.get("PORT")).isEqualTo("8675"); - assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G"); - assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34"); - assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street"); - } - -} From 8b38c80cf82ca5f045215b532c4eade5b611392d Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 13:56:50 -0600 Subject: [PATCH 06/37] Add tests for deployment lab --- .../pal/tracker/EnvControllerTest.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java new file mode 100644 index 000000000..fda0f0f34 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java @@ -0,0 +1,28 @@ +package test.pivotal.pal.tracker; + +import org.junit.Test; + +import java.util.Map; +import io.pivotal.pal.tracker.EnvController; + +import static org.assertj.core.api.Assertions.assertThat; + +public class EnvControllerTest { + @Test + public void getEnv() throws Exception { + EnvController controller = new EnvController( + "8675", + "12G", + "34", + "123.sesame.street" + ); + + Map env = controller.getEnv(); + + assertThat(env.get("PORT")).isEqualTo("8675"); + assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G"); + assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34"); + assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street"); + } + +} From 1e1e359439cd3496990b29742ccf865ffe3050db Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 14:31:30 +0530 Subject: [PATCH 07/37] Lab : Concourse Intro --- ci/build.yml | 0 ci/pipeline.yml | 0 ci/variables.example.yml | 0 manifest.yml | 0 src/main/java/io/pivotal/pal/tracker/EnvController.java | 4 ++++ 5 files changed, 4 insertions(+) create mode 100644 ci/build.yml create mode 100644 ci/pipeline.yml create mode 100644 ci/variables.example.yml create mode 100644 manifest.yml create mode 100644 src/main/java/io/pivotal/pal/tracker/EnvController.java diff --git a/ci/build.yml b/ci/build.yml new file mode 100644 index 000000000..e69de29bb diff --git a/ci/pipeline.yml b/ci/pipeline.yml new file mode 100644 index 000000000..e69de29bb diff --git a/ci/variables.example.yml b/ci/variables.example.yml new file mode 100644 index 000000000..e69de29bb diff --git a/manifest.yml b/manifest.yml new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/java/io/pivotal/pal/tracker/EnvController.java b/src/main/java/io/pivotal/pal/tracker/EnvController.java new file mode 100644 index 000000000..a10003e55 --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/EnvController.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class EnvController { +} From 6a494d29136c37524281c2ac105994963dfb2f70 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 14:34:49 +0530 Subject: [PATCH 08/37] Concourse Intro Lab --- build.gradle | 2 +- ci/build.yml | 23 +++++++++++ ci/pipeline.yml | 31 +++++++++++++++ ci/variables.example.yml | 9 +++++ manifest.yml | 5 +++ .../io/pivotal/pal/tracker/EnvController.java | 39 ++++++++++++++++++- .../pal/tracker/PalTrackerApplication.java | 1 + .../pal/tracker/WelcomeController.java | 11 +++++- 8 files changed, 117 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 7a6c185c9..7e6146548 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ dependencies { } bootRun.environment([ - "WELCOME_MESSAGE": "hello", + "WELCOME_MESSAGE": "hello from Confing", ]) test.environment([ diff --git a/ci/build.yml b/ci/build.yml index e69de29bb..94e399ce2 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -0,0 +1,23 @@ +platform: linux + +image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' + +inputs: + - name: pal-tracker + +outputs: + - name: build-output + +run: + path: bash + args: + - -exc + - | + cd pal-tracker + chmod +x ./gradlew + ./gradlew build + cp build/libs/pal-tracker.jar ../build-output \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index e69de29bb..01d389043 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -0,0 +1,31 @@ +--- +resources: +- name: pal-tracker + type: git + source: + uri: {{github-repository}} + branch: master + private_key: {{github-private-key}} + +- name: deploy + type: cf + source: + api: {{cf-api-url}} + username: {{cf-username}} + password: {{cf-password}} + organization: {{cf-org}} + space: sandbox + +jobs: +- name: build-and-deploy + plan: + - get: pal-tracker + trigger: true + - task: build and test + file: pal-tracker/ci/build.yml + - put: deploy + params: + manifest: pal-tracker/manifest.yml + path: build-output/pal-tracker.jar + environment_variables: + WELCOME_MESSAGE: "Hello from Concourse" \ No newline at end of file diff --git a/ci/variables.example.yml b/ci/variables.example.yml index e69de29bb..649a717a6 100644 --- a/ci/variables.example.yml +++ b/ci/variables.example.yml @@ -0,0 +1,9 @@ +cf-api-url: CF_API_URL +cf-username: CF_USERNAME +cf-password: CF_PASSWORD +cf-org: CF_ORG +github-repository: git@github.com:GITHUB_USERNAME/pal-tracker.git +github-private-key: | + -----BEGIN RSA PRIVATE KEY----- + REPLACE WITH YOUR PRIVATE KEY HERE + -----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/manifest.yml b/manifest.yml index e69de29bb..2cefccc45 100644 --- a/manifest.yml +++ b/manifest.yml @@ -0,0 +1,5 @@ +--- +applications: +- name: pal-tracker + path: build/libs/pal-tracker.jar + random-route: true diff --git a/src/main/java/io/pivotal/pal/tracker/EnvController.java b/src/main/java/io/pivotal/pal/tracker/EnvController.java index a10003e55..b8c0167d2 100644 --- a/src/main/java/io/pivotal/pal/tracker/EnvController.java +++ b/src/main/java/io/pivotal/pal/tracker/EnvController.java @@ -1,4 +1,41 @@ package io.pivotal.pal.tracker; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController public class EnvController { -} + + private final String port; + private final String memoryLimit; + private final String cfInstanceIndex; + private final String cfInstanceAddress; + + public EnvController( + @Value("${PORT:NOT SET}") String port, + @Value("${MEMORY_LIMIT:NOT SET}") String memoryLimit, + @Value("${CF_INSTANCE_INDEX:NOT SET}") String cfInstanceIndex, + @Value("${CF_INSTANCE_ADDR:NOT SET}") String cfInstanceAddress + ) { + this.port = port; + this.memoryLimit = memoryLimit; + this.cfInstanceIndex = cfInstanceIndex; + this.cfInstanceAddress = cfInstanceAddress; + } + + @GetMapping("/env") + public Map getEnv() { + Map env = new HashMap<>(); + + env.put("PORT", port); + env.put("MEMORY_LIMIT", memoryLimit); + env.put("CF_INSTANCE_INDEX", cfInstanceIndex); + env.put("CF_INSTANCE_ADDR", cfInstanceAddress); + + return env; + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java index 80f2a72a5..208deea12 100644 --- a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java +++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java @@ -7,6 +7,7 @@ public class PalTrackerApplication { public static void main(String[] args) { + SpringApplication.run(PalTrackerApplication.class, args); } } \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java index 2d477ae71..584ca3263 100644 --- a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java +++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java @@ -1,13 +1,20 @@ package io.pivotal.pal.tracker; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @RestController -public class WelcomeController { +public class WelcomeController + { + String msg =""; + public WelcomeController(@Value("${WELCOME_MESSAGE}") String msg){ + this.msg=msg; + } + @GetMapping("/") public String sayHello() { - return "hello"; + return msg; } } \ No newline at end of file From 18f99db863c1e22ea0f85ad6f1668a72486f0bb7 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 16:20:37 +0530 Subject: [PATCH 09/37] Pipelines for Multiple Env --- ci/build.yml | 39 ++++++++------- ci/pipeline.yml | 66 ++++++++++++++++++++++--- ci/variables.example.yml | 5 +- manifest.yml => manifest-production.yml | 2 +- manifest-review.yml | 5 ++ 5 files changed, 89 insertions(+), 28 deletions(-) rename manifest.yml => manifest-production.yml (76%) create mode 100644 manifest-review.yml diff --git a/ci/build.yml b/ci/build.yml index 94e399ce2..47fab2ed1 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -1,23 +1,24 @@ -platform: linux + platform: linux -image_resource: - type: docker-image - source: - repository: openjdk - tag: '8-jdk' + image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' -inputs: - - name: pal-tracker + inputs: + - name: pal-tracker + - name: version -outputs: - - name: build-output + outputs: + - name: build-output -run: - path: bash - args: - - -exc - - | - cd pal-tracker - chmod +x ./gradlew - ./gradlew build - cp build/libs/pal-tracker.jar ../build-output \ No newline at end of file + run: + path: bash + args: + - -exc + - | + cd pal-tracker + chmod +x ./gradlew + ./gradlew -P version=$(cat ../version/number) build + cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 01d389043..c34c3b2a9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -7,25 +7,77 @@ resources: branch: master private_key: {{github-private-key}} -- name: deploy +- name: pal-tracker-artifacts + type: s3 + source: + bucket: {{aws-bucket}} + regexp: releases/pal-tracker-(.*).jar + access_key_id: {{aws-access-key-id}} + secret_access_key: {{aws-secret-access-key}} + +- name: version + type: semver + source: + bucket: {{aws-bucket}} + key: pal-tracker/version + access_key_id: {{aws-access-key-id}} + secret_access_key: {{aws-secret-access-key}} + +- name: review-deployment + type: cf + source: + api: {{cf-api-url}} + username: {{cf-username}} + password: {{cf-password}} + organization: {{cf-org}} + space: review + +- name: production-deployment type: cf source: api: {{cf-api-url}} username: {{cf-username}} password: {{cf-password}} organization: {{cf-org}} - space: sandbox + space: production jobs: -- name: build-and-deploy +- name: build plan: - get: pal-tracker trigger: true + - get: version + params: {bump: patch} - task: build and test file: pal-tracker/ci/build.yml - - put: deploy + - put: pal-tracker-artifacts + params: + file: build-output/pal-tracker-*.jar + - put: version + params: + file: version/number + +- name: deploy-review + plan: + - get: pal-tracker + - get: pal-tracker-artifacts + trigger: true + passed: [build] + - put: review-deployment + params: + manifest: pal-tracker/manifest-review.yml + path: pal-tracker-artifacts/pal-tracker-*.jar + environment_variables: + WELCOME_MESSAGE: "Hello from the review environment" + +- name: deploy-production + plan: + - get: pal-tracker + - get: pal-tracker-artifacts + passed: [deploy-review] + - put: production-deployment params: - manifest: pal-tracker/manifest.yml - path: build-output/pal-tracker.jar + manifest: pal-tracker/manifest-production.yml + path: pal-tracker-artifacts/pal-tracker-*.jar environment_variables: - WELCOME_MESSAGE: "Hello from Concourse" \ No newline at end of file + WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file diff --git a/ci/variables.example.yml b/ci/variables.example.yml index 649a717a6..c72926f28 100644 --- a/ci/variables.example.yml +++ b/ci/variables.example.yml @@ -6,4 +6,7 @@ github-repository: git@github.com:GITHUB_USERNAME/pal-tracker.git github-private-key: | -----BEGIN RSA PRIVATE KEY----- REPLACE WITH YOUR PRIVATE KEY HERE - -----END RSA PRIVATE KEY----- \ No newline at end of file + -----END RSA PRIVATE KEY----- +aws-access-key-id: +aws-secret-access-key: +aws-bucket: \ No newline at end of file diff --git a/manifest.yml b/manifest-production.yml similarity index 76% rename from manifest.yml rename to manifest-production.yml index 2cefccc45..340b53421 100644 --- a/manifest.yml +++ b/manifest-production.yml @@ -2,4 +2,4 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - random-route: true + host: ps-pal-tracker \ No newline at end of file diff --git a/manifest-review.yml b/manifest-review.yml new file mode 100644 index 000000000..65369e833 --- /dev/null +++ b/manifest-review.yml @@ -0,0 +1,5 @@ +--- +applications: +- name: pal-tracker + path: build/libs/pal-tracker.jar + host: ps-pal-tracker-review From c07ea71b8941167a5344c0f089e914b4b08707c0 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 17:25:24 +0530 Subject: [PATCH 10/37] Updating the Host Name --- ci/build.yml | 2 +- manifest-production.yml | 2 +- manifest-review.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 47fab2ed1..94e2e7170 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -21,4 +21,4 @@ cd pal-tracker chmod +x ./gradlew ./gradlew -P version=$(cat ../version/number) build - cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file + cp build/libs/pal-tracker-*.jar ../build-output/ \ No newline at end of file diff --git a/manifest-production.yml b/manifest-production.yml index 340b53421..a0e0abfcf 100644 --- a/manifest-production.yml +++ b/manifest-production.yml @@ -2,4 +2,4 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - host: ps-pal-tracker \ No newline at end of file + host: ps-pal-tracker-samrat \ No newline at end of file diff --git a/manifest-review.yml b/manifest-review.yml index 65369e833..a7dfb3153 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -2,4 +2,4 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - host: ps-pal-tracker-review + host: ps-pal-tracker-review-samrat From b554211ad2427ce6ff49aa543823b15cebf617fc Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 15:04:20 -0600 Subject: [PATCH 11/37] Add tests for MVC lab --- .../InMemoryTimeEntryRepositoryTest.java | 71 +++++++++++ .../pal/tracker/TimeEntryControllerTest.java | 107 ++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 119 ++++++++++++++++++ 3 files changed, 297 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java new file mode 100644 index 000000000..95e810cad --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java @@ -0,0 +1,71 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.InMemoryTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; + +import org.junit.Test; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; + +public class InMemoryTimeEntryRepositoryTest { + @Test + public void create() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + assertThat(createdTimeEntry).isEqualTo(expected); + + TimeEntry readEntry = repo.find(createdTimeEntry.getId()); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void find() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + TimeEntry readEntry = repo.find(1L); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void list() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + repo.create(new TimeEntry(789, 654, "yesterday", 4)); + + List expected = asList( + new TimeEntry(1L, 123, 456, "today", 8), + new TimeEntry(2L, 789, 654, "yesterday", 4) + ); + assertThat(repo.list()).isEqualTo(expected); + } + + @Test + public void update() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry updatedEntry = repo.update( + created.getId(), + new TimeEntry(321, 654, "tomorrow", 5)); + + TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 5); + assertThat(updatedEntry).isEqualTo(expected); + assertThat(repo.find(created.getId())).isEqualTo(expected); + } + + @Test + public void delete() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + repo.delete(created.getId()); + assertThat(repo.list()).isEmpty(); + } +} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java new file mode 100644 index 000000000..a6f1100b5 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -0,0 +1,107 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.TimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntryController; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; +import org.junit.Test; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class TimeEntryControllerTest { + private TimeEntryRepository timeEntryRepository; + private TimeEntryController controller; + + @Before + public void setUp() throws Exception { + timeEntryRepository = mock(TimeEntryRepository.class); + controller = new TimeEntryController(timeEntryRepository); + } + + @Test + public void testCreate() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .create(any(TimeEntry.class)); + + ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testList() throws Exception { + List expected = asList( + new TimeEntry(1, 123, 456, "today", 8), + new TimeEntry(2, 789, 321, "yesterday", 4) + ); + doReturn(expected).when(timeEntryRepository).list(); + + ResponseEntity> response = controller.list(); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate() throws Exception { + TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); + doReturn(expected) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, expected); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, new TimeEntry()); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testDelete() throws Exception { + ResponseEntity response = controller.delete(1L); + verify(timeEntryRepository).delete(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java new file mode 100644 index 000000000..36dd6c687 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -0,0 +1,119 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import io.pivotal.pal.tracker.PalTrackerApplication; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collection; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class TimeEntryApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + + @Test + public void testCreate() throws Exception { + ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); + + + assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); + + DocumentContext createJson = parse(createResponse.getBody()); + assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); + assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testList() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); + + + assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext listJson = parse(listResponse.getBody()); + + Collection timeEntries = listJson.read("$[*]", Collection.class); + assertThat(timeEntries.size()).isEqualTo(1); + + Long readId = listJson.read("$[0].id", Long.class); + assertThat(readId).isEqualTo(id); + } + + @Test + public void testRead() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + + + assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + DocumentContext readJson = parse(readResponse.getBody()); + assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testUpdate() throws Exception { + Long id = createTimeEntry(); + TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); + + + ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); + + + assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext updateJson = parse(updateResponse.getBody()); + assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); + assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); + assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); + assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); + } + + @Test + public void testDelete() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); + + + assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + private Long createTimeEntry() { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); + } +} From 6636e9d420a97544d05af335f632a757f6f06115 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 15:04:20 -0600 Subject: [PATCH 12/37] TimeTracker App --- .../io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntry.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntryController.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntry.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryController.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java new file mode 100644 index 000000000..2f5a9f68a --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class InMemoryTimeEntryRepository { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java new file mode 100644 index 000000000..3f945596c --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class TimeEntry { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java new file mode 100644 index 000000000..35193a07d --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class TimeEntryController { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java new file mode 100644 index 000000000..0316a3fbd --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public interface TimeEntryRepository { +} From e6f252e494ede94e9b5377378ced50e4370d10af Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 17:57:30 +0530 Subject: [PATCH 13/37] Updated the Test Class --- .../tracker/InMemoryTimeEntryRepository.java | 38 ++++++++- .../pal/tracker/PalTrackerApplication.java | 7 +- .../io/pivotal/pal/tracker/TimeEntry.java | 84 ++++++++++++++++++- .../pal/tracker/TimeEntryController.java | 55 +++++++++++- .../pal/tracker/TimeEntryRepository.java | 9 +- 5 files changed, 187 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java index 2f5a9f68a..07785c3e0 100644 --- a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java +++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java @@ -1,4 +1,38 @@ package io.pivotal.pal.tracker; -public class InMemoryTimeEntryRepository { -} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class InMemoryTimeEntryRepository implements TimeEntryRepository { + private HashMap timeEntries = new HashMap<>(); + + @Override + public TimeEntry create(TimeEntry timeEntry) { + timeEntry.setId(timeEntries.size() + 1); + timeEntries.put(timeEntry.getId(), timeEntry); + return timeEntry; + } + + @Override + public TimeEntry find(Long id) { + return timeEntries.get(id); + } + + @Override + public List list() { + return new ArrayList<>(timeEntries.values()); + } + + @Override + public TimeEntry update(Long id, TimeEntry timeEntry) { + timeEntries.replace(id, timeEntry); + timeEntry.setId(id); + return timeEntry; + } + + @Override + public void delete(Long id) { + timeEntries.remove(id); + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java index 208deea12..8a8c728a7 100644 --- a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java +++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java @@ -2,12 +2,17 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class PalTrackerApplication { public static void main(String[] args) { - SpringApplication.run(PalTrackerApplication.class, args); } + + @Bean + TimeEntryRepository timeEntryRepository() { + return new InMemoryTimeEntryRepository(); + } } \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java index 3f945596c..ecc98e3af 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java @@ -1,4 +1,86 @@ package io.pivotal.pal.tracker; public class TimeEntry { -} + private long id; + private long projectId; + private long userId; + private String date; + private int hours; + + public TimeEntry() { + } + + public TimeEntry(long projectId, long userId, String date, int hours) { + this.projectId = projectId; + this.userId = userId; + this.date = date; + this.hours = hours; + } + + public TimeEntry(long id, int projectId, int userId, String date, int hours) { + this.id = id; + this.projectId = projectId; + this.userId = userId; + this.date = date; + this.hours = hours; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public int getProjectId() { + return projectId; + } + + public int getUserId() { + return userId; + } + + public String getDate() { + return date; + } + + public int getHours() { + return hours; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + TimeEntry timeEntry = (TimeEntry) o; + + if (id != timeEntry.id) return false; + if (projectId != timeEntry.projectId) return false; + if (userId != timeEntry.userId) return false; + if (hours != timeEntry.hours) return false; + return date != null ? date.equals(timeEntry.date) : timeEntry.date == null; + } + + @Override + public int hashCode() { + int result = (int) (id ^ (id >>> 32)); + result = 31 * result + (int) (projectId ^ (projectId >>> 32)); + result = 31 * result + (int) (userId ^ (userId >>> 32)); + result = 31 * result + (date != null ? date.hashCode() : 0); + result = 31 * result + hours; + return result; + } + + @Override + public String toString() { + return "TimeEntry{" + + "id=" + id + + ", projectId=" + projectId + + ", userId=" + userId + + ", date='" + date + '\'' + + ", hours=" + hours + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java index 35193a07d..1f460951a 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java @@ -1,4 +1,57 @@ package io.pivotal.pal.tracker; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/time-entries") public class TimeEntryController { -} + + private TimeEntryRepository timeEntriesRepo; + + public TimeEntryController(TimeEntryRepository timeEntriesRepo) { + this.timeEntriesRepo = timeEntriesRepo; + } + + @PostMapping + public ResponseEntity create(@RequestBody TimeEntry timeEntry) { + TimeEntry createdTimeEntry = timeEntriesRepo.create(timeEntry); + + return new ResponseEntity<>(createdTimeEntry, HttpStatus.CREATED); + } + + @GetMapping("{id}") + public ResponseEntity read(@PathVariable Long id) { + TimeEntry timeEntry = timeEntriesRepo.find(id); + if (timeEntry != null) { + return new ResponseEntity<>(timeEntry, HttpStatus.OK); + } else { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + } + + @GetMapping + public ResponseEntity> list() { + return new ResponseEntity<>(timeEntriesRepo.list(), HttpStatus.OK); + } + + @PutMapping("{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody TimeEntry timeEntry) { + TimeEntry updatedTimeEntry = timeEntriesRepo.update(id, timeEntry); + if (updatedTimeEntry != null) { + return new ResponseEntity<>(updatedTimeEntry, HttpStatus.OK); + } else { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + } + + @DeleteMapping("{id}") + public ResponseEntity delete(@PathVariable Long id) { + timeEntriesRepo.delete(id); + + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java index 0316a3fbd..866097db4 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java @@ -1,4 +1,11 @@ package io.pivotal.pal.tracker; +import java.util.List; + public interface TimeEntryRepository { -} + TimeEntry create(TimeEntry timeEntry); + TimeEntry find(Long id); + List list(); + TimeEntry update(Long id, TimeEntry timeEntry); + void delete(Long id); +} \ No newline at end of file From b2f4b087558b84371908c1964bc63193a65f7688 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 15:04:20 -0600 Subject: [PATCH 14/37] SQL Scripts --- databases/tracker/create_databases.sql | 9 +++++++++ .../tracker/migrations/V1__initial_schema.sql | 11 +++++++++++ .../io/pivotal/pal/tracker/EnvController.class | Bin 0 -> 1631 bytes .../tracker/InMemoryTimeEntryRepository.class | Bin 0 -> 1945 bytes .../pal/tracker/PalTrackerApplication.class | Bin 0 -> 990 bytes .../io/pivotal/pal/tracker/TimeEntry.class | Bin 0 -> 2419 bytes .../pal/tracker/TimeEntryController.class | Bin 0 -> 3445 bytes .../pal/tracker/TimeEntryRepository.class | Bin 0 -> 560 bytes .../pivotal/pal/tracker/WelcomeController.class | Bin 0 -> 842 bytes .../pivotal/pal/tracker/EnvControllerTest.class | Bin 0 -> 1469 bytes .../InMemoryTimeEntryRepositoryTest.class | Bin 0 -> 3052 bytes .../pal/tracker/TimeEntryControllerTest.class | Bin 0 -> 5111 bytes .../pal/tracker/WelcomeControllerTest.class | Bin 0 -> 1029 bytes .../pal/trackerapi/TimeEntryApiTest.class | Bin 0 -> 6455 bytes .../pivotal/pal/trackerapi/WelcomeApiTest.class | Bin 0 -> 1704 bytes .../java/io/pivotal/pal/tracker/TimeEntry.java | 6 +++--- .../pal/tracker/TimeEntryControllerTest.java | 2 +- .../pivotal/pal/trackerapi/TimeEntryApiTest.java | 6 +++--- 18 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 databases/tracker/create_databases.sql create mode 100644 databases/tracker/migrations/V1__initial_schema.sql create mode 100644 out/production/classes/io/pivotal/pal/tracker/EnvController.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/PalTrackerApplication.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/TimeEntry.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/TimeEntryController.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/TimeEntryRepository.class create mode 100644 out/production/classes/io/pivotal/pal/tracker/WelcomeController.class create mode 100644 out/test/classes/test/pivotal/pal/tracker/EnvControllerTest.class create mode 100644 out/test/classes/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.class create mode 100644 out/test/classes/test/pivotal/pal/tracker/TimeEntryControllerTest.class create mode 100644 out/test/classes/test/pivotal/pal/tracker/WelcomeControllerTest.class create mode 100644 out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class create mode 100644 out/test/classes/test/pivotal/pal/trackerapi/WelcomeApiTest.class diff --git a/databases/tracker/create_databases.sql b/databases/tracker/create_databases.sql new file mode 100644 index 000000000..07418b83f --- /dev/null +++ b/databases/tracker/create_databases.sql @@ -0,0 +1,9 @@ +DROP DATABASE IF EXISTS tracker_dev; +DROP DATABASE IF EXISTS tracker_test; + +CREATE USER 'tracker'@'localhost' + IDENTIFIED BY ''; +GRANT ALL PRIVILEGES ON *.* TO 'tracker' @'localhost'; + +CREATE DATABASE tracker_dev; +CREATE DATABASE tracker_test; \ No newline at end of file diff --git a/databases/tracker/migrations/V1__initial_schema.sql b/databases/tracker/migrations/V1__initial_schema.sql new file mode 100644 index 000000000..eaaa0c152 --- /dev/null +++ b/databases/tracker/migrations/V1__initial_schema.sql @@ -0,0 +1,11 @@ +CREATE TABLE time_entries ( + id BIGINT(20) NOT NULL AUTO_INCREMENT, + project_id BIGINT(20), + user_id BIGINT(20), + date VARCHAR(255), + hours INT, + + PRIMARY KEY (id) +) + ENGINE = innodb + DEFAULT CHARSET = utf8; \ No newline at end of file diff --git a/out/production/classes/io/pivotal/pal/tracker/EnvController.class b/out/production/classes/io/pivotal/pal/tracker/EnvController.class new file mode 100644 index 0000000000000000000000000000000000000000..7eab781d1c865e4064fc1033768c5b213022d36a GIT binary patch literal 1631 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 GKK~Cc3a-%r literal 0 HcmV?d00001 diff --git a/out/production/classes/io/pivotal/pal/tracker/TimeEntryRepository.class b/out/production/classes/io/pivotal/pal/tracker/TimeEntryRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..7f2d9dfdfd81f3a85f7ae54dbc34aea50b2ce830 GIT binary patch literal 560 zcma)3y-ve05dN;D2`zu6U3i3q0WTFx5nDS&LZYadL>_0<@703Hf)4H6wP zq=R+R_j7mt?)&HS3&0eU2-gwDgfMeTdPP{oskWlhTkE9}6+iD}_O6_G(I0AFdbgV; z-4a6Zrpuf#jnlQNozu~A`F+dc9~je!;+i-aGzCWH`-gbyW8hRxa~T} z!9f@uvVMA9tIUT4LXU3^^aH{P0)T5DVN)ZVGCyFphauxYx15Pi-^lcu3fmo`woi#Q}(slN1p1VXB!P!1bfH7GswfV^8bxZT*1*GW|& z{u4+bBo6!leiUMyL{O9-D$C=UvETFacz*r<@e{xfHY+INei;uIQNY6z9+mKzAwS6a z3_)}z#)79p_j%V@rTZ@!7G5f?+$)Cl#{71($53dQ6Und=DJ|cQ2C=m7M4VD4h)g2V zp0LWtvt+@2P#HrQDZ__qY@A5>kfyUDIhU3n$uuzo*)rN$lcv&=gr|oi?bJZ_RHlgO zKv*%5PTF0q3GbBA#JCd~+vnNP%Rco7E{r|ru@pMvry_C2UUKmlzeW%^+?(VfeF_bfL`9`LxVOVQ4=bz88@xQbiD7ug_kCi^TDrQf*ju;N7 z1!tV0(lsNS$k)o(u|8LmZU0XU&#!&*br&4U%v~vI6=ghOKotupF*I)a7Ywz39kL&v z$;46bG@3nZQa2T;!HCpzlFgA{#v-j1iVkSa(OL_?gM~rv8}i{6nJ<%*OJoCL0G7yB zXjHL+TV#Ry6i3lAMZ_@Sr+y>9%IK0B&DD(X47ag1yN^@kwG_jz$bTj$N7P=LPX-g> g>h!>jc%Aagl&RBPJqF8ghcI_1$PM^ikG%){0Zo3*v;Y7A literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/tracker/EnvControllerTest.class b/out/test/classes/test/pivotal/pal/tracker/EnvControllerTest.class new file mode 100644 index 0000000000000000000000000000000000000000..7edbc421f4d5471d58ffe66c6c9c26a499ee4a53 GIT binary patch literal 1469 zcmbVMTT|0O6#lj?O$bFwxG3HLMWld4?jRSfZBfP+6gntROo%H4OHz_8qd&_R@G|50 z?1Mka@oZBuoqA#HOwaCqd(OAtxlF!(|M(fe6dr5Paa+NVij<0B6(cG}HAHYnnlTkd z3+`fE!GwlMOlg?LjEY$mb1LQ)+*7c?5MQ(%TP!m~hf-S%v5fnYGqmMxhp$x*cez(I zcT0rmdDk*aTc&5ra}A7%ecNXk%?s`eqii3$!YmnO`U}srUUSdLIma2-5uRHr5fypK zC-=A@oI$hBt{4XMw)<}i3XgIb+m=5tk4>W@?2=J1%Y=8=D|}o2sdBpBbul=WOlQy7 z6rSzuEi@v_M5yK7SiCH3*YOoBGW2Xz9AO{wE!(%L25HBkbgS14$-L|B83z@rrBO>$ z+jJ|Q#aC=uzV3!Xj7j|obfA-A;5?~QbLM7dr>Owr6OR}olT!@s;}er(KKIQ-KIRLL zb0Ha*61WU%Y3%9xMp4221Rfww8mkox<*ndh0vTi#HFLh2ZrT(+%U_wk*)%AXlR0h+v2`S zyty!MZSYdnv1#PkrDmFz$n2ZmCO@ih$KnAmjivGXXa5+&&}{p;ql#H7x(xGS6=&J~ zm9q9S`q54w9QliYnuboYU34;NWwbU8pMt%sUU!p?S3wOIX`cuja0xwhVlV7s6O9z}muCQ-CGI zSX^RKT@+H?btq(8kt8KugrrF466t$J3OVVMs`~#j`Y!UiMhp@3l9$Xa aK>7&jCnQG54cw%itib@S47bQeF!%$aGJFF7 literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.class b/out/test/classes/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.class new file mode 100644 index 0000000000000000000000000000000000000000..b29b333b1498268f830af0d93e84df54181cd510 GIT binary patch literal 3052 zcmbVO>sHiO7~O{nWQ;H zLtmkPMpkY6yQ?qI-+hs;?vrFPQ*l5$YmuCM=R4=y``h~@{Q1u>zXQnOrG|63qvEcH z4tc-V$*}x=9}mPIX-sKQFfB9g%h6{VW-zPabL8dYoQ8Qkkh2ftHK`BcLC242JZkLN zp_QidB%)0 zXKlJ(ZOPuWrkud5Em#%Tw*wjCnsEXsc$OKkg5q&XAeXn@_uY!ybVu71lR^S#+wGL( za9!GZS+NR%RTS7qAjJ@*fHw8AU{wO!b$k`y2=pyfoq!ycZQmyUNyj18aGIs_u2(WP zs_df?lTy}ghdU}|+Ye;IhPh=L)xa(rc}7^a_rL9|RT?eLy^%YyH;G%ai`7ao?4la? zK|qf}4Mtr>t8B?WYm08xD_GOEl=a*m0$q~Gb)3h5z~%QBMxejVqC^9M&cH32HCg0a z9V7Toj!YG6ItnPNuym}Wq~j@U6&pI9p{(ONHYr$*7P34pR^jMyQPFV&&*eH#g)i5! z`{}@?13mYJjtNwC+{TuU7n0D8|7%-H8Y)^gos#ijZG#39IMNIy<`FoSot=#&4U-oG z&vr`VGxDrWXZO~2aPJhFlQr5EIW4_u`o84_8%DwPEW@nW#$*_f?xr82*`=o@N!-r1 zfQ^`q4~G8UxyPC>Pk9h!MLW`ogKsbRmShTO`%}-WW_gL{{^t8vPHJ|RtYC)cjqk8o zfrCvU@~%@7P`Au-)q1c_jk2?YEd=E>A?I34hp~5Rd*p%eR8M-ISz|A|OkW;wf%DlX zEp?JchR9mq13lRoPiyc>jHelEBY~`yG~w+^H&X;YY2}$<+EuUSa`tJtb$!^Uz1{gv zojkH*V|hMQx?{5v)NlqL@jEJiU0`c5!0QD*8N3VLJBMCD{LDcIvT+h{0D~OsQ38fA z%qPLu%K%d0;$NXbejgWJqhs|IQu*Q6P*yYO%s}ng*PVU^t&aV3GN`pi_4$!)9JpA= z!Ij~WIu324yN<(SN}tjQH<6rz$_m{`<1kL)2u6{?79LWH>pMT{_wSzN>= zB0a_b9}IjFHG?;Z{0-qjIU8^cGi@Na&*(BrEjAZS>6z*KvFsACmHk zka8-tQ$%@ylrNBSmavETVYvj4@<@yIM-UUr&tl5!1V4(KA?3)3QDmHvcJfUm)c=m{ z>F!E>u3^E5(n;BY(~))i=VeSfG=n6rk10~rKIIMjCb6c{1K3A$S4cZY+Sf?)IDL_9@a(=FoV667NZ^4=JEJE=Y;t`1E83maU*i2wiq literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/tracker/TimeEntryControllerTest.class b/out/test/classes/test/pivotal/pal/tracker/TimeEntryControllerTest.class new file mode 100644 index 0000000000000000000000000000000000000000..3dfcce7ec5975da0ba2c1b8ffcb90f5065cc18bc GIT binary patch literal 5111 zcmbVP`Fj)B6+I&_Ba30P4GqKz1Pa&&EE-G#H6b-#AdYMoTiCcMsAG9-kC8QEG%~np zn{?kx_q|Q`y|hV#m(V2co~HZH{ra!;>$x*yX^bRW6n{uF@4b8PIrpA>XY~4iUwQ>V zJN^|x2NEjY5rK~JI=mT46%!HEz>u3s6;m}lDF2@JFO=89n2sO}Q*357;VM!Q%p$!B zAy~4J5<q*vLlUAXkSuT#w)e=4I`jvi5WY?~>bh<2_>bj95G?=iVzH?^}%-@-M1( ztOoB4JqWnla}rM^8mF{O{O$@~UA+ZuXkHs#)5tahf&tb&JQj*)fN2V4jm=UE1>$r{eZ48ix@NE#W(w9;7>Ur?}XD3_L` zjF?%Ikvh|9X2IQdLD*B#nH&*E&l;1KZ3ue_-enuQLzrRXM#e}w#)N`>8zzy)VcW=N z7@DRnF^kT#8QV-xP1^dbaow`7MyDMo6CLsou~4QnPqS_ASr3TMCoC|A44sj8uFcha zW;I{^m4-OIG4?Zrv3)gWV!(2Gtz4SHT^unp>j=sjeNK<&95WS_6Dc=`sW!5HOG`t0!3R){~ zDHUJT@Fjd%!)ZKLfn_16#QKVcGk9FV-i-pX2OMicpBJOAYWNzyuHqXSzKQ2ld`rW( z1;BUkUD^JgTzy}~4>bG`KT`2y4L`w8Rs2lD&v8q|FEsoT&ue%AzmlC7RoqswpkWb9 z8kX^rhCBGRhL>?m!z;L@pl+TSHf%;$@v4Ru{6@oX@jLnWy@D-kizqJtpyH1b9;J+tCtO@jO#*(dG?1tT2!}WHRn*?(6FdxEgk3 zP;@*Yd*KOd$Z&FYnzJwnzz^q5mQ~1ECpSJ$)9A2V7&g%~1u5OVPj1(z4Z1#9(sdz6 zd2)?Gcm2APoHlHZ=_)|S%~OUm z%m+s<>pjs9HLo+@&vVFohe>CT#Gr5t+nI?b`HYF`88h1HF33}gv&Y+wPwN!vxnNbg ztl5li%M+5REA3}ID-Uz0aMJV4!28RRE8tV0b`AA(#(TP{_3}fxU_ie|?+FNJgPHBQ zmeW&lOTnoiyESqy&XCV6&qrkm&RP@HTqBcTLZ^@4yK@ghK19p9)PjdshnhPWVpe*J znVi#8Ib(2=Bc-`72vD|}x9Uk#9;od>l#}t&dd~P(<+ySY z)K2*CJhgL%ZBDYE8j2#yQz$YpnCKcDi1!S{@eqGcb?|poh<|*Eaj*DR!tXjL@mror-D6$+taTT6pqtm4cK|);6trnrKx6-r1?*VD z&KK~81>85vyIo7zeRu))j~1ZsvUop}9zz%V<$NMJ}MVM7dT# zEgvE4qeW!9S)=oAgIr*9BoITI6%n$Y_AH<5ai*gmqoj5L5Bk~@+L97)?^1qmY@M3D zEuVm8UzZ7=dRrroc^r%Qv5F5KJj|e_L{CcFVS+~f)mZu__Si}huDk0I3+h?9cFH@pd zDA5EbhmMmN=O|4EBzn#Ve=;x8a**Gihy1MHLv1qIyw-mtCi8Czk8=8XopdsUeDj=I p+dTE83{0_ir?Cenj$$T&sLe;DaZ0%rr!{*{12uME!hA7 literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/tracker/WelcomeControllerTest.class b/out/test/classes/test/pivotal/pal/tracker/WelcomeControllerTest.class new file mode 100644 index 0000000000000000000000000000000000000000..a49636ed7b17145d6c5abfaff7a477b310365353 GIT binary patch literal 1029 zcmb7D%Wl&^6g`uqb?TV5q%D2$Xm}?nWLU64K}b;)#KHoJM5(%*m{Bspu~U0o=x4EM z5lDOhABDJMM-5T~DwaIgb06oPduIIe*S8-4o`c(1!JdViMclHH!)>$Nv9XVejk~yK z;l70j49hQ7p!6$-e6`kRD73>5l3~qNfqa`x1~Tf2flr>Y8+yX;i%6OM%vsPQ6*D|@ zwTv~Ns*_L)pHJ!4k?=msh#yMd3n#K22099TpWrC7$xu?dD^BA#()U9K+q;M})Lj)` z4U2H>&Sy_fwF-mS!b67L_er4DMD|szh-WJZh*BD6Sa-u{$j1rI%V#v~ZkR-#e67rg zdke`n#^OXcuu)>DUX>Zc^;YFmHhX0v<5&!(!Fc50F{&174(d3t@WjDWG#DEHCm_vY zSaDwjL;h|smY!zVn7b}SVc4p=bAMMyDi}7+K^J3jI#YkMTDzRXuy527aV#S}=3W>{ zE~bjNQisu-#LuF=k)ZaSMU7I$FJla1b3b%@B%-c7PGsQ843|!nFK+wS5{4BOca9U` z_vj|Q_>)DZOtbcH7PHRuQxxf!F;5OO8%ne~wBuwM*`@k9*q1bXjn?JVS;Q)RJ6QtO zuueNVd@9bT#XYh)^6h*_?x>tUN5MTf!_rqQm-A<^4(E8QlxdJ`Lfj@KgL@;Zo#C2D Y85@MZNwEUiEy~E4Y?Ec!p*4ry-!S$OL;wH) literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class b/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class new file mode 100644 index 0000000000000000000000000000000000000000..9b837230c33a15607798b01df4fb8799011c787c GIT binary patch literal 6455 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 aJB2H8m5!I=6?hqCBb>h)U&2c_EqxB?ZW`nO literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/trackerapi/WelcomeApiTest.class b/out/test/classes/test/pivotal/pal/trackerapi/WelcomeApiTest.class new file mode 100644 index 0000000000000000000000000000000000000000..f2402b774f4ccc70b4482b3200fb43b572c7f5f8 GIT binary patch literal 1704 zcmah}ZBraY5Ps%fSU64+4^1Q*f-x$P$oPUW@nX!0q|`b?3a+5ae6Z%00fy}DTxMq> z`B_$3(XvX*&;BUOXZHvkVZD5~>Fb{Er@No-*?<21<1YZqXw^`~`~+%P7{_9O>j7@m z@DY}3kob5UpVaUvJ`1ocPmU+qzwu^qq-!cbw|!L+c*PuC-ozI?6-c zm0@Ib>}7}g`cQCFU}imyz3J&qlbCL#TXAf?^2WxAz^!6rt>Q%PsL)&YOseAm*-E`V zG)`|5cI=LcjlU~Uo?qA$sI1s+mU^yjV*McPb+zj#W)o<%ZK$G6aD{A^Q_EH8RaA_#YrE#pCBzIfJ?=il5prVwaHw!7t z`v`69^;0kNyvuSU9~cn`M1bPJlPSK49)x|v=^nKmgpo=TO}>`e#>xV=Iw75HKP>>3YQ^5HZe z4Os?(&4sfjfh$>E*~&P-FGK6J%xGxkhQYh94Q@MoiVtbEAooJP1ZOe2N%lbf%ARr? z`bnzeP!Di9a9N!8e?tT&OtShUGcS)GMDaNBErRDiLHAyKbtBb!u{E}ZccxKL^(=^WvfDU*AZ&C_epuLm_|AY$v0kez0 zqSPoiD&;>>eU7oeQE6ZQ9YJIKIVQGFP^VC)_eG+x_3_aF literal 0 HcmV?d00001 diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java index ecc98e3af..d8a678051 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java @@ -17,7 +17,7 @@ public TimeEntry(long projectId, long userId, String date, int hours) { this.hours = hours; } - public TimeEntry(long id, int projectId, int userId, String date, int hours) { + public TimeEntry(long id, long projectId, long userId, String date, int hours) { this.id = id; this.projectId = projectId; this.userId = userId; @@ -33,11 +33,11 @@ public void setId(long id) { this.id = id; } - public int getProjectId() { + public long getProjectId() { return projectId; } - public int getUserId() { + public long getUserId() { return userId; } diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java index a6f1100b5..70f82e8ae 100644 --- a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -43,7 +43,7 @@ public void testCreate() throws Exception { @Test public void testRead() throws Exception { - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + TimeEntry expected = new TimeEntry(1000, 123, 456, "today", 8); doReturn(expected) .when(timeEntryRepository) .find(1L); diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java index 36dd6c687..85d22b41d 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -93,10 +93,10 @@ public void testUpdate() throws Exception { DocumentContext updateJson = parse(updateResponse.getBody()); assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); - assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); + assertThat(updateJson.read("$.projectId", int.class)).isEqualTo(2L); + assertThat(updateJson.read("$.userId", int.class)).isEqualTo(3L); assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); - assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); + assertThat(updateJson.read("$.hours", int.class)).isEqualTo(9); } @Test From 6adb1ba93f3a66fef53dca25f75108c72ddb68e6 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 11:45:04 -0600 Subject: [PATCH 15/37] Add tests for JDBC lab --- .../tracker/JdbcTimeEntryRepositoryTest.java | 154 ++++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 12 ++ 2 files changed, 166 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java new file mode 100644 index 000000000..b4aeb0bed --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java @@ -0,0 +1,154 @@ +package test.pivotal.pal.tracker; + + +import com.mysql.cj.jdbc.MysqlDataSource; +import io.pivotal.pal.tracker.JdbcTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; +import io.pivotal.pal.tracker.TimeEntryRepository; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +public class JdbcTimeEntryRepositoryTest { + private TimeEntryRepository subject; + private JdbcTemplate jdbcTemplate; + + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + subject = new JdbcTimeEntryRepository(dataSource); + + jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("DELETE FROM time_entries"); + } + + @Test + public void createInsertsATimeEntryRecord() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(entry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(123L); + assertThat(foundEntry.get("user_id")).isEqualTo(321L); + assertThat(foundEntry.get("date")).isEqualTo("today"); + assertThat(foundEntry.get("hours")).isEqualTo(8); + } + + @Test + public void createReturnsTheCreatedTimeEntry() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + assertThat(entry.getId()).isNotNull(); + assertThat(entry.getProjectId()).isEqualTo(123); + assertThat(entry.getUserId()).isEqualTo(321); + assertThat(entry.getDate()).isEqualTo("today"); + assertThat(entry.getHours()).isEqualTo(8); + } + + @Test + public void findFindsATimeEntry() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void findReturnsNullWhenNotFound() throws Exception { + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry).isNull(); + } + + @Test + public void listFindsAllTimeEntries() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" + ); + + List timeEntries = subject.list(); + assertThat(timeEntries.size()).isEqualTo(2); + + TimeEntry timeEntry = timeEntries.get(0); + assertThat(timeEntry.getId()).isEqualTo(888L); + assertThat(timeEntry.getProjectId()).isEqualTo(456L); + assertThat(timeEntry.getUserId()).isEqualTo(678L); + assertThat(timeEntry.getDate()).isEqualTo("yesterday"); + assertThat(timeEntry.getHours()).isEqualTo(9); + + timeEntry = timeEntries.get(1); + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void updateReturnsTheUpdatedRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry timeEntryUpdates = new TimeEntry(456, 987, "tomorrow", 10); + + TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates); + + assertThat(updatedTimeEntry.getId()).isEqualTo(1000L); + assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L); + assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L); + assertThat(updatedTimeEntry.getDate()).isEqualTo("tomorrow"); + assertThat(updatedTimeEntry.getHours()).isEqualTo(10); + } + + @Test + public void updateUpdatesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry updatedTimeEntry = new TimeEntry(456, 322, "tomorrow", 10); + + TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(456L); + assertThat(foundEntry.get("user_id")).isEqualTo(322L); + assertThat(foundEntry.get("date")).isEqualTo("tomorrow"); + assertThat(foundEntry.get("hours")).isEqualTo(10); + } + + @Test + public void deleteRemovesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + subject.delete(999L); + + Map foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999); + assertThat(foundEntry.get("count")).isEqualTo(0L); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java index 85d22b41d..d40c8a143 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -1,8 +1,10 @@ package test.pivotal.pal.trackerapi; import com.jayway.jsonpath.DocumentContext; +import com.mysql.cj.jdbc.MysqlDataSource; import io.pivotal.pal.tracker.PalTrackerApplication; import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +14,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.junit4.SpringRunner; import java.util.Collection; @@ -29,6 +32,15 @@ public class TimeEntryApiTest { private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("TRUNCATE time_entries"); + } + @Test public void testCreate() throws Exception { ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); From f2dca421f66466db6e9f2bbd3612ed6c1ac4946a Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 19:44:25 +0530 Subject: [PATCH 16/37] Spring MVC --- .../java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java diff --git a/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java new file mode 100644 index 000000000..82d68d682 --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class JdbcTimeEntryRepository { +} From 15c2c9bc62c457631129ac931da62b82ec5da7af Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 19:59:43 +0530 Subject: [PATCH 17/37] reverting some labs --- .../tracker/InMemoryTimeEntryRepository.java | 38 ----- .../pal/tracker/JdbcTimeEntryRepository.java | 4 - .../io/pivotal/pal/tracker/TimeEntry.java | 86 ---------- .../pal/tracker/TimeEntryController.java | 57 ------- .../pal/tracker/TimeEntryRepository.java | 11 -- .../InMemoryTimeEntryRepositoryTest.java | 71 -------- .../tracker/JdbcTimeEntryRepositoryTest.java | 154 ------------------ .../pal/tracker/TimeEntryControllerTest.java | 107 ------------ .../pal/trackerapi/TimeEntryApiTest.java | 131 --------------- 9 files changed, 659 deletions(-) delete mode 100644 src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java delete mode 100644 src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java delete mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntry.java delete mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryController.java delete mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java delete mode 100644 src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java delete mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java delete mode 100644 src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java delete mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java deleted file mode 100644 index 07785c3e0..000000000 --- a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.pivotal.pal.tracker; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class InMemoryTimeEntryRepository implements TimeEntryRepository { - private HashMap timeEntries = new HashMap<>(); - - @Override - public TimeEntry create(TimeEntry timeEntry) { - timeEntry.setId(timeEntries.size() + 1); - timeEntries.put(timeEntry.getId(), timeEntry); - return timeEntry; - } - - @Override - public TimeEntry find(Long id) { - return timeEntries.get(id); - } - - @Override - public List list() { - return new ArrayList<>(timeEntries.values()); - } - - @Override - public TimeEntry update(Long id, TimeEntry timeEntry) { - timeEntries.replace(id, timeEntry); - timeEntry.setId(id); - return timeEntry; - } - - @Override - public void delete(Long id) { - timeEntries.remove(id); - } -} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java deleted file mode 100644 index 82d68d682..000000000 --- a/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.pivotal.pal.tracker; - -public class JdbcTimeEntryRepository { -} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java deleted file mode 100644 index d8a678051..000000000 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java +++ /dev/null @@ -1,86 +0,0 @@ -package io.pivotal.pal.tracker; - -public class TimeEntry { - private long id; - private long projectId; - private long userId; - private String date; - private int hours; - - public TimeEntry() { - } - - public TimeEntry(long projectId, long userId, String date, int hours) { - this.projectId = projectId; - this.userId = userId; - this.date = date; - this.hours = hours; - } - - public TimeEntry(long id, long projectId, long userId, String date, int hours) { - this.id = id; - this.projectId = projectId; - this.userId = userId; - this.date = date; - this.hours = hours; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public long getProjectId() { - return projectId; - } - - public long getUserId() { - return userId; - } - - public String getDate() { - return date; - } - - public int getHours() { - return hours; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - TimeEntry timeEntry = (TimeEntry) o; - - if (id != timeEntry.id) return false; - if (projectId != timeEntry.projectId) return false; - if (userId != timeEntry.userId) return false; - if (hours != timeEntry.hours) return false; - return date != null ? date.equals(timeEntry.date) : timeEntry.date == null; - } - - @Override - public int hashCode() { - int result = (int) (id ^ (id >>> 32)); - result = 31 * result + (int) (projectId ^ (projectId >>> 32)); - result = 31 * result + (int) (userId ^ (userId >>> 32)); - result = 31 * result + (date != null ? date.hashCode() : 0); - result = 31 * result + hours; - return result; - } - - @Override - public String toString() { - return "TimeEntry{" + - "id=" + id + - ", projectId=" + projectId + - ", userId=" + userId + - ", date='" + date + '\'' + - ", hours=" + hours + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java deleted file mode 100644 index 1f460951a..000000000 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.pivotal.pal.tracker; - -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/time-entries") -public class TimeEntryController { - - private TimeEntryRepository timeEntriesRepo; - - public TimeEntryController(TimeEntryRepository timeEntriesRepo) { - this.timeEntriesRepo = timeEntriesRepo; - } - - @PostMapping - public ResponseEntity create(@RequestBody TimeEntry timeEntry) { - TimeEntry createdTimeEntry = timeEntriesRepo.create(timeEntry); - - return new ResponseEntity<>(createdTimeEntry, HttpStatus.CREATED); - } - - @GetMapping("{id}") - public ResponseEntity read(@PathVariable Long id) { - TimeEntry timeEntry = timeEntriesRepo.find(id); - if (timeEntry != null) { - return new ResponseEntity<>(timeEntry, HttpStatus.OK); - } else { - return new ResponseEntity<>(HttpStatus.NOT_FOUND); - } - } - - @GetMapping - public ResponseEntity> list() { - return new ResponseEntity<>(timeEntriesRepo.list(), HttpStatus.OK); - } - - @PutMapping("{id}") - public ResponseEntity update(@PathVariable Long id, @RequestBody TimeEntry timeEntry) { - TimeEntry updatedTimeEntry = timeEntriesRepo.update(id, timeEntry); - if (updatedTimeEntry != null) { - return new ResponseEntity<>(updatedTimeEntry, HttpStatus.OK); - } else { - return new ResponseEntity<>(HttpStatus.NOT_FOUND); - } - } - - @DeleteMapping("{id}") - public ResponseEntity delete(@PathVariable Long id) { - timeEntriesRepo.delete(id); - - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java deleted file mode 100644 index 866097db4..000000000 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.pivotal.pal.tracker; - -import java.util.List; - -public interface TimeEntryRepository { - TimeEntry create(TimeEntry timeEntry); - TimeEntry find(Long id); - List list(); - TimeEntry update(Long id, TimeEntry timeEntry); - void delete(Long id); -} \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java deleted file mode 100644 index 95e810cad..000000000 --- a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package test.pivotal.pal.tracker; - -import io.pivotal.pal.tracker.InMemoryTimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntry; - -import org.junit.Test; - -import java.util.List; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; - -public class InMemoryTimeEntryRepositoryTest { - @Test - public void create() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - assertThat(createdTimeEntry).isEqualTo(expected); - - TimeEntry readEntry = repo.find(createdTimeEntry.getId()); - assertThat(readEntry).isEqualTo(expected); - } - - @Test - public void find() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - TimeEntry readEntry = repo.find(1L); - assertThat(readEntry).isEqualTo(expected); - } - - @Test - public void list() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - repo.create(new TimeEntry(123, 456, "today", 8)); - repo.create(new TimeEntry(789, 654, "yesterday", 4)); - - List expected = asList( - new TimeEntry(1L, 123, 456, "today", 8), - new TimeEntry(2L, 789, 654, "yesterday", 4) - ); - assertThat(repo.list()).isEqualTo(expected); - } - - @Test - public void update() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry updatedEntry = repo.update( - created.getId(), - new TimeEntry(321, 654, "tomorrow", 5)); - - TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 5); - assertThat(updatedEntry).isEqualTo(expected); - assertThat(repo.find(created.getId())).isEqualTo(expected); - } - - @Test - public void delete() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); - - repo.delete(created.getId()); - assertThat(repo.list()).isEmpty(); - } -} diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java deleted file mode 100644 index b4aeb0bed..000000000 --- a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java +++ /dev/null @@ -1,154 +0,0 @@ -package test.pivotal.pal.tracker; - - -import com.mysql.cj.jdbc.MysqlDataSource; -import io.pivotal.pal.tracker.JdbcTimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntry; -import io.pivotal.pal.tracker.TimeEntryRepository; -import org.junit.Before; -import org.junit.Test; -import org.springframework.jdbc.core.JdbcTemplate; - -import java.util.List; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; - -public class JdbcTimeEntryRepositoryTest { - private TimeEntryRepository subject; - private JdbcTemplate jdbcTemplate; - - @Before - public void setUp() throws Exception { - MysqlDataSource dataSource = new MysqlDataSource(); - dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); - - subject = new JdbcTimeEntryRepository(dataSource); - - jdbcTemplate = new JdbcTemplate(dataSource); - jdbcTemplate.execute("DELETE FROM time_entries"); - } - - @Test - public void createInsertsATimeEntryRecord() throws Exception { - TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); - TimeEntry entry = subject.create(newTimeEntry); - - Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId()); - - assertThat(foundEntry.get("id")).isEqualTo(entry.getId()); - assertThat(foundEntry.get("project_id")).isEqualTo(123L); - assertThat(foundEntry.get("user_id")).isEqualTo(321L); - assertThat(foundEntry.get("date")).isEqualTo("today"); - assertThat(foundEntry.get("hours")).isEqualTo(8); - } - - @Test - public void createReturnsTheCreatedTimeEntry() throws Exception { - TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); - TimeEntry entry = subject.create(newTimeEntry); - - assertThat(entry.getId()).isNotNull(); - assertThat(entry.getProjectId()).isEqualTo(123); - assertThat(entry.getUserId()).isEqualTo(321); - assertThat(entry.getDate()).isEqualTo("today"); - assertThat(entry.getHours()).isEqualTo(8); - } - - @Test - public void findFindsATimeEntry() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8)" - ); - - TimeEntry timeEntry = subject.find(999L); - - assertThat(timeEntry.getId()).isEqualTo(999L); - assertThat(timeEntry.getProjectId()).isEqualTo(123L); - assertThat(timeEntry.getUserId()).isEqualTo(321L); - assertThat(timeEntry.getDate()).isEqualTo("today"); - assertThat(timeEntry.getHours()).isEqualTo(8); - } - - @Test - public void findReturnsNullWhenNotFound() throws Exception { - TimeEntry timeEntry = subject.find(999L); - - assertThat(timeEntry).isNull(); - } - - @Test - public void listFindsAllTimeEntries() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" - ); - - List timeEntries = subject.list(); - assertThat(timeEntries.size()).isEqualTo(2); - - TimeEntry timeEntry = timeEntries.get(0); - assertThat(timeEntry.getId()).isEqualTo(888L); - assertThat(timeEntry.getProjectId()).isEqualTo(456L); - assertThat(timeEntry.getUserId()).isEqualTo(678L); - assertThat(timeEntry.getDate()).isEqualTo("yesterday"); - assertThat(timeEntry.getHours()).isEqualTo(9); - - timeEntry = timeEntries.get(1); - assertThat(timeEntry.getId()).isEqualTo(999L); - assertThat(timeEntry.getProjectId()).isEqualTo(123L); - assertThat(timeEntry.getUserId()).isEqualTo(321L); - assertThat(timeEntry.getDate()).isEqualTo("today"); - assertThat(timeEntry.getHours()).isEqualTo(8); - } - - @Test - public void updateReturnsTheUpdatedRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (1000, 123, 321, 'today', 8)"); - - TimeEntry timeEntryUpdates = new TimeEntry(456, 987, "tomorrow", 10); - - TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates); - - assertThat(updatedTimeEntry.getId()).isEqualTo(1000L); - assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L); - assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L); - assertThat(updatedTimeEntry.getDate()).isEqualTo("tomorrow"); - assertThat(updatedTimeEntry.getHours()).isEqualTo(10); - } - - @Test - public void updateUpdatesTheRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (1000, 123, 321, 'today', 8)"); - - TimeEntry updatedTimeEntry = new TimeEntry(456, 322, "tomorrow", 10); - - TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry); - - Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId()); - - assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId()); - assertThat(foundEntry.get("project_id")).isEqualTo(456L); - assertThat(foundEntry.get("user_id")).isEqualTo(322L); - assertThat(foundEntry.get("date")).isEqualTo("tomorrow"); - assertThat(foundEntry.get("hours")).isEqualTo(10); - } - - @Test - public void deleteRemovesTheRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8)" - ); - - subject.delete(999L); - - Map foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999); - assertThat(foundEntry.get("count")).isEqualTo(0L); - } -} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java deleted file mode 100644 index 70f82e8ae..000000000 --- a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package test.pivotal.pal.tracker; - -import io.pivotal.pal.tracker.TimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntryController; -import io.pivotal.pal.tracker.TimeEntry; -import org.junit.Before; -import org.junit.Test; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -import java.util.List; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - -public class TimeEntryControllerTest { - private TimeEntryRepository timeEntryRepository; - private TimeEntryController controller; - - @Before - public void setUp() throws Exception { - timeEntryRepository = mock(TimeEntryRepository.class); - controller = new TimeEntryController(timeEntryRepository); - } - - @Test - public void testCreate() throws Exception { - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - doReturn(expected) - .when(timeEntryRepository) - .create(any(TimeEntry.class)); - - ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testRead() throws Exception { - TimeEntry expected = new TimeEntry(1000, 123, 456, "today", 8); - doReturn(expected) - .when(timeEntryRepository) - .find(1L); - - ResponseEntity response = controller.read(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testRead_NotFound() throws Exception { - doReturn(null) - .when(timeEntryRepository) - .find(1L); - - ResponseEntity response = controller.read(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - @Test - public void testList() throws Exception { - List expected = asList( - new TimeEntry(1, 123, 456, "today", 8), - new TimeEntry(2, 789, 321, "yesterday", 4) - ); - doReturn(expected).when(timeEntryRepository).list(); - - ResponseEntity> response = controller.list(); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testUpdate() throws Exception { - TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); - doReturn(expected) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); - - ResponseEntity response = controller.update(1L, expected); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testUpdate_NotFound() throws Exception { - doReturn(null) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); - - ResponseEntity response = controller.update(1L, new TimeEntry()); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - @Test - public void testDelete() throws Exception { - ResponseEntity response = controller.delete(1L); - verify(timeEntryRepository).delete(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - } -} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java deleted file mode 100644 index d40c8a143..000000000 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ /dev/null @@ -1,131 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import com.jayway.jsonpath.DocumentContext; -import com.mysql.cj.jdbc.MysqlDataSource; -import io.pivotal.pal.tracker.PalTrackerApplication; -import io.pivotal.pal.tracker.TimeEntry; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.Collection; - -import static com.jayway.jsonpath.JsonPath.parse; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class TimeEntryApiTest { - - @Autowired - private TestRestTemplate restTemplate; - - private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); - - @Before - public void setUp() throws Exception { - MysqlDataSource dataSource = new MysqlDataSource(); - dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); - - JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); - jdbcTemplate.execute("TRUNCATE time_entries"); - } - - @Test - public void testCreate() throws Exception { - ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); - - - assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); - - DocumentContext createJson = parse(createResponse.getBody()); - assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); - assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testList() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); - - - assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext listJson = parse(listResponse.getBody()); - - Collection timeEntries = listJson.read("$[*]", Collection.class); - assertThat(timeEntries.size()).isEqualTo(1); - - Long readId = listJson.read("$[0].id", Long.class); - assertThat(readId).isEqualTo(id); - } - - @Test - public void testRead() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - - - assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - DocumentContext readJson = parse(readResponse.getBody()); - assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testUpdate() throws Exception { - Long id = createTimeEntry(); - TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); - - - ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); - - - assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext updateJson = parse(updateResponse.getBody()); - assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(updateJson.read("$.projectId", int.class)).isEqualTo(2L); - assertThat(updateJson.read("$.userId", int.class)).isEqualTo(3L); - assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); - assertThat(updateJson.read("$.hours", int.class)).isEqualTo(9); - } - - @Test - public void testDelete() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); - - - assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - - ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - private Long createTimeEntry() { - return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); - } -} From 60fb3521ed9f82aa5d1fed09ac74905962b9bcbd Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 15:04:20 -0600 Subject: [PATCH 18/37] Add tests for MVC lab --- .../InMemoryTimeEntryRepositoryTest.java | 71 +++++++++++ .../pal/tracker/TimeEntryControllerTest.java | 107 ++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 119 ++++++++++++++++++ 3 files changed, 297 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java new file mode 100644 index 000000000..95e810cad --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java @@ -0,0 +1,71 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.InMemoryTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; + +import org.junit.Test; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; + +public class InMemoryTimeEntryRepositoryTest { + @Test + public void create() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + assertThat(createdTimeEntry).isEqualTo(expected); + + TimeEntry readEntry = repo.find(createdTimeEntry.getId()); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void find() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + TimeEntry readEntry = repo.find(1L); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void list() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + repo.create(new TimeEntry(789, 654, "yesterday", 4)); + + List expected = asList( + new TimeEntry(1L, 123, 456, "today", 8), + new TimeEntry(2L, 789, 654, "yesterday", 4) + ); + assertThat(repo.list()).isEqualTo(expected); + } + + @Test + public void update() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry updatedEntry = repo.update( + created.getId(), + new TimeEntry(321, 654, "tomorrow", 5)); + + TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 5); + assertThat(updatedEntry).isEqualTo(expected); + assertThat(repo.find(created.getId())).isEqualTo(expected); + } + + @Test + public void delete() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + repo.delete(created.getId()); + assertThat(repo.list()).isEmpty(); + } +} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java new file mode 100644 index 000000000..a6f1100b5 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -0,0 +1,107 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.TimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntryController; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; +import org.junit.Test; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class TimeEntryControllerTest { + private TimeEntryRepository timeEntryRepository; + private TimeEntryController controller; + + @Before + public void setUp() throws Exception { + timeEntryRepository = mock(TimeEntryRepository.class); + controller = new TimeEntryController(timeEntryRepository); + } + + @Test + public void testCreate() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .create(any(TimeEntry.class)); + + ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testList() throws Exception { + List expected = asList( + new TimeEntry(1, 123, 456, "today", 8), + new TimeEntry(2, 789, 321, "yesterday", 4) + ); + doReturn(expected).when(timeEntryRepository).list(); + + ResponseEntity> response = controller.list(); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate() throws Exception { + TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); + doReturn(expected) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, expected); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, new TimeEntry()); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testDelete() throws Exception { + ResponseEntity response = controller.delete(1L); + verify(timeEntryRepository).delete(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java new file mode 100644 index 000000000..36dd6c687 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -0,0 +1,119 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import io.pivotal.pal.tracker.PalTrackerApplication; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collection; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class TimeEntryApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + + @Test + public void testCreate() throws Exception { + ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); + + + assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); + + DocumentContext createJson = parse(createResponse.getBody()); + assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); + assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testList() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); + + + assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext listJson = parse(listResponse.getBody()); + + Collection timeEntries = listJson.read("$[*]", Collection.class); + assertThat(timeEntries.size()).isEqualTo(1); + + Long readId = listJson.read("$[0].id", Long.class); + assertThat(readId).isEqualTo(id); + } + + @Test + public void testRead() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + + + assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + DocumentContext readJson = parse(readResponse.getBody()); + assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testUpdate() throws Exception { + Long id = createTimeEntry(); + TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); + + + ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); + + + assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext updateJson = parse(updateResponse.getBody()); + assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); + assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); + assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); + assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); + } + + @Test + public void testDelete() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); + + + assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + private Long createTimeEntry() { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); + } +} From 57fda8ec66497671142a0c7af66c5ddd1d28c384 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 20:11:15 +0530 Subject: [PATCH 19/37] Time Tracking App --- .../io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntry.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntryController.java | 4 ++++ src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntry.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryController.java create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java new file mode 100644 index 000000000..2f5a9f68a --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class InMemoryTimeEntryRepository { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java new file mode 100644 index 000000000..3f945596c --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class TimeEntry { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java new file mode 100644 index 000000000..35193a07d --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public class TimeEntryController { +} diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java new file mode 100644 index 000000000..0316a3fbd --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java @@ -0,0 +1,4 @@ +package io.pivotal.pal.tracker; + +public interface TimeEntryRepository { +} From 36e26e35573de3e06a5af1856d85bd604055538e Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 20:12:52 +0530 Subject: [PATCH 20/37] adding all files --- .../tracker/InMemoryTimeEntryRepository.java | 38 ++++++++- .../io/pivotal/pal/tracker/TimeEntry.java | 84 ++++++++++++++++++- .../pal/tracker/TimeEntryController.java | 55 +++++++++++- .../pal/tracker/TimeEntryRepository.java | 9 +- .../pal/trackerapi/WelcomeApiTest.java | 2 +- 5 files changed, 182 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java index 2f5a9f68a..07785c3e0 100644 --- a/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java +++ b/src/main/java/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.java @@ -1,4 +1,38 @@ package io.pivotal.pal.tracker; -public class InMemoryTimeEntryRepository { -} +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class InMemoryTimeEntryRepository implements TimeEntryRepository { + private HashMap timeEntries = new HashMap<>(); + + @Override + public TimeEntry create(TimeEntry timeEntry) { + timeEntry.setId(timeEntries.size() + 1); + timeEntries.put(timeEntry.getId(), timeEntry); + return timeEntry; + } + + @Override + public TimeEntry find(Long id) { + return timeEntries.get(id); + } + + @Override + public List list() { + return new ArrayList<>(timeEntries.values()); + } + + @Override + public TimeEntry update(Long id, TimeEntry timeEntry) { + timeEntries.replace(id, timeEntry); + timeEntry.setId(id); + return timeEntry; + } + + @Override + public void delete(Long id) { + timeEntries.remove(id); + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java index 3f945596c..d8a678051 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntry.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntry.java @@ -1,4 +1,86 @@ package io.pivotal.pal.tracker; public class TimeEntry { -} + private long id; + private long projectId; + private long userId; + private String date; + private int hours; + + public TimeEntry() { + } + + public TimeEntry(long projectId, long userId, String date, int hours) { + this.projectId = projectId; + this.userId = userId; + this.date = date; + this.hours = hours; + } + + public TimeEntry(long id, long projectId, long userId, String date, int hours) { + this.id = id; + this.projectId = projectId; + this.userId = userId; + this.date = date; + this.hours = hours; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public long getProjectId() { + return projectId; + } + + public long getUserId() { + return userId; + } + + public String getDate() { + return date; + } + + public int getHours() { + return hours; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + TimeEntry timeEntry = (TimeEntry) o; + + if (id != timeEntry.id) return false; + if (projectId != timeEntry.projectId) return false; + if (userId != timeEntry.userId) return false; + if (hours != timeEntry.hours) return false; + return date != null ? date.equals(timeEntry.date) : timeEntry.date == null; + } + + @Override + public int hashCode() { + int result = (int) (id ^ (id >>> 32)); + result = 31 * result + (int) (projectId ^ (projectId >>> 32)); + result = 31 * result + (int) (userId ^ (userId >>> 32)); + result = 31 * result + (date != null ? date.hashCode() : 0); + result = 31 * result + hours; + return result; + } + + @Override + public String toString() { + return "TimeEntry{" + + "id=" + id + + ", projectId=" + projectId + + ", userId=" + userId + + ", date='" + date + '\'' + + ", hours=" + hours + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java index 35193a07d..1f460951a 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java @@ -1,4 +1,57 @@ package io.pivotal.pal.tracker; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/time-entries") public class TimeEntryController { -} + + private TimeEntryRepository timeEntriesRepo; + + public TimeEntryController(TimeEntryRepository timeEntriesRepo) { + this.timeEntriesRepo = timeEntriesRepo; + } + + @PostMapping + public ResponseEntity create(@RequestBody TimeEntry timeEntry) { + TimeEntry createdTimeEntry = timeEntriesRepo.create(timeEntry); + + return new ResponseEntity<>(createdTimeEntry, HttpStatus.CREATED); + } + + @GetMapping("{id}") + public ResponseEntity read(@PathVariable Long id) { + TimeEntry timeEntry = timeEntriesRepo.find(id); + if (timeEntry != null) { + return new ResponseEntity<>(timeEntry, HttpStatus.OK); + } else { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + } + + @GetMapping + public ResponseEntity> list() { + return new ResponseEntity<>(timeEntriesRepo.list(), HttpStatus.OK); + } + + @PutMapping("{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody TimeEntry timeEntry) { + TimeEntry updatedTimeEntry = timeEntriesRepo.update(id, timeEntry); + if (updatedTimeEntry != null) { + return new ResponseEntity<>(updatedTimeEntry, HttpStatus.OK); + } else { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + } + + @DeleteMapping("{id}") + public ResponseEntity delete(@PathVariable Long id) { + timeEntriesRepo.delete(id); + + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java index 0316a3fbd..866097db4 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryRepository.java @@ -1,4 +1,11 @@ package io.pivotal.pal.tracker; +import java.util.List; + public interface TimeEntryRepository { -} + TimeEntry create(TimeEntry timeEntry); + TimeEntry find(Long id); + List list(); + TimeEntry update(Long id, TimeEntry timeEntry); + void delete(Long id); +} \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java index cc7091ed4..932bdc042 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java @@ -1,4 +1,4 @@ -package test.pivotal.pal.trackerapi; + package test.pivotal.pal.trackerapi; import io.pivotal.pal.tracker.PalTrackerApplication; import org.junit.Test; From 6531da6fe3639d0f569876a417db19133fab55d3 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Mon, 11 Sep 2017 20:24:26 +0530 Subject: [PATCH 21/37] Updated TimeEntryTest --- .../pal/trackerapi/TimeEntryApiTest.class | Bin 6455 -> 6313 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class b/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class index 9b837230c33a15607798b01df4fb8799011c787c..c7489a483a104045093ef2829000af998d931b09 100644 GIT binary patch delta 1618 zcmaKrc~Dhl7{-6+-V5h&_#E+q7jcqdM#gaTg_>tN9kh57rKcg)SbhO=AL!%(B>FiOqF3*Sp-njV?>M$>nBlN#j;- zbGe;m#&(B`X1T+iHh06su{p`^Vc3#Hkd|`kGYz~@82Xu=)a&RwSDtbAj z_=>M3cDQj?V<^-($L1Tww;Z+@tfyO9I?qiDPG|_v2+vcL@txv(eo*|#VZ~4EQT%L{ zU-(t=8^0_5;7?uUOibY~i*XVlSFh?9Xzy_r*?M2bO1(8BPcQ6OJbZ!-AyR0MDIOM+ zYysi!%i86?}<*n>9^) zG7HNMDoZR7YUa~#% z8{-!#Vr10b5?RN5|HoRFWDVnp zUg#}YPkz}(JQZ0KWpRSPI71H&)NAd}%q!~PnDQK-e~>@m-9&a51AKH7=p;vg;?uhW zd3wJ;Q=Mdh>m-_&XeR#Pvz zdBwAonUb3?S<#rULVQQ7=w*rA=+Uj&Ljt2MzY^JfIyiC4u^sg7B%_T|eJDE^8PkD3 zp;wd*jCQ?F^v$F|x?fC_^!swDZYZie){DBN^6I$q0-2Xt(Oy*0SN=1~O)mnHOU!3_ z5%V3XJo~@H=rM0yhHR>C9gsV7Y&V_`#&t4&t%UMmo{M=>F#Cw7GAJ&_D>4l#6dmte kIW-G5TrJ=$ZZt=L4+ftdw z?H=>d#&(Ct0v5X5>9EM*t~BoE9s|4AV=+rymU`4L=02BYF83S910D~eT^?%D;CjOL zupxQGgnrazxx-^=x)ji*{&Z0p6wO5Z@+ zdReawOiwA{9E*^S1hVJbsk$V^YgNJ)#bAag1~N#8Q_eW$6~$JzIlQWPjn^ICP&D(V z!&{2&>~MHn@ec1Q-eaf3`-)wBpqo>=cKT595g!}yZii14pR&gytz*ID>d5$TMeU$5 z=6`$iNlsRWWz0_XJH zeSD|b$9}~DzPE5|BaUO-(n8UU^3t6HI!j7t+Tc6V$tcA>BQ=)GCUF3#R854v^7C z8fKgNV{w+;Qe;0nW|hXs?#Nv_Cu^x5ot~dRRBWcnkb|H0oGT|KUO0~P7$&>L`GWTe zzA1f^HB{GSV;wEvHA6ep@*o4ssuxTaa>Bdpxa3F(ZXfR&=*r7Hy^!(cMM^PUO^g{2`-T2 zkK;!O{%HJ_aek4~TO#;D=VfjaB?mJLCmAK3jg8GoB^we-I!V@JV@i5T*5hJITC$G& z{*QHhlC=(3^uhr>uT5RI2F~=YBYO>P{cNO16FoC2YN9wwud*C}M!Wy=pBDG)o>`#| z|Mmw{qvV&Z5(Xbq->lsFMN*+Asp592*M6y-$+9S}A(`dgM3&j?WP(hOO?r-Esw*Xujd>^LEy0u{-blNI79TY+RBddo+Y5e*V5e3vjp=f^LT0~$E140do~xND OSWo From ada140363598122048d991c18b1ce211c4e3636a Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 11:45:04 -0600 Subject: [PATCH 22/37] Add tests for JDBC lab --- .../tracker/JdbcTimeEntryRepositoryTest.java | 154 ++++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 12 ++ 2 files changed, 166 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java new file mode 100644 index 000000000..b4aeb0bed --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java @@ -0,0 +1,154 @@ +package test.pivotal.pal.tracker; + + +import com.mysql.cj.jdbc.MysqlDataSource; +import io.pivotal.pal.tracker.JdbcTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; +import io.pivotal.pal.tracker.TimeEntryRepository; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +public class JdbcTimeEntryRepositoryTest { + private TimeEntryRepository subject; + private JdbcTemplate jdbcTemplate; + + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + subject = new JdbcTimeEntryRepository(dataSource); + + jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("DELETE FROM time_entries"); + } + + @Test + public void createInsertsATimeEntryRecord() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(entry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(123L); + assertThat(foundEntry.get("user_id")).isEqualTo(321L); + assertThat(foundEntry.get("date")).isEqualTo("today"); + assertThat(foundEntry.get("hours")).isEqualTo(8); + } + + @Test + public void createReturnsTheCreatedTimeEntry() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + assertThat(entry.getId()).isNotNull(); + assertThat(entry.getProjectId()).isEqualTo(123); + assertThat(entry.getUserId()).isEqualTo(321); + assertThat(entry.getDate()).isEqualTo("today"); + assertThat(entry.getHours()).isEqualTo(8); + } + + @Test + public void findFindsATimeEntry() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void findReturnsNullWhenNotFound() throws Exception { + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry).isNull(); + } + + @Test + public void listFindsAllTimeEntries() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" + ); + + List timeEntries = subject.list(); + assertThat(timeEntries.size()).isEqualTo(2); + + TimeEntry timeEntry = timeEntries.get(0); + assertThat(timeEntry.getId()).isEqualTo(888L); + assertThat(timeEntry.getProjectId()).isEqualTo(456L); + assertThat(timeEntry.getUserId()).isEqualTo(678L); + assertThat(timeEntry.getDate()).isEqualTo("yesterday"); + assertThat(timeEntry.getHours()).isEqualTo(9); + + timeEntry = timeEntries.get(1); + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void updateReturnsTheUpdatedRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry timeEntryUpdates = new TimeEntry(456, 987, "tomorrow", 10); + + TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates); + + assertThat(updatedTimeEntry.getId()).isEqualTo(1000L); + assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L); + assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L); + assertThat(updatedTimeEntry.getDate()).isEqualTo("tomorrow"); + assertThat(updatedTimeEntry.getHours()).isEqualTo(10); + } + + @Test + public void updateUpdatesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry updatedTimeEntry = new TimeEntry(456, 322, "tomorrow", 10); + + TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(456L); + assertThat(foundEntry.get("user_id")).isEqualTo(322L); + assertThat(foundEntry.get("date")).isEqualTo("tomorrow"); + assertThat(foundEntry.get("hours")).isEqualTo(10); + } + + @Test + public void deleteRemovesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + subject.delete(999L); + + Map foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999); + assertThat(foundEntry.get("count")).isEqualTo(0L); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java index 36dd6c687..a07c3fad8 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -1,8 +1,10 @@ package test.pivotal.pal.trackerapi; import com.jayway.jsonpath.DocumentContext; +import com.mysql.cj.jdbc.MysqlDataSource; import io.pivotal.pal.tracker.PalTrackerApplication; import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +14,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.junit4.SpringRunner; import java.util.Collection; @@ -29,6 +32,15 @@ public class TimeEntryApiTest { private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("TRUNCATE time_entries"); + } + @Test public void testCreate() throws Exception { ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); From 6fd7d2549a4db64471ede0ecb191d5c135ec37ba Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 17:33:07 +0530 Subject: [PATCH 23/37] Spring JdbcTemplate Assignment --- build.gradle | 27 +++++- ci/build.yml | 66 +++++++++----- manifest-review.yml | 2 + .../pal/tracker/JdbcTimeEntryRepository.java | 87 +++++++++++++++++++ .../pal/tracker/PalTrackerApplication.java | 6 +- .../pal/trackerapi/TimeEntryApiTest.java | 2 +- 6 files changed, 160 insertions(+), 30 deletions(-) create mode 100644 src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java diff --git a/build.gradle b/build.gradle index 7e6146548..5d3e3ed57 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,9 @@ +import org.flywaydb.gradle.task.FlywayMigrateTask + plugins { id "java" id "org.springframework.boot" version "1.5.4.RELEASE" + id "org.flywaydb.flyway" version "4.2.0" } repositories { @@ -9,14 +12,32 @@ repositories { dependencies { compile("org.springframework.boot:spring-boot-starter-web") - testCompile("org.springframework.boot:spring-boot-starter-test") + compile("org.springframework.boot:spring-boot-starter-jdbc") + + compile("mysql:mysql-connector-java:6.0.6") + + testCompile("org.springframework.boot:spring-boot-starter-test") } +def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" bootRun.environment([ - "WELCOME_MESSAGE": "hello from Confing", + "WELCOME_MESSAGE": "hello", + "SPRING_DATASOURCE_URL": developmentDbUrl, ]) +def testDbUrl = "jdbc:mysql://localhost:3306/tracker_test?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" test.environment([ - "WELCOME_MESSAGE": "Hello from test", + "WELCOME_MESSAGE": "Hello from test", + "SPRING_DATASOURCE_URL": testDbUrl, ]) +flyway { + url = developmentDbUrl + user = "tracker" + password = "" + locations = ["filesystem:databases/tracker/migrations"] +} + +task testMigrate(type: FlywayMigrateTask) { + url = testDbUrl +} \ No newline at end of file diff --git a/ci/build.yml b/ci/build.yml index 94e2e7170..3ce8db9b7 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -1,24 +1,42 @@ - platform: linux - - image_resource: - type: docker-image - source: - repository: openjdk - tag: '8-jdk' - - inputs: - - name: pal-tracker - - name: version - - outputs: - - name: build-output - - run: - path: bash - args: - - -exc - - | - cd pal-tracker - chmod +x ./gradlew - ./gradlew -P version=$(cat ../version/number) build - cp build/libs/pal-tracker-*.jar ../build-output/ \ No newline at end of file +platform: linux + + image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' + + inputs: + - name: pal-tracker + - name: version + + outputs: + - name: build-output + + run: + path: bash + args: + - -exc + - | + + function stop_mysql { + service mysql stop + } + trap stop_mysql EXIT + + export DEBIAN_FRONTEND="noninteractive" + + apt-get update + apt-get install -y software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' + + apt-get -y install mariadb-server + service mysql start + + cd pal-tracker + chmod +x ./gradlew + mysql -uroot < databases/tracker/create_databases.sql + ./gradlew -P version=$(cat ../version/number) testMigrate build + cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/manifest-review.yml b/manifest-review.yml index a7dfb3153..81ea3a215 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -3,3 +3,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar host: ps-pal-tracker-review-samrat + services: + - tracker-database diff --git a/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java b/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java new file mode 100644 index 000000000..9f8a2a4e3 --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/JdbcTimeEntryRepository.java @@ -0,0 +1,87 @@ +package io.pivotal.pal.tracker; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.ResultSetExtractor; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.jdbc.support.GeneratedKeyHolder; +import org.springframework.jdbc.support.KeyHolder; + +import javax.sql.DataSource; +import java.sql.PreparedStatement; +import java.util.List; + +import static java.sql.Statement.RETURN_GENERATED_KEYS; + +public class JdbcTimeEntryRepository implements TimeEntryRepository { + + private final JdbcTemplate jdbcTemplate; + + public JdbcTimeEntryRepository(DataSource dataSource) { + this.jdbcTemplate = new JdbcTemplate(dataSource); + } + + @Override + public TimeEntry create(TimeEntry timeEntry) { + KeyHolder generatedKeyHolder = new GeneratedKeyHolder(); + + jdbcTemplate.update(connection -> { + PreparedStatement statement = connection.prepareStatement( + "INSERT INTO time_entries (project_id, user_id, date, hours) " + + "VALUES (?, ?, ?, ?)", + RETURN_GENERATED_KEYS + ); + + statement.setLong(1, timeEntry.getProjectId()); + statement.setLong(2, timeEntry.getUserId()); + statement.setString(3, timeEntry.getDate()); + statement.setInt(4, timeEntry.getHours()); + + return statement; + }, generatedKeyHolder); + + return find(generatedKeyHolder.getKey().longValue()); + } + + @Override + public TimeEntry find(Long id) { + return jdbcTemplate.query( + "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", + new Object[]{id}, + extractor); + } + + @Override + public List list() { + return jdbcTemplate.query("SELECT id, project_id, user_id, date, hours FROM time_entries", mapper); + } + + @Override + public TimeEntry update(Long id, TimeEntry timeEntry) { + jdbcTemplate.update("UPDATE time_entries " + + "SET project_id = ?, user_id = ?, date = ?, hours = ? " + + "WHERE id = ?", + timeEntry.getProjectId(), + timeEntry.getUserId(), + timeEntry.getDate(), + timeEntry.getHours(), + id); + + return find(id); + } + + @Override + public void delete(Long id) { + jdbcTemplate.update("DELETE FROM time_entries WHERE id = ?", id); + } + + private final RowMapper mapper = (rs, rowNum) -> new TimeEntry( + rs.getLong("id"), + rs.getLong("project_id"), + rs.getLong("user_id"), + rs.getString("date"), + rs.getInt("hours") + ); + + private final ResultSetExtractor extractor = + (rs) -> rs.next() ? mapper.mapRow(rs, 1) : null; +} \ No newline at end of file diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java index 8a8c728a7..8da2a19e8 100644 --- a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java +++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java @@ -4,6 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import javax.sql.DataSource; + @SpringBootApplication public class PalTrackerApplication { @@ -12,7 +14,7 @@ public static void main(String[] args) { } @Bean - TimeEntryRepository timeEntryRepository() { - return new InMemoryTimeEntryRepository(); + TimeEntryRepository timeEntryRepository(DataSource dataSource) { + return new JdbcTimeEntryRepository(dataSource); } } \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java index a07c3fad8..6463b3806 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -128,4 +128,4 @@ public void testDelete() throws Exception { private Long createTimeEntry() { return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); } -} +} \ No newline at end of file From 88a8c1138a94533987dc2c304aece0e547fa9121 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 17:36:22 +0530 Subject: [PATCH 24/37] Spring JdbcTemplate Assignment --- ci/build.yml | 81 ++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 3ce8db9b7..09f3e7e36 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -1,42 +1,43 @@ platform: linux - image_resource: - type: docker-image - source: - repository: openjdk - tag: '8-jdk' - - inputs: - - name: pal-tracker - - name: version - - outputs: - - name: build-output - - run: - path: bash - args: - - -exc - - | - - function stop_mysql { - service mysql stop - } - trap stop_mysql EXIT - - export DEBIAN_FRONTEND="noninteractive" - - apt-get update - apt-get install -y software-properties-common - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 - add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' - - apt-get -y install mariadb-server - service mysql start - - cd pal-tracker - chmod +x ./gradlew - mysql -uroot < databases/tracker/create_databases.sql - ./gradlew -P version=$(cat ../version/number) testMigrate build - cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file +image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' + +inputs: + - name: pal-tracker + - name: version + +outputs: + - name: build-output + +run: + path: bash + args: + - -exc + - | + + function stop_mysql { + service mysql stop + } + trap stop_mysql EXIT + + export DEBIAN_FRONTEND="noninteractive" + + apt-get update + apt-get install -y software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' + + apt-get -y install mariadb-server + service mysql start + + cd pal-tracker + chmod +x ./gradlew + + mysql -uroot < databases/tracker/create_databases.sql + ./gradlew -P version=$(cat ../version/number) testMigrate build + cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file From 151ae90449c99bef9799aa96f9ede120cfa36308 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 17:40:34 +0530 Subject: [PATCH 25/37] Added the DB Service in the manifest file --- manifest-production.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifest-production.yml b/manifest-production.yml index a0e0abfcf..dd10417fd 100644 --- a/manifest-production.yml +++ b/manifest-production.yml @@ -2,4 +2,6 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - host: ps-pal-tracker-samrat \ No newline at end of file + host: ps-pal-tracker-samrat + services: + - tracker-database \ No newline at end of file From 4f78dce0a2727fdb3fa5eca91e28b3f4cb32e208 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 17:44:38 +0530 Subject: [PATCH 26/37] Updated build file --- ci/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 09f3e7e36..ca9ed1031 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -18,26 +18,20 @@ run: args: - -exc - | - function stop_mysql { service mysql stop } trap stop_mysql EXIT - export DEBIAN_FRONTEND="noninteractive" - apt-get update apt-get install -y software-properties-common apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' - apt-get -y install mariadb-server service mysql start - cd pal-tracker chmod +x ./gradlew - mysql -uroot < databases/tracker/create_databases.sql ./gradlew -P version=$(cat ../version/number) testMigrate build cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file From 71c33dbcbc0fd26ac58b7575fd1769efe2a49436 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 18:22:25 +0530 Subject: [PATCH 27/37] JDBC Assignment --- .../pal/tracker/JdbcTimeEntryRepository.class | Bin 0 -> 5777 bytes .../pal/tracker/PalTrackerApplication.class | Bin 990 -> 1090 bytes .../tracker/JdbcTimeEntryRepositoryTest.class | Bin 0 -> 6067 bytes .../pal/trackerapi/TimeEntryApiTest.class | Bin 6313 -> 6931 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 out/production/classes/io/pivotal/pal/tracker/JdbcTimeEntryRepository.class create mode 100644 out/test/classes/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.class diff --git a/out/production/classes/io/pivotal/pal/tracker/JdbcTimeEntryRepository.class b/out/production/classes/io/pivotal/pal/tracker/JdbcTimeEntryRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..3041337d52173e0c3c8db0ec2dc09100ea2b7135 GIT binary patch literal 5777 zcmbtYcX$)$9ez(1I$1uzkulWZ5&4bSG&OgP}>2?xyM9d+$B|?$h_XJDtvvgxsgkW1qh7yWf0&%Ki`5w!XG4&2PHdhbQA}tH-%;vM^E(smcm5c9D zO*N&LjI`F@Jt4tAsAq`E@?nlROe^TcEP**kFGCquuY{Gg?O}A&hGu2O-e^4)74*9slQ2AH*&GS$7sC*q*7BM` zBQpE7bNlpMMkL!6lC)SV6m-LkyVP{ne>|JdNVwLGK}{`m9dS{T9iA1jF!`chPEmVA_0}0 zIy;q7yYkwZuB{SwI7A{<$I9ihNZbsj<_a5|h3pcRrc4$u8-kU{?0(G1#M!h~Ftd8T zDC5I2KC;l3EfTJ;Y0J>!yf*YRtS1T55Ub1a(a!F!J_&~xk>3?h2K9ViOAAwpgeYaJ zk`EeMK{d1tT{E>=EidvQly*rav{z_75?B+(GKYlD3QbLUcB|N%6)mB&PI+$@CNVKx z%Up{T^y8yU=9_fgEV4}&Ml|z;o+&O5;A5@0hadO0;+TT_@NtC~-jiGLiRCixZ^eXy z2Qa5#2d~&Kw1UszvkHc>U&3%IkxUGZN3xmTNWsugGD^q9x>VE*YaxoOH*$gvw;0(wHaZd! z{pc8jWn{Ht(1G#Mg$_q6;#^OABc3>RM<#YB4<}NQD4}rvx@G)W!B6m089!6-bNoWV zFYzk{zs7GQY_1c(I_1QKufyQpeU+<~RbDB(LrJ%%N$9DS{ux!bCV<`Pv{o#7sGFkQ z6CwN-zvE<8ukAfPJ^RH}`FndN{)>>1YE_>+;s;E4R$bnA6RRt$t^&qGy^+YbM!wN0)~cE6DcLNwYoe&pzW#mE+Vj zq2@}weVC!c5|&kxP)t-T_|xL`=y5S$411Hu8n{^cr%IYZr87<-EuAU0Uyft9+Lxa< z*Xko+eH(E{l1h$vb=qy4zKqn+)=0Gbg~gHRo$nN4chJ6HhBzHIb9+rZz1m+?7$zHC5;Iq+F#9a1+^3830_E*oN~gTTAmT z5;ircz%m53S9XBgYd|S7L119}DB+q~G#+l8YY5_>+P^oZzBX$|F^*3{$HcUu-v%WP#Q zLC13|2z)|jO+V#{(hMzI$+ zQ&SKT?86W_Iag!9qk9Aa%i|8AGaU9mh_=b5o)mY1IjndX?GF4kYQk zaO(g@DNum9gN6u>WtQlbeER3G>hbcnTk;f}(vfEe>mbh#VT?~9?N0tyCO{gnq&*>M z8A^CMh)HVF&(&&cwS=oRsmTC8IxpghsY$sfHHWoFVm%9xTT5|Z+?P`QDym(__(U0- zZ9Ln~$cWh4NDjD84meKI2n$nzWD4Vsf%_dK+bjdGE+Z*)S5hTpfj!JL-0#7$%~jE6 zt7!F!_Tk`o8~ygtoX(zkL?qmW6#~j0|2)<;@jFxd-SA5S)g~(?>?lomq<6Z~J8=Y0 zrMZ)&mf>4{ql{Z{D>otsj^eh~kZ4_w+Vg0!)b?FQ`(!Mplqk5JVCEN5D*!a-ckkZxj7<4l)Iee_v|(GXVf)1lHtVU?esM`;tA zsAJO|JQGQG;>=T25z8@JPeFLl7m5jK@dnYFbFXSGcYl50$D~t8Z5V)fhBS~ n1M3E$7!v~*kYodk3!v!dVc-SIh(KjU!D_|8q&Qquf`I`5Bq<^P diff --git a/out/test/classes/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.class b/out/test/classes/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.class new file mode 100644 index 0000000000000000000000000000000000000000..98958f406f1811e27b5c1f570e940da9279c6840 GIT binary patch literal 6067 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 literal 0 HcmV?d00001 diff --git a/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class b/out/test/classes/test/pivotal/pal/trackerapi/TimeEntryApiTest.class index c7489a483a104045093ef2829000af998d931b09..07430bccd718504d51f828b8dabcb6e4d9ef2b84 100644 GIT binary patch literal 6931 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 A^8f$< delta 2563 zcma)-30PEB6vuyW7T%l3GjT)=%q7GP7|b*UG`GMNXjMYZGN3?H2*%W`rp*>B%f@W6 z%*skz5p6)prL;25wB53dveZ`FSL^HC*%ZY-=lkZqd+#}S`Td1`nC|7O~jiVS^>g@QBHy%r|%}vIoPI)t0J7 z9#>O8Veq8RvRJyaT=_p`@-)vFJgX+0uk)Nq20nx5)wf0!D^yV%na&oe*bP>?Sj7wd zbOI*X)TuSq9W8Zm#nLD$%w9;E%F|Ar> z!^$Mb2%Gk@zc^;5J&%0+G<2i?=P_;a#2gEZ*k>e>)?4{7#Dx`A9kM()rlp6LxFFresuBRZK1|_Kqx3 zznuc9CgYSE)TXY&bjM2Ra$EMbvb^~BZEDuBCCTCF!= z)f1ne?r!5w5U;kYInlue66#5G1xPAPcl+8MWr@cg;3ToNZ^q;dnK}eljm#&Dbad+h zI?14un;Dd>2Ca~7+fm2uic895;^~4fnQnOGjtrv*lSt(%(pX43E2LMk=oC6{m_TN+8>r=oH=(4$n~xdf{_Q zI%`8eI+G>0zdu75Am<)PF@u=O;2?v6p}mF~I4Nf$7s`3sP{c(-!zLpK3%x>NHAKi< zETbLrkEKNXoKZp{|03~^67n5^s5F8|8!A&c1kt7_p$0OF>gee{B|tAZ&Zz-<9~ZKt z#TSI(af|kRhrv{`42#cmZ1H*A#}c3Cc*K_~w+(WH%5V|lD4*aTEvWMZQa;sk$>xbh zmkIWbf?EkNHAEo_e|;E!SCQf+LHL72ikAlAN2D0CH35AD=dv(oADS0Kb_4r^pc}9i z#nUIAzV6I8R~<&a5@$2$YsqRLyC_|&qkkj}0}4D%lq;>Ua+OY-$pUFUB}*|imj?Q% zYb& Date: Tue, 12 Sep 2017 18:29:57 +0530 Subject: [PATCH 28/37] Version --- ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.yml b/ci/build.yml index ca9ed1031..8b2e296c4 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -33,5 +33,5 @@ run: cd pal-tracker chmod +x ./gradlew mysql -uroot < databases/tracker/create_databases.sql - ./gradlew -P version=$(cat ../version/number) testMigrate build + ./gradlew -P version=1 cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file From 3f01d12ea1b851bbcb9e3ec4a73aab4f04736b85 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 12:28:32 -0600 Subject: [PATCH 29/37] Add tests for Actuator lab --- .../pivotal/pal/trackerapi/HealthApiTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java diff --git a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java new file mode 100644 index 000000000..b3eef23cc --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java @@ -0,0 +1,38 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class HealthApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void healthTest() { + ResponseEntity response = this.restTemplate.getForEntity("/health", String.class); + + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext healthJson = parse(response.getBody()); + + assertThat(healthJson.read("$.status", String.class)).isEqualTo("UP"); + assertThat(healthJson.read("$.db.status", String.class)).isEqualTo("UP"); + assertThat(healthJson.read("$.diskSpace.status", String.class)).isEqualTo("UP"); + } +} From fd9e6d6565aefd6b38b241302b382e9d24a5a244 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 18:46:45 +0530 Subject: [PATCH 30/37] Actuator --- build.gradle | 3 ++ ci/build.yml | 2 +- .../pal/tracker/TimeEntryController.class | Bin 3445 -> 4303 bytes .../tracker/TimeEntryHealthIndicator.class | Bin 0 -> 1394 bytes .../pal/tracker/TimeEntryControllerTest.class | Bin 5111 -> 5569 bytes .../pal/trackerapi/HealthApiTest.class | Bin 0 -> 2761 bytes .../pal/tracker/TimeEntryController.java | 16 +++++++-- .../pal/tracker/TimeEntryHealthIndicator.java | 29 +++++++++++++++ .../pal/tracker/TimeEntryControllerTest.java | 34 ++++++++++-------- 9 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 out/production/classes/io/pivotal/pal/tracker/TimeEntryHealthIndicator.class create mode 100644 out/test/classes/test/pivotal/pal/trackerapi/HealthApiTest.class create mode 100644 src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java diff --git a/build.gradle b/build.gradle index 5d3e3ed57..1c59bd97a 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ dependencies { compile("org.springframework.boot:spring-boot-starter-jdbc") compile("mysql:mysql-connector-java:6.0.6") + compile("org.springframework.boot:spring-boot-starter-actuator") testCompile("org.springframework.boot:spring-boot-starter-test") } @@ -23,12 +24,14 @@ def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&use bootRun.environment([ "WELCOME_MESSAGE": "hello", "SPRING_DATASOURCE_URL": developmentDbUrl, + "MANAGEMENT_SECURITY_ENABLED": false, ]) def testDbUrl = "jdbc:mysql://localhost:3306/tracker_test?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" test.environment([ "WELCOME_MESSAGE": "Hello from test", "SPRING_DATASOURCE_URL": testDbUrl, + "MANAGEMENT_SECURITY_ENABLED": false, ]) flyway { diff --git a/ci/build.yml b/ci/build.yml index 8b2e296c4..ca9ed1031 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -33,5 +33,5 @@ run: cd pal-tracker chmod +x ./gradlew mysql -uroot < databases/tracker/create_databases.sql - ./gradlew -P version=1 + ./gradlew -P version=$(cat ../version/number) testMigrate build cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/out/production/classes/io/pivotal/pal/tracker/TimeEntryController.class b/out/production/classes/io/pivotal/pal/tracker/TimeEntryController.class index eba45958f5a782b19307f4ca8e9093bb15de2462..9a2283e50626cbdcfba040cf8e355148890fcb1f 100644 GIT binary patch literal 4303 zcmcInTUQ%Z6#gbjNr2(fQ0N7!tO@ zci;RA%Cf5qUCT!w{7o*G-#Ig#1R7U{E`7+EGiT1;``h2XoRdHQ{`GeNr|?}J+L5fq zA-e}HH}FXmH*4`Jmg}J6Gx1H2AthGQV#tVP zBZgbz%SsHZ;%UZkTYS6|MK+2x1&wK|m~#w!!LZlOw4va9!m?MiLf$rWE4OTY&A4aT zceIpcIhvk!in?QHYldT+>4G-CO>{(ox}q0X3}4mR;Hsv}1gWUWG1rXA9L*Soc_VKr z=u4QEmN(ZeN6%_`{v2CR-!W`$(c8Hp_7zOWvNx!pX4K4?&IJWOcI`$mIN%+=2N&Gt zY4?(X$hegu?@b9aXC#YjDZ^gWQ(3OW6INQ!F6p)@-o3?$vuYNC&@pb2J}a9wY(Yob zHW)btGu7!B>8|L^s^jFfd83fGas?3@(-Az^z6{icf@4*gra-fcB;$vTIu^{8obD8D z;=B7_;v20F=mH@foM#0vi^!1?Q5L5u`^L%#4DOuEcG9UDvXDZbeI2w7Z+gg-ohw z-l;)B!-B)Yq9-!pqR1&&etkm$LvSiE&C^C1%X`-KY>`N4{7dK>G|{m74fljpaSWDU~vBbea zpW^Iik`lj7(PZQH6}HNPd7l+Q8m{nk3=F9J*2A_|D5lm-Vri>@WkP^CUP-gex68bT z@Q8AXJe{NC^OIwXlM@O~RxHCE0`zCN+@KrwkwBvIrgn>GKATdx4)5Fz5WUdsRR$tC zySO|xdo4-KU0s1KFTG+iNc#@}s^t~M!qK|q?DF_*a&a=bh@<=?($2pqVZ=p;;Vdqi z44)yjio@dV$pT#xX%ujd7np1$V@_4GeSxTp6yB0o#1lN{TyhhqzO?n5nF z(a4n+>_-Pzdt7;RqKj|TB<(12CJ=<=OkfDpX1ClgEI*}On9tFkUl8ft!k!RjI1R;X zwh#@0({MZ{zHOma!4~QiJljHj1iwMO-nWT{7ij#6@*xO>afzZG_4K-pR^O)A0^JeU zhL3I(z33y3dJLkUvk(TP4vi8nH-mf*@fTIN?Hx{-LO4zJ0`&JD=s^#36G8X=fkP5_ zvjpzJ+biIS`6l8o&?1nAB~q8m<3w-*OBzSIdxvi5i z93Wy%qEuaR52efBn9tvcGhSk`3Jdcv|<1N delta 1134 zcmZ{i$x{*kFBa(0oIP4|wY>Nb zC}>e=l}8U={1^1>*_)+)uX}1@S><8+_3L@d?|t20dVX}yeg5_SBY;8Ni=zc6V@TkX zhtoLY;%p4(a6XPGCgo&G+zYZ?l(S26HZ4n4mKpgm>*BJDD}Gv4RoQ>!^!n4v+xo3u zInk>MEB<(NWb146ek7H`HI3a!y11^N+|*daEsZ5{Z`-qF zjl;O3aSSUO!?>%liUq$K`=So`CAZUc00W` z8;w2apvOE@Rk2zpGK`d(i?ov2o_`CcR@gzr!ORCl7mJ%{*hb@P{<9t8rdk>vYfJTR zn-^AZM;G?8wg-)U+&S29a=Xz(E0grn_VIHC;Q%)Z2aydxp3>HYBr7BYaS2lVghT+- zBrvkyL~I*z;fk2alS~AAd+eED=M2f}eA$pMiyZn5U&fF+7+_u#)K6qwogu&&x)lR18WQI%I_<+l5bku58 z>Q=w36aS!?Hzp_!M$9^DsFU=^=#Pit6Mq1u{&z_L diff --git a/out/production/classes/io/pivotal/pal/tracker/TimeEntryHealthIndicator.class b/out/production/classes/io/pivotal/pal/tracker/TimeEntryHealthIndicator.class new file mode 100644 index 0000000000000000000000000000000000000000..d57d41d2118e841add7e1e9049ea34dce348a5ad GIT binary patch literal 1394 zcmb7ETTc@~6#iyg*j|>4MNvRh5TTUH3L+pNicN`43MSALeInC#gn{kuW_K2XFa8%_ zeAPrHXyOm>HyPvEQoIlo(uX~B&e?OmbDjDA^UF5?GkB6f5~FeG7}GJHKm?;nWH6CL z7I$?_h8i;@_d+tIV_L_3hVHeM7u%)6T7EmfUfL++HyK!gp(E$mzT&njb1M)LiqJ+% zCF>$@EAMDSxDG?MC>_(42ae*F>C&e>Ufma-S^C?~m&);u78%-?q%GAlgPCr{alFhB z%{eu}&{dSSSP$wI;gxvBB2B93RJm2=o($!tGOBi^&oFgilxKolYPVq5WR+8rVUD{E z6~lCTyy$p4rtf;v-g)Kmx;S*aeY4^?%H&lQa3#!BWAhY-y!A>Tt(x$NdwRwh1=|*0 z&f>l=D5?1tQAe6Ugx;~KsJ(04ZInqvW=L#0fmao)GVI0R@3x<-YjTetaE88(zz!!^ zmcFEBt=KjVPDvUxL*~C}`AT@gQAe&Yb57lLY+(W_0I%W;b zVP3~W0}G(?%!`)kTvY~^@W{Y&NFHN=Ryi!ww79)vKCkSFs$!UHExF&Dzz|7?dpFsd zKlSmVBEp+VcA$StK2Gqw`-48T;}z4Vm(y>!}4U!$Qj|de(fx zkJg++o1v|-u^6IfBMAlr8v49L`B15L~~P0Z|9L|z^vTFiWeb`rik zCunDgy+v~3Gh$os5Ti4`MI`Z_up)#WMrb42gBa!4Ptq{O8YApK(X-9yF^u3kZc@}+ k6}c$taZX-r75N$p%72gf1LdVUI8kUQh>och zIFAcaOyeyp5W!=z@K%w3TNH1{JEC|T@2tnW@a`zygC}I}Ntt_Z6z`MQ_u~U1_Cb;O zknH=g{5&;pGvW`bZk;#YQHP6Bd;}jAv5$$^$5nhnRDLpwPvO(^0!ve9COm>$~yM+fRVHEreoRD3U($;E1ol_EJx48 zbNt`2_0(CzjwefZw<(CGENZYa8N;qbwlmmG+1I74Le??tLBpOhQ-*?r3Cm8$^Eunh zrpIl4(l~F~XXB%m<;3-rQ_vkFK500%naamI7l=}smevbtBT%)!a#hDdf>c!7Ze~sA zkbAAG{c!#!b<6xVcj<6-Jh&>Cd|BodlHV3cb0Zz z(G^MVrQw>q;SA;I(yj|BBj=b_Hm~9<3f2wKOLYFQnKx;vBb#Mx++`O8J$9x*#PK7> zxMdqu6cyv0wn2X>s536)jFe-HDcHPhXenH08~GefQ?$9P4<{Ta7a#C9F?~#Dnqs%O zdp#gNpE`jtVCb~GW}&a9bMyY{t<*&O^4Jd%#_D;SBYl?B%^aa|7e~U(JA(3zKBdPC zj+u$e3?*7`n5xjwNaes6nyg5_P;sL;lpAxS*dV;Tmk={|%TXg^NT8#GR>4jg-KHex zhM-y(rrB-*qu~J@SI|;gTRb12X6Fjfs1-vLL*H!#f#m_YS9KX=;OZ-a1ukn(G-{7i-mvL1= z{WPO%*tD+Vw;Fzj-)r~-{wP0xVw+r;K%(-`D*hry{;J_`_`8OG;GgpIFAe_|&HuqO zGI~YBe?|QsNuHZ&Ml2N9W=7AZ;WEV-e%I-C^nd=hV7h*r+A*m^_&^+a3|zMW}o#|lM_0N;#fE; zoz`Sdx8*iK*Ok{ZnwRU8Q{3rkrr|A%k}Kj9#V`i^jR+P8I2Ykn!m2 zPmXl=5A`wTURQQ+FCDh6Pcs{9^}Khr+1m6-sh53T;rmW?#=Qx}=7SPm+p$!cl)&5T zlPhXiB6f?qhf(_f-?gLm1#lunxM&k^!<85hX^zxCZTHv=J*Cu`0Iu7TSy@ zcFdwdaLl1G0%DG7v$*v-v^lJa-~?Azh)`JOwi&GL-8qAGvsnKeZlA%16MTF9EbiDb zgN-MO6gH!dMz^B@O}HJ+*oqe1jh%GXZoG-U9>X4&&L$6>Pp5%2hA>PTJ(N1Zoe`8$ zJn2$=IG}jlre5yO%-Pk6k#(zx$X? zZFGElh*2_N)ZsHa7%+N-+9Z{{nNv$}JRNYnNIyj=w@@E|o>xj={4_V(`LbeBc zS+2(k_#ys{FvGHpm5}vv&+^IcW&DP?F2!_*pL;@ET;i?0Iat#)@XjN-k_#bN>Oukz?hcuDI(8P1Cp-3i24IO}ne9phmp=_$teG-*G|zmX8} z5ubRBPp{~X1}VB2xl};zqT67>uhP_2)u}cKe7lb_(fS#iH?MmMR*9dLtPBKP}eQ@Bjb+ literal 5111 zcmbVP`Fj)B6+I&_Ba30P4GqKz1Pa&&EE-G#H6b-#AdYMoTiCcMsAG9-kC8QEG%~np zn{?kx_q|Q`y|hV#m(V2co~HZH{ra!;>$x*yX^bRW6n{uF@4b8PIrpA>XY~4iUwQ>V zJN^|x2NEjY5rK~JI=mT46%!HEz>u3s6;m}lDF2@JFO=89n2sO}Q*357;VM!Q%p$!B zAy~4J5<q*vLlUAXkSuT#w)e=4I`jvi5WY?~>bh<2_>bj95G?=iVzH?^}%-@-M1( ztOoB4JqWnla}rM^8mF{O{O$@~UA+ZuXkHs#)5tahf&tb&JQj*)fN2V4jm=UE1>$r{eZ48ix@NE#W(w9;7>Ur?}XD3_L` zjF?%Ikvh|9X2IQdLD*B#nH&*E&l;1KZ3ue_-enuQLzrRXM#e}w#)N`>8zzy)VcW=N z7@DRnF^kT#8QV-xP1^dbaow`7MyDMo6CLsou~4QnPqS_ASr3TMCoC|A44sj8uFcha zW;I{^m4-OIG4?Zrv3)gWV!(2Gtz4SHT^unp>j=sjeNK<&95WS_6Dc=`sW!5HOG`t0!3R){~ zDHUJT@Fjd%!)ZKLfn_16#QKVcGk9FV-i-pX2OMicpBJOAYWNzyuHqXSzKQ2ld`rW( z1;BUkUD^JgTzy}~4>bG`KT`2y4L`w8Rs2lD&v8q|FEsoT&ue%AzmlC7RoqswpkWb9 z8kX^rhCBGRhL>?m!z;L@pl+TSHf%;$@v4Ru{6@oX@jLnWy@D-kizqJtpyH1b9;J+tCtO@jO#*(dG?1tT2!}WHRn*?(6FdxEgk3 zP;@*Yd*KOd$Z&FYnzJwnzz^q5mQ~1ECpSJ$)9A2V7&g%~1u5OVPj1(z4Z1#9(sdz6 zd2)?Gcm2APoHlHZ=_)|S%~OUm z%m+s<>pjs9HLo+@&vVFohe>CT#Gr5t+nI?b`HYF`88h1HF33}gv&Y+wPwN!vxnNbg ztl5li%M+5REA3}ID-Uz0aMJV4!28RRE8tV0b`AA(#(TP{_3}fxU_ie|?+FNJgPHBQ zmeW&lOTnoiyESqy&XCV6&qrkm&RP@HTqBcTLZ^@4yK@ghK19p9)PjdshnhPWVpe*J znVi#8Ib(2=Bc-`72vD|}x9Uk#9;od>l#}t&dd~P(<+ySY z)K2*CJhgL%ZBDYE8j2#yQz$YpnCKcDi1!S{@eqGcb?|poh<|*Eaj*DR!tXjL@mror-D6$+taTT6pqtm4cK|);6trnrKx6-r1?*VD z&KK~81>85vyIo7zeRu))j~1ZsvUop}9zz%V<$NMJ}MVM7dT# zEgvE4qeW!9S)=oAgIr*9BoITI6%n$Y_AH<5ai*gmqoj5L5Bk~@+L97)?^1qmY@M3D zEuVm8UzZ7=dRrroc^r%Qv5F5KJj|e_L{CcFVS+~f)mZu__Si}huDk0I3+h?9cFH@pd zDA5EbhmMmN=O|4EBzn#Ve=;x8a**Gihy1MHLv1qIyw-mtCi8Czk8=8XopdsUeDj=I p+dTE83{0_ir?Cenj$$T&sLe;DaZ0%rr!{*{12uME!hA7 diff --git a/out/test/classes/test/pivotal/pal/trackerapi/HealthApiTest.class b/out/test/classes/test/pivotal/pal/trackerapi/HealthApiTest.class new file mode 100644 index 0000000000000000000000000000000000000000..313ef4054cb296519ee7b0db7e83dd79346e42ba GIT binary patch literal 2761 zcmb7GZC4vb6n+*08^X55h*e5Ut56|88DFrrhGIhqrEP#nQlet5lg&UjB)i+q2AZFx z$Ahis=<&0^!e8R?&TbMC*iihiGdp+geeV0+{rlhF{{*lID}n)hIfVCcFO2&tzETm7 zUBgB^6)ocA;Un+<0(N%}ePrKjf^!&3%@2Wgg?p z1U%x&m+KTrFLTnstW|e(v1WL&>k7ew#87apL&&L{rf?W#IB&Qm5+69^l{&@bZlGme zv~}Mv=BZs|S+A@Jfq)1gSn#CQTGGDQ3e{jUJE~scwVI%;E~E{M1>}@vcqQkjH(}cq zL-(qXbY7+cPML>>W0^AWDsn{2chRUP9!m?8EhVWy2j6DrR5vQ=9^OuDu5N9-$ZT!r zG+e{DhO2mAfy(@9qa>Y9T^DJqP!>9w{7l0R@+!X7@EyKav8&++JXi6fh8Orr1=mo3 zuAvB_Vo$?9N>s#C3pMJ+ItA@UP$_1p)nu4R#L!U2fds86=zEq?Q6=N27K(*7M3hcO z?I3G&U9^cYFXsW-IMZP&s3nr;PnzKDpNgu2`{$#aGp{Jm`@&tb9KT}~@R_r%(?Rj- zA->x|@e>mNKSNkgT982;6(-bPG_5nI_z#0ZxCd=^(o~6o~8nj{Zi~1 z#$<^*S@E(iOkK1?%Fa*a84(4GK{fKWxr-0!FKK}OnyAv`e5L&ZIt|i3MtdLaGh zPA5jYLi@n%Z%}^ru5ZvPnSoJE(5m?ixQSbIQV4#WK&0?L2%(?$SF^vOFWMgs_5Xo^ zV+^L}j-kFr_!kTvBa)}n@LveMhPE*uz2tFSeuFC^c*K$DJI9FT=cDiTycz9rBkk>n zw08n3t>YM>w+XT{hL4cMB%WgmN4V|zam%;0>Bk64#4}0$#OQ}`ig^0)F=0q={kv&; yYXxq`(-fn%53?S1g5KtcV_wG{EYN}NLecRFJ{9-^cj=cEh|v9K$l~*dWB&m%UP3_t literal 0 HcmV?d00001 diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java index 1f460951a..788664d84 100644 --- a/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryController.java @@ -1,5 +1,7 @@ package io.pivotal.pal.tracker; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -10,16 +12,21 @@ @RequestMapping("/time-entries") public class TimeEntryController { + private final CounterService counterService; + private final GaugeService gaugeService; private TimeEntryRepository timeEntriesRepo; - public TimeEntryController(TimeEntryRepository timeEntriesRepo) { + public TimeEntryController(TimeEntryRepository timeEntriesRepo, CounterService counterService, GaugeService gaugeService) { + this.counterService = counterService; + this.gaugeService = gaugeService; this.timeEntriesRepo = timeEntriesRepo; } @PostMapping public ResponseEntity create(@RequestBody TimeEntry timeEntry) { TimeEntry createdTimeEntry = timeEntriesRepo.create(timeEntry); - + counterService.increment("TimeEntry.created"); + gaugeService.submit("timeEntries.count", timeEntriesRepo.list().size()); return new ResponseEntity<>(createdTimeEntry, HttpStatus.CREATED); } @@ -27,6 +34,7 @@ public ResponseEntity create(@RequestBody TimeEntry timeEntry) { public ResponseEntity read(@PathVariable Long id) { TimeEntry timeEntry = timeEntriesRepo.find(id); if (timeEntry != null) { + counterService.increment("TimeEntry.read"); return new ResponseEntity<>(timeEntry, HttpStatus.OK); } else { return new ResponseEntity<>(HttpStatus.NOT_FOUND); @@ -35,6 +43,7 @@ public ResponseEntity read(@PathVariable Long id) { @GetMapping public ResponseEntity> list() { + counterService.increment("TimeEntry.listed"); return new ResponseEntity<>(timeEntriesRepo.list(), HttpStatus.OK); } @@ -42,6 +51,7 @@ public ResponseEntity> list() { public ResponseEntity update(@PathVariable Long id, @RequestBody TimeEntry timeEntry) { TimeEntry updatedTimeEntry = timeEntriesRepo.update(id, timeEntry); if (updatedTimeEntry != null) { + counterService.increment("TimeEntry.updated"); return new ResponseEntity<>(updatedTimeEntry, HttpStatus.OK); } else { return new ResponseEntity<>(HttpStatus.NOT_FOUND); @@ -51,6 +61,8 @@ public ResponseEntity update(@PathVariable Long id, @RequestBody Time @DeleteMapping("{id}") public ResponseEntity delete(@PathVariable Long id) { timeEntriesRepo.delete(id); + counterService.increment("TimeEntry.deleted"); + gaugeService.submit("timeEntries.count", timeEntriesRepo.list().size()); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java b/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java new file mode 100644 index 000000000..49b1f175d --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/TimeEntryHealthIndicator.java @@ -0,0 +1,29 @@ +package io.pivotal.pal.tracker; + +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.stereotype.Component; + +@Component +public class TimeEntryHealthIndicator implements HealthIndicator { + + private static final int MAX_TIME_ENTRIES = 5; + private final TimeEntryRepository timeEntryRepo; + + public TimeEntryHealthIndicator(TimeEntryRepository timeEntryRepo) { + this.timeEntryRepo = timeEntryRepo; + } + + @Override + public Health health() { + Health.Builder builder = new Health.Builder(); + + if(timeEntryRepo.list().size() < MAX_TIME_ENTRIES) { + builder.up(); + } else { + builder.down(); + } + + return builder.build(); + } +} \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java index a6f1100b5..09ae732ce 100644 --- a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -5,6 +5,8 @@ import io.pivotal.pal.tracker.TimeEntry; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,19 +23,23 @@ public class TimeEntryControllerTest { private TimeEntryRepository timeEntryRepository; private TimeEntryController controller; + private CounterService counterService; + private GaugeService gaugeService; @Before public void setUp() throws Exception { timeEntryRepository = mock(TimeEntryRepository.class); - controller = new TimeEntryController(timeEntryRepository); + counterService = mock(CounterService.class); + gaugeService = mock(GaugeService.class); + controller = new TimeEntryController(timeEntryRepository, counterService, gaugeService); } @Test public void testCreate() throws Exception { TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); doReturn(expected) - .when(timeEntryRepository) - .create(any(TimeEntry.class)); + .when(timeEntryRepository) + .create(any(TimeEntry.class)); ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); @@ -45,8 +51,8 @@ public void testCreate() throws Exception { public void testRead() throws Exception { TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); doReturn(expected) - .when(timeEntryRepository) - .find(1L); + .when(timeEntryRepository) + .find(1L); ResponseEntity response = controller.read(1L); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -56,8 +62,8 @@ public void testRead() throws Exception { @Test public void testRead_NotFound() throws Exception { doReturn(null) - .when(timeEntryRepository) - .find(1L); + .when(timeEntryRepository) + .find(1L); ResponseEntity response = controller.read(1L); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); @@ -66,8 +72,8 @@ public void testRead_NotFound() throws Exception { @Test public void testList() throws Exception { List expected = asList( - new TimeEntry(1, 123, 456, "today", 8), - new TimeEntry(2, 789, 321, "yesterday", 4) + new TimeEntry(1, 123, 456, "today", 8), + new TimeEntry(2, 789, 321, "yesterday", 4) ); doReturn(expected).when(timeEntryRepository).list(); @@ -80,8 +86,8 @@ public void testList() throws Exception { public void testUpdate() throws Exception { TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); doReturn(expected) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); ResponseEntity response = controller.update(1L, expected); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -91,8 +97,8 @@ public void testUpdate() throws Exception { @Test public void testUpdate_NotFound() throws Exception { doReturn(null) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); ResponseEntity response = controller.update(1L, new TimeEntry()); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); @@ -104,4 +110,4 @@ public void testDelete() throws Exception { verify(timeEntryRepository).delete(1L); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); } -} +} \ No newline at end of file From 793dbd674676e506086aa875ee5e25e76377a700 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 19:14:17 +0530 Subject: [PATCH 31/37] Build File Updated --- ci/build.yml | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/ci/build.yml b/ci/build.yml index ca9ed1031..61abb9cc7 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -34,4 +34,41 @@ run: chmod +x ./gradlew mysql -uroot < databases/tracker/create_databases.sql ./gradlew -P version=$(cat ../version/number) testMigrate build - cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file + cp build/libs/pal-tracker-*.jar ../build-output +platform: linux + +image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' + +inputs: + - name: pal-tracker + - name: version + +outputs: + - name: build-output + +run: + path: bash + args: + - -exc + - | + function stop_mysql { + service mysql stop + } + trap stop_mysql EXIT + export DEBIAN_FRONTEND="noninteractive" + apt-get update + apt-get install -y software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' + apt-get -y install mariadb-server + service mysql start + cd pal-tracker + chmod +x ./gradlew + mysql -uroot < databases/tracker/create_databases.sql + ./gradlew -P version=$(cat ../version/number) testMigrate build + cp build/libs/pal-tracker-*.jar ../build-output From 3658be0a5eb2c9eb35f3f95dafab14d5f3b40471 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 20:05:34 +0530 Subject: [PATCH 32/37] Pipeline Updated --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index c34c3b2a9..649391cf9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -80,4 +80,4 @@ jobs: manifest: pal-tracker/manifest-production.yml path: pal-tracker-artifacts/pal-tracker-*.jar environment_variables: - WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file + WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file From c0c6d415fac1c43d5cc33c8edd1723c7d66d2633 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Tue, 12 Sep 2017 20:09:03 +0530 Subject: [PATCH 33/37] Build File --- ci/build.yml | 54 ++----------------------------------------------- ci/pipeline.yml | 2 +- 2 files changed, 3 insertions(+), 53 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 61abb9cc7..2f7313abe 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -18,57 +18,7 @@ run: args: - -exc - | - function stop_mysql { - service mysql stop - } - trap stop_mysql EXIT - export DEBIAN_FRONTEND="noninteractive" - apt-get update - apt-get install -y software-properties-common - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 - add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' - apt-get -y install mariadb-server - service mysql start cd pal-tracker chmod +x ./gradlew - mysql -uroot < databases/tracker/create_databases.sql - ./gradlew -P version=$(cat ../version/number) testMigrate build - cp build/libs/pal-tracker-*.jar ../build-output -platform: linux - -image_resource: - type: docker-image - source: - repository: openjdk - tag: '8-jdk' - -inputs: - - name: pal-tracker - - name: version - -outputs: - - name: build-output - -run: - path: bash - args: - - -exc - - | - function stop_mysql { - service mysql stop - } - trap stop_mysql EXIT - export DEBIAN_FRONTEND="noninteractive" - apt-get update - apt-get install -y software-properties-common - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 - add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' - apt-get -y install mariadb-server - service mysql start - cd pal-tracker - chmod +x ./gradlew - mysql -uroot < databases/tracker/create_databases.sql - ./gradlew -P version=$(cat ../version/number) testMigrate build - cp build/libs/pal-tracker-*.jar ../build-output + ./gradlew -P version=$(cat ../version/number) build + cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 649391cf9..c34c3b2a9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -80,4 +80,4 @@ jobs: manifest: pal-tracker/manifest-production.yml path: pal-tracker-artifacts/pal-tracker-*.jar environment_variables: - WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file + WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file From 53e1fa81a194ded767c44ce656749406223ddcf5 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Wed, 13 Sep 2017 09:51:43 +0530 Subject: [PATCH 34/37] Updated Build File --- ci/build.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ci/build.yml b/ci/build.yml index 2f7313abe..09f3e7e36 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -18,7 +18,26 @@ run: args: - -exc - | + + function stop_mysql { + service mysql stop + } + trap stop_mysql EXIT + + export DEBIAN_FRONTEND="noninteractive" + + apt-get update + apt-get install -y software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' + + apt-get -y install mariadb-server + service mysql start + cd pal-tracker chmod +x ./gradlew - ./gradlew -P version=$(cat ../version/number) build + + mysql -uroot < databases/tracker/create_databases.sql + ./gradlew -P version=$(cat ../version/number) testMigrate build cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file From e0d9e3ac64cab13bff109df15b066014b1c07318 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Wed, 13 Sep 2017 09:58:57 +0530 Subject: [PATCH 35/37] Updated Build File --- manifest-review.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest-review.yml b/manifest-review.yml index 81ea3a215..8a78c7dda 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -3,5 +3,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar host: ps-pal-tracker-review-samrat - services: - - tracker-database + services: + - tracker-database From a953b2bf8920912c1b84cc1b98f3ce703943fa5e Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 12:50:47 -0600 Subject: [PATCH 36/37] Add tests for Security lab --- .../pal/trackerapi/SecurityApiTest.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java diff --git a/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java new file mode 100644 index 000000000..72099994b --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java @@ -0,0 +1,52 @@ +package test.pivotal.pal.trackerapi; + +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class SecurityApiTest { + + @LocalServerPort + private String port; + private TestRestTemplate authorizedRestTemplate; + + @Autowired + private TestRestTemplate unAuthorizedRestTemplate; + + @Before + public void setUp() throws Exception { + RestTemplateBuilder builder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password"); + + authorizedRestTemplate = new TestRestTemplate(builder); + } + + @Test + public void unauthorizedTest() { + ResponseEntity response = this.unAuthorizedRestTemplate.getForEntity("/", String.class); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); + } + + @Test + public void authorizedTest() { + ResponseEntity response = this.authorizedRestTemplate.getForEntity("/", String.class); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + } +} From b6a1a7ccbf32e551d813c9ea6049afeff459b200 Mon Sep 17 00:00:00 2001 From: Samrat Bhattacharjee Date: Wed, 13 Sep 2017 10:39:46 +0530 Subject: [PATCH 37/37] Basic Spring Auth --- build.gradle | 2 ++ manifest-production.yml | 4 +-- manifest-review.yml | 2 ++ .../pal/tracker/SecurityConfiguration.java | 33 +++++++++++++++++++ .../pivotal/pal/trackerapi/HealthApiTest.java | 14 ++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 14 ++++++++ .../pal/trackerapi/WelcomeApiTest.java | 20 ++++++++--- 7 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 src/main/java/io/pivotal/pal/tracker/SecurityConfiguration.java diff --git a/build.gradle b/build.gradle index 1c59bd97a..8559110bd 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,10 @@ dependencies { compile("mysql:mysql-connector-java:6.0.6") compile("org.springframework.boot:spring-boot-starter-actuator") + compile("org.springframework.boot:spring-boot-starter-security") testCompile("org.springframework.boot:spring-boot-starter-test") + } def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" diff --git a/manifest-production.yml b/manifest-production.yml index dd10417fd..b9f2a2bd9 100644 --- a/manifest-production.yml +++ b/manifest-production.yml @@ -3,5 +3,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar host: ps-pal-tracker-samrat - services: - - tracker-database \ No newline at end of file + services: + - tracker-database \ No newline at end of file diff --git a/manifest-review.yml b/manifest-review.yml index 8a78c7dda..3a8415d1f 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -5,3 +5,5 @@ applications: host: ps-pal-tracker-review-samrat services: - tracker-database + env: + SECURITY_FORCE_HTTPS: true diff --git a/src/main/java/io/pivotal/pal/tracker/SecurityConfiguration.java b/src/main/java/io/pivotal/pal/tracker/SecurityConfiguration.java new file mode 100644 index 000000000..eae95f865 --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/SecurityConfiguration.java @@ -0,0 +1,33 @@ +package io.pivotal.pal.tracker; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@EnableWebSecurity +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + String forceHttps = System.getenv("SECURITY_FORCE_HTTPS"); + if (forceHttps != null && forceHttps.equals("true")) { + http.requiresChannel().anyRequest().requiresSecure(); + } + + http + .authorizeRequests().antMatchers("/**").hasRole("USER") + .and() + .httpBasic() + .and() + .csrf().disable(); + } + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth + .inMemoryAuthentication() + .withUser("user").password("password").roles("USER"); + } +} \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java index b3eef23cc..43fdab11c 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java @@ -2,11 +2,14 @@ import com.jayway.jsonpath.DocumentContext; import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringRunner; @@ -21,6 +24,17 @@ public class HealthApiTest { @Autowired private TestRestTemplate restTemplate; + @LocalServerPort + private String port; + + @Before + public void setUp() throws Exception { + RestTemplateBuilder builder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password"); + + restTemplate = new TestRestTemplate(builder); + } @Test public void healthTest() { diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java index 6463b3806..c983a3623 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -8,8 +8,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -32,6 +34,10 @@ public class TimeEntryApiTest { private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + @LocalServerPort + private String port; + + @Before public void setUp() throws Exception { MysqlDataSource dataSource = new MysqlDataSource(); @@ -39,8 +45,16 @@ public void setUp() throws Exception { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.execute("TRUNCATE time_entries"); + + RestTemplateBuilder builder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password"); + + restTemplate = new TestRestTemplate(builder); } + + @Test public void testCreate() throws Exception { ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); diff --git a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java index 932bdc042..782c5d64d 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java +++ b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java @@ -1,11 +1,13 @@ - package test.pivotal.pal.trackerapi; +package test.pivotal.pal.trackerapi; import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -15,12 +17,22 @@ @SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) public class WelcomeApiTest { - @Autowired + @LocalServerPort + private String port; private TestRestTemplate restTemplate; + @Before + public void setUp() throws Exception { + RestTemplateBuilder builder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password"); + + restTemplate = new TestRestTemplate(builder); + } + @Test public void exampleTest() { String body = this.restTemplate.getForObject("/", String.class); assertThat(body).isEqualTo("Hello from test"); } -} +} \ No newline at end of file