From 3ffab95e8c052702d68e6d68cb51013cc0124c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 20 Sep 2021 12:35:32 +0200 Subject: [PATCH 01/12] Added code examples for AssertJ-article --- testing/assertJ/HELP.md | 25 ++ testing/assertJ/mvnw | 310 +++++++++++++++ testing/assertJ/mvnw.cmd | 182 +++++++++ testing/assertJ/pom.xml | 61 +++ .../gymbuddy/GymBuddyApplication.java | 13 + .../reflectoring/gymbuddy/domain/Person.java | 184 +++++++++ .../reflectoring/gymbuddy/domain/Session.java | 120 ++++++ .../com/reflectoring/gymbuddy/domain/Set.java | 117 ++++++ .../reflectoring/gymbuddy/domain/Workout.java | 99 +++++ .../gymbuddy/dto/person/PersonAddRequest.java | 73 ++++ .../dto/person/PersonUpdateRequest.java | 73 ++++ .../dto/session/SessionAddRequest.java | 68 ++++ .../dto/session/SessionUpdateRequest.java | 56 +++ .../gymbuddy/dto/set/SetAddRequest.java | 47 +++ .../gymbuddy/dto/set/SetUpdateRequest.java | 46 +++ .../dto/workout/WorkoutAddRequest.java | 37 ++ .../gymbuddy/repository/PersonRepository.java | 15 + .../repository/SessionRepository.java | 13 + .../gymbuddy/repository/SetRepository.java | 13 + .../repository/WorkoutRepository.java | 12 + .../gymbuddy/services/PersonService.java | 27 ++ .../gymbuddy/services/SessionService.java | 21 ++ .../gymbuddy/services/SetService.java | 19 + .../gymbuddy/services/WorkoutService.java | 18 + .../implementation/PersonServiceImpl.java | 126 +++++++ .../implementation/SessionServiceImpl.java | 78 ++++ .../implementation/SetServiceImpl.java | 56 +++ .../implementation/WorkoutServiceImpl.java | 58 +++ .../src/main/resources/application.properties | 12 + .../gymbuddy/ExtractedPropertiesTests.java | 317 ++++++++++++++++ .../reflectoring/gymbuddy/FilteringTests.java | 352 ++++++++++++++++++ .../gymbuddy/SoftAssertionTests.java | 288 ++++++++++++++ .../SessionStartedTodayCondition.java | 15 + .../gymbuddy/extractors/PersonExtractors.java | 24 ++ .../target/classes/application.properties | 12 + .../gymbuddy/GymBuddyApplication.class | Bin 0 -> 763 bytes .../domain/Person$PersonBuilder.class | Bin 0 -> 2281 bytes .../reflectoring/gymbuddy/domain/Person.class | Bin 0 -> 4391 bytes .../domain/Session$SessionBuilder.class | Bin 0 -> 1918 bytes .../gymbuddy/domain/Session.class | Bin 0 -> 2942 bytes .../gymbuddy/domain/Set$SetBuilder.class | Bin 0 -> 1282 bytes .../reflectoring/gymbuddy/domain/Set.class | Bin 0 -> 2471 bytes .../domain/Workout$WorkoutBuilder.class | Bin 0 -> 1568 bytes .../gymbuddy/domain/Workout.class | Bin 0 -> 2745 bytes ...onAddRequest$PersonAddRequestBuilder.class | Bin 0 -> 1361 bytes .../dto/person/PersonAddRequest.class | Bin 0 -> 1489 bytes ...teRequest$PersonUpdateRequestBuilder.class | Bin 0 -> 1575 bytes .../dto/person/PersonUpdateRequest.class | Bin 0 -> 1519 bytes ...nAddRequest$SessionAddRequestBuilder.class | Bin 0 -> 1708 bytes .../dto/session/SessionAddRequest.class | Bin 0 -> 1915 bytes ...eRequest$SessionUpdateRequestBuilder.class | Bin 0 -> 1376 bytes .../dto/session/SessionUpdateRequest.class | Bin 0 -> 1377 bytes .../SetAddRequest$SetAddRequestBuilder.class | Bin 0 -> 1040 bytes .../gymbuddy/dto/set/SetAddRequest.class | Bin 0 -> 1053 bytes ...pdateRequest$SetUpdateRequestBuilder.class | Bin 0 -> 1076 bytes .../gymbuddy/dto/set/SetUpdateRequest.class | Bin 0 -> 1083 bytes ...tAddRequest$WorkoutAddRequestBuilder.class | Bin 0 -> 1322 bytes .../dto/workout/WorkoutAddRequest.class | Bin 0 -> 1311 bytes .../repository/PersonRepository.class | Bin 0 -> 708 bytes .../repository/SessionRepository.class | Bin 0 -> 653 bytes .../gymbuddy/repository/SetRepository.class | Bin 0 -> 722 bytes .../repository/WorkoutRepository.class | Bin 0 -> 738 bytes .../gymbuddy/services/PersonService.class | Bin 0 -> 1087 bytes .../gymbuddy/services/SessionService.class | Bin 0 -> 869 bytes .../gymbuddy/services/SetService.class | Bin 0 -> 660 bytes .../gymbuddy/services/WorkoutService.class | Bin 0 -> 619 bytes .../implementation/PersonServiceImpl.class | Bin 0 -> 6411 bytes .../implementation/SessionServiceImpl.class | Bin 0 -> 4494 bytes .../implementation/SetServiceImpl.class | Bin 0 -> 3097 bytes .../implementation/WorkoutServiceImpl.class | Bin 0 -> 3400 bytes .../gymbuddy/ExtractedPropertiesTests.class | Bin 0 -> 14221 bytes .../gymbuddy/FilteringTests$1.class | Bin 0 -> 1404 bytes .../gymbuddy/FilteringTests.class | Bin 0 -> 15508 bytes .../gymbuddy/SoftAssertionTests.class | Bin 0 -> 12812 bytes .../SessionStartedTodayCondition.class | Bin 0 -> 2040 bytes ...sonExtractors$PersonSessionExtractor.class | Bin 0 -> 1290 bytes .../extractors/PersonExtractors.class | Bin 0 -> 762 bytes 77 files changed, 2987 insertions(+) create mode 100644 testing/assertJ/HELP.md create mode 100755 testing/assertJ/mvnw create mode 100644 testing/assertJ/mvnw.cmd create mode 100644 testing/assertJ/pom.xml create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/GymBuddyApplication.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Person.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Set.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Workout.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetAddRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/PersonRepository.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SessionRepository.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SetRepository.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/WorkoutRepository.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/PersonService.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SessionService.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SetService.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/WorkoutService.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.java create mode 100644 testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.java create mode 100644 testing/assertJ/src/main/resources/application.properties create mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java create mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java create mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java create mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.java create mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/extractors/PersonExtractors.java create mode 100644 testing/assertJ/target/classes/application.properties create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Person$PersonBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Person.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Session$SessionBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Session.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Workout$WorkoutBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Workout.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest$SetUpdateRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest$WorkoutAddRequestBuilder.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/PersonRepository.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/WorkoutRepository.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/WorkoutService.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class create mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/ExtractedPropertiesTests.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests$1.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors$PersonSessionExtractor.class create mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class diff --git a/testing/assertJ/HELP.md b/testing/assertJ/HELP.md new file mode 100644 index 0000000..740263d --- /dev/null +++ b/testing/assertJ/HELP.md @@ -0,0 +1,25 @@ +# Getting Started + +### Reference Documentation + +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.5.4/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.5.4/maven-plugin/reference/html/#build-image) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.5.4/reference/htmlsingle/#boot-features-jpa-and-spring-data) +* [Spring Security](https://docs.spring.io/spring-boot/docs/2.5.4/reference/htmlsingle/#boot-features-security) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.5.4/reference/htmlsingle/#boot-features-developing-web-applications) + +### Guides + +The following guides illustrate how to use some features concretely: + +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) +* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) +* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) + diff --git a/testing/assertJ/mvnw b/testing/assertJ/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/testing/assertJ/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/testing/assertJ/mvnw.cmd b/testing/assertJ/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/testing/assertJ/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/testing/assertJ/pom.xml b/testing/assertJ/pom.xml new file mode 100644 index 0000000..ae9a9b6 --- /dev/null +++ b/testing/assertJ/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + com.reflectoring + GymBuddy + 0.0.1-SNAPSHOT + GymBuddy + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-validation + + + junit + junit + 4.13.2 + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/GymBuddyApplication.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/GymBuddyApplication.java new file mode 100644 index 0000000..62a214c --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/GymBuddyApplication.java @@ -0,0 +1,13 @@ +package com.reflectoring.gymbuddy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GymBuddyApplication { + + public static void main(String[] args) { + SpringApplication.run(GymBuddyApplication.class, args); + } + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Person.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Person.java new file mode 100644 index 0000000..b17a80e --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Person.java @@ -0,0 +1,184 @@ +package com.reflectoring.gymbuddy.domain; + +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Entity +@Table(name = "person") +public class Person { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + @NotNull + @NotBlank + private String name; + + @NotNull + @NotBlank + private String lastname; + + @NotNull + @NotBlank + private String email; + + @NotNull + @NotBlank + private String password; + + @ManyToMany(fetch = FetchType.EAGER) + @JoinTable( + name = "friends", + joinColumns = @JoinColumn(name = "a", referencedColumnName = "id",table = "person"), + inverseJoinColumns = @JoinColumn(name = "b", referencedColumnName = "id", table = "person")) + private Set friends; + + @OneToMany(mappedBy = "person",fetch = FetchType.EAGER) + private List sessions; + + public Person(){} + + public Person(long id, String name, String lastname, String email, String password, Set friends, List sessions){ + this.id = id; + this.name = name; + this.lastname = lastname; + this.email = email; + this.password = password; + this.friends = friends; + this.sessions = sessions; + } + private Person(PersonBuilder builder){ + this.id = builder.id; + this.name = builder.name; + this.lastname = builder.lastname; + this.email = builder.email; + this.password = builder.password; + this.friends = builder.friends; + this.sessions = builder.sessions; + } + + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getLastname() { + return lastname; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + + public void setName(String name) { + this.name = name; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public void setEmail(String email) { + this.email = email; + } + + public void setPassword(String password) { + this.password = password; + } + + public Set getFriends() { + return friends; + } + + public List getSessions() { + return sessions; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Person person = (Person) o; + return id == person.id && email.equals(person.email); + } + + @Override + public int hashCode() { + return Objects.hash(id, email); + } + + public static class PersonBuilder{ + private long id; + private String name; + private String lastname; + private String email; + private String password; + private Set friends; + private List sessions; + + public PersonBuilder(){} + + public PersonBuilder id(long id){ + this.id = id; + return this; + } + + public PersonBuilder name(String name){ + this.name = name; + return this; + } + + public PersonBuilder lastname(String lastname){ + this.lastname = lastname; + return this; + } + + public PersonBuilder email(String email){ + this.email = email; + return this; + } + public PersonBuilder password(String password){ + this.password = password; + return this; + } + public PersonBuilder friends(Set friends){ + this.friends = friends; + return this; + } + + public PersonBuilder sessions(List sessions){ + this.sessions = sessions; + return this; + } + + public Person build(){ + return new Person(this); + } + } + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java new file mode 100644 index 0000000..8e40ba1 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java @@ -0,0 +1,120 @@ +package com.reflectoring.gymbuddy.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +@Entity +@Table(name = "session") +public class Session { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime start; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime end; + + @OneToMany(mappedBy = "session", fetch = FetchType.EAGER) + private List workouts; + + @ManyToOne + @JoinColumn(name = "person_id") + private Person person; + + public Session(){} + public Session(long id, LocalDateTime start, LocalDateTime end, List workouts, Person person) { + this.id = id; + this.start = start; + this.end = end; + this.workouts = workouts; + this.person = person; + } + + private Session(SessionBuilder builder){ + this.id = builder.id; + this.start = builder.start; + this.end = builder.end; + this.workouts = builder.workouts; + this.person = builder.person; + } + + public long getId() { + return id; + } + + public LocalDateTime getStart() { + return start; + } + + public LocalDateTime getEnd() { + return end; + } + + public void setStart(LocalDateTime start) { + this.start = start; + } + + public void setEnd(LocalDateTime end) { + this.end = end; + } + + public List getWorkouts() { + return workouts; + } + + public Person getPerson() { + return person; + } + + public static class SessionBuilder{ + private long id; + private LocalDateTime start; + private LocalDateTime end; + private List workouts; + private Person person; + + public SessionBuilder(){} + + public SessionBuilder id(long id){ + this.id = id; + return this; + } + + public SessionBuilder start(LocalDateTime start){ + this.start = start; + return this; + } + + public SessionBuilder end(LocalDateTime end){ + this.end = end; + return this; + } + + public SessionBuilder workouts(List workouts){ + this.workouts = workouts; + return this; + } + + public SessionBuilder person(Person person){ + this.person = person; + return this; + } + + public Session build(){ + return new Session(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Set.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Set.java new file mode 100644 index 0000000..500bc3d --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Set.java @@ -0,0 +1,117 @@ +package com.reflectoring.gymbuddy.domain; + +import java.util.Objects; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +@Entity +@Table(name = "set") +public class Set { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + private long weight; + + private long reps; + + @ManyToOne + @JoinColumn(name = "workout_id") + Workout workout; + + public Set(){} + + public Set(long id, long weight, long reps){ + this.id = id; + this.weight = weight; + this.reps = reps; + } + + private Set(SetBuilder builder){ + this.id = builder.id; + this.weight = builder.weight; + this.reps = builder.reps; + this.workout = builder.workout; + } + + public long getId() { + return id; + } + + public long getWeight() { + return weight; + } + + public long getReps() { + return reps; + } + + public void setWeight(long weight) { + this.weight = weight; + } + + public void setReps(long reps) { + this.reps = reps; + } + + public Workout getWorkout() { + return workout; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Set set = (Set) o; + return id == set.id && weight == set.weight && reps == set.reps; + } + + @Override + public int hashCode() { + return Objects.hash(id, weight, reps); + } + + public static class SetBuilder{ + private long id; + private long weight; + private long reps; + private Workout workout; + + public SetBuilder(){} + + public SetBuilder id(long id){ + this.id = id; + return this; + } + + public SetBuilder weight(long weight){ + this.weight = weight; + return this; + } + + public SetBuilder reps(long reps){ + this.reps = reps; + return this; + } + + public SetBuilder workout(Workout workout){ + this.workout = workout; + return this; + } + + public Set build(){ + return new Set(this); + } + + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Workout.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Workout.java new file mode 100644 index 0000000..f32b0ed --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Workout.java @@ -0,0 +1,99 @@ +package com.reflectoring.gymbuddy.domain; + +import java.util.List; +import java.util.Objects; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +@Entity +@Table(name = "workout") +public class Workout { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + @OneToMany(mappedBy = "workout", fetch = FetchType.EAGER) + private List sets; + + @ManyToOne + @JoinColumn(name = "session_id") + private Session session; + + public Workout(){} + + public Workout(long id, List sets, Session session){ + this.id = id; + this.sets = sets; + this.session = session; + } + + private Workout(WorkoutBuilder builder){ + this.id = builder.id; + this.sets = builder.sets; + this.session = builder.session; + } + + public long getId() { + return id; + } + + public List getSets() { + return sets; + } + + public Session getSession() { + return session; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Workout workout = (Workout) o; + return id == workout.id && sets.equals(workout.sets) && session.equals(workout.session); + } + + @Override + public int hashCode() { + return Objects.hash(id, sets, session); + } + + public static class WorkoutBuilder{ + private long id; + private List sets; + private Session session; + + public WorkoutBuilder(){} + + public WorkoutBuilder id(long id){ + this.id = id; + return this; + } + + public WorkoutBuilder sets(List sets){ + this.sets = sets; + return this; + } + + public WorkoutBuilder session(Session session){ + this.session = session; + return this; + } + + public Workout build(){ + return new Workout(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.java new file mode 100644 index 0000000..0e4b972 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.java @@ -0,0 +1,73 @@ +package com.reflectoring.gymbuddy.dto.person; + + +public class PersonAddRequest { + + private String name; + private String lastname; + private String email; + private String password; + + public PersonAddRequest(String name, String lastname, String email, String password){ + this.name = name; + this.lastname = lastname; + this.email = email; + this.password = password; + } + + private PersonAddRequest(PersonAddRequestBuilder builder){ + this.name = builder.name; + this.lastname = builder.lastname; + this.email = builder.email; + this.password = builder.password; + } + + public String getName() { + return name; + } + + public String getLastname() { + return lastname; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + + public static class PersonAddRequestBuilder{ + private String name; + private String lastname; + private String email; + private String password; + + public PersonAddRequestBuilder(){} + + public PersonAddRequestBuilder name(String name){ + this.name = name; + return this; + } + + public PersonAddRequestBuilder lastname(String lastname){ + this.lastname = lastname; + return this; + } + + public PersonAddRequestBuilder email(String email){ + this.email = email; + return this; + } + + public PersonAddRequestBuilder password(String password){ + this.password = password; + return this; + } + + public PersonAddRequest build(){ + return new PersonAddRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.java new file mode 100644 index 0000000..7210112 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.java @@ -0,0 +1,73 @@ +package com.reflectoring.gymbuddy.dto.person; + + +public class PersonUpdateRequest { + + private String name; + private String lastname; + private String email; + private String password; + + public PersonUpdateRequest(String name, String lastname, String email, String password){ + this.name = name; + this.lastname = lastname; + this.email = email; + this.password = password; + } + + private PersonUpdateRequest(PersonUpdateRequestBuilder builder){ + this.name = builder.name; + this.lastname = builder.lastname; + this.email = builder.email; + this.password = builder.password; + } + + public String getName() { + return name; + } + + public String getLastname() { + return lastname; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + + public class PersonUpdateRequestBuilder{ + private String name; + private String lastname; + private String email; + private String password; + + public PersonUpdateRequestBuilder(){} + + public PersonUpdateRequestBuilder name(String name){ + this.name = name; + return this; + } + + public PersonUpdateRequestBuilder lastname(String lastname){ + this.lastname = lastname; + return this; + } + + public PersonUpdateRequestBuilder email(String email){ + this.email = email; + return this; + } + + public PersonUpdateRequestBuilder password(String password){ + this.password = password; + return this; + } + + public PersonUpdateRequest build(){ + return new PersonUpdateRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.java new file mode 100644 index 0000000..3135ae4 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.java @@ -0,0 +1,68 @@ +package com.reflectoring.gymbuddy.dto.session; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import java.time.LocalDateTime; +import java.util.List; + +public class SessionAddRequest { + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime start; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime end; + + private List workouts; + + public SessionAddRequest(LocalDateTime start, LocalDateTime end, List workouts){ + this.start = start; + this.end = end; + this.workouts = workouts; + } + + private SessionAddRequest(SessionAddRequestBuilder builder){ + this.start = builder.start; + this.end = builder.end; + this.workouts = builder.workouts; + } + + public LocalDateTime getStart() { + return start; + } + + public LocalDateTime getEnd() { + return end; + } + + public List getWorkouts() { + return workouts; + } + + public static class SessionAddRequestBuilder{ + private LocalDateTime start; + private LocalDateTime end; + private List workouts; + + public SessionAddRequestBuilder(){} + + public SessionAddRequestBuilder start(LocalDateTime start){ + this.start = start; + return this; + } + + public SessionAddRequestBuilder end(LocalDateTime end){ + this.end = end; + return this; + } + + public SessionAddRequestBuilder workouts(List workouts){ + this.workouts = workouts; + return this; + } + + public SessionAddRequest build(){ + return new SessionAddRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.java new file mode 100644 index 0000000..294c8b4 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.java @@ -0,0 +1,56 @@ +package com.reflectoring.gymbuddy.dto.session; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import java.time.LocalDateTime; +import java.util.List; + +public class SessionUpdateRequest { + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime start; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime end; + + + public SessionUpdateRequest(LocalDateTime start, LocalDateTime end){ + this.start = start; + this.end = end; + } + + private SessionUpdateRequest(SessionUpdateRequestBuilder builder){ + this.start = builder.start; + this.end = builder.end; + } + + public LocalDateTime getStart() { + return start; + } + + public LocalDateTime getEnd() { + return end; + } + + + public class SessionUpdateRequestBuilder{ + private LocalDateTime start; + private LocalDateTime end; + + public SessionUpdateRequestBuilder(){} + + public SessionUpdateRequestBuilder start(LocalDateTime start){ + this.start = start; + return this; + } + + public SessionUpdateRequestBuilder end(LocalDateTime end){ + this.end = end; + return this; + } + + public SessionUpdateRequest build(){ + return new SessionUpdateRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetAddRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetAddRequest.java new file mode 100644 index 0000000..c0b2fc7 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetAddRequest.java @@ -0,0 +1,47 @@ +package com.reflectoring.gymbuddy.dto.set; + +public class SetAddRequest { + + private long weight; + + private long reps; + + public SetAddRequest(long weight, long reps){ + this.weight = weight; + this.reps = reps; + } + + public SetAddRequest(SetAddRequestBuilder builder){ + this.weight = builder.weight; + this.reps = builder.reps; + } + + public long getWeight() { + return weight; + } + + public long getReps() { + return reps; + } + + public static class SetAddRequestBuilder{ + private long weight; + private long reps; + + public SetAddRequestBuilder(){} + + public SetAddRequestBuilder weight(long weight){ + this.weight = weight; + return this; + } + + public SetAddRequestBuilder reps(long reps){ + this.reps = reps; + return this; + } + + public SetAddRequest build(){ + return new SetAddRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.java new file mode 100644 index 0000000..46f2cb3 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.java @@ -0,0 +1,46 @@ +package com.reflectoring.gymbuddy.dto.set; + +public class SetUpdateRequest { + private long weight; + + private long reps; + + public SetUpdateRequest(long weight, long reps){ + this.weight = weight; + this.reps = reps; + } + + public SetUpdateRequest(SetUpdateRequestBuilder builder){ + this.weight = builder.weight; + this.reps = builder.reps; + } + + public long getWeight() { + return weight; + } + + public long getReps() { + return reps; + } + + public static class SetUpdateRequestBuilder{ + private long weight; + private long reps; + + public SetUpdateRequestBuilder(){} + + public SetUpdateRequestBuilder weight(long weight){ + this.weight = weight; + return this; + } + + public SetUpdateRequestBuilder reps(long reps){ + this.reps = reps; + return this; + } + + public SetUpdateRequest build(){ + return new SetUpdateRequest(this); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.java new file mode 100644 index 0000000..e95b518 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.java @@ -0,0 +1,37 @@ +package com.reflectoring.gymbuddy.dto.workout; + +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import java.util.List; + +public class WorkoutAddRequest { + + private List sets; + + public List getSets(){ + return this.sets; + } + + public WorkoutAddRequest(List sets){ + this.sets = sets; + } + + public WorkoutAddRequest(WorkoutAddRequestBuilder builder){ + this.sets = builder.sets; + } + + public static class WorkoutAddRequestBuilder{ + private List sets; + + public WorkoutAddRequestBuilder(){} + + public WorkoutAddRequestBuilder sets(List sets){ + this.sets = sets; + return this; + } + + public WorkoutAddRequest build(){ + return new WorkoutAddRequest(this); + } + } + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/PersonRepository.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/PersonRepository.java new file mode 100644 index 0000000..b8dbdb3 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/PersonRepository.java @@ -0,0 +1,15 @@ +package com.reflectoring.gymbuddy.repository; + +import com.reflectoring.gymbuddy.domain.Person; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface PersonRepository extends JpaRepository { + + Optional findByEmail(String email); + + void deleteByEmail(String email); + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SessionRepository.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SessionRepository.java new file mode 100644 index 0000000..407ff54 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SessionRepository.java @@ -0,0 +1,13 @@ +package com.reflectoring.gymbuddy.repository; + +import com.reflectoring.gymbuddy.domain.Session; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SessionRepository extends JpaRepository { + + List getAllByPersonEmail(String email); + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SetRepository.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SetRepository.java new file mode 100644 index 0000000..ef4322a --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/SetRepository.java @@ -0,0 +1,13 @@ +package com.reflectoring.gymbuddy.repository; + +import com.reflectoring.gymbuddy.domain.Set; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface SetRepository extends JpaRepository { + + List findAllByWorkout(@Param("workout") long id); +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/WorkoutRepository.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/WorkoutRepository.java new file mode 100644 index 0000000..c79a31e --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/repository/WorkoutRepository.java @@ -0,0 +1,12 @@ +package com.reflectoring.gymbuddy.repository; + +import com.reflectoring.gymbuddy.domain.Workout; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface WorkoutRepository extends JpaRepository { + List findAllBySession(@Param("session") long id); +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/PersonService.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/PersonService.java new file mode 100644 index 0000000..8143a3a --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/PersonService.java @@ -0,0 +1,27 @@ +package com.reflectoring.gymbuddy.services; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; +import com.reflectoring.gymbuddy.dto.person.PersonUpdateRequest; +import java.util.List; + +public interface PersonService { + + Person add(PersonAddRequest request); + + Person update(String email, PersonUpdateRequest request); + + Person get(String email); + + List getAll(); + + void delete(String email); + + List getFriends(String email); + + Person addFriend(String email, String friendEmail); + + Person deleteFriend(String email, String friendEmail); + + Person getFriend(String email, String friendEmail); +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SessionService.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SessionService.java new file mode 100644 index 0000000..a85d676 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SessionService.java @@ -0,0 +1,21 @@ +package com.reflectoring.gymbuddy.services; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; +import com.reflectoring.gymbuddy.dto.session.SessionUpdateRequest; +import java.util.List; + +public interface SessionService { + + Session add(Person person, SessionAddRequest request); + + Session update(long id, SessionUpdateRequest request); + + Session get(long id); + + List getAll(); + + List getForPerson(String email); + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SetService.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SetService.java new file mode 100644 index 0000000..26337d4 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/SetService.java @@ -0,0 +1,19 @@ +package com.reflectoring.gymbuddy.services; + +import com.reflectoring.gymbuddy.domain.Set; +import com.reflectoring.gymbuddy.domain.Workout; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.set.SetUpdateRequest; +import java.util.List; + +public interface SetService { + + Set add(Workout workout, SetAddRequest request); + + Set update(long id,SetUpdateRequest request); + + List getSetsOfWorkout(long workoutId); + + void delete(long id); + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/WorkoutService.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/WorkoutService.java new file mode 100644 index 0000000..d4b91dc --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/WorkoutService.java @@ -0,0 +1,18 @@ +package com.reflectoring.gymbuddy.services; + +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.domain.Workout; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import java.util.List; + +public interface WorkoutService { + + Workout add(Session session, WorkoutAddRequest request); + + List getAll(long sessionId); + + Workout get(long id); + + void delete(long id); + +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.java new file mode 100644 index 0000000..a582fb8 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.java @@ -0,0 +1,126 @@ +package com.reflectoring.gymbuddy.services.implementation; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Person.PersonBuilder; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; +import com.reflectoring.gymbuddy.dto.person.PersonUpdateRequest; +import com.reflectoring.gymbuddy.repository.PersonRepository; +import com.reflectoring.gymbuddy.services.PersonService; +import com.reflectoring.gymbuddy.services.SessionService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import org.springframework.stereotype.Service; + +@Service +public class PersonServiceImpl implements PersonService { + + private PersonRepository personRepository; + + private SessionService sessionService; + + public PersonServiceImpl(PersonRepository personRepository, SessionService sessionService){ + this.personRepository = personRepository; + this.sessionService = sessionService; + } + + @Override + public Person add(PersonAddRequest request) { + Person person = new PersonBuilder() + .email(request.getEmail()) + .name(request.getName()) + .lastname(request.getLastname()) + .password(request.getPassword()) + .friends(new HashSet<>()) + .sessions(new ArrayList<>()) + .build(); + + person = personRepository.save(person); + + return person; + } + + @Override + public Person update(String email, PersonUpdateRequest request) { + Optional person = personRepository.findByEmail(email); + if(person.isPresent()){ + person.get().setEmail(request.getEmail()); + person.get().setName(request.getName()); + person.get().setLastname(request.getLastname()); + person.get().setPassword(request.getPassword()); + + return personRepository.save(person.get()); + }else{ + throw new RuntimeException(); + } + } + + @Override + public Person get(String email) { + Optional person = personRepository.findByEmail(email); + if(person.isPresent()){ + return personRepository.findByEmail(email).get(); + }else{ + throw new RuntimeException(); + } + } + + @Override + public List getAll() { + return personRepository.findAll(); + } + + @Override + public void delete(String email) { + personRepository.deleteByEmail(email); + } + + @Override + public List getFriends(String email) { + Optional person = personRepository.findByEmail(email); + if(person.isPresent()){ + return person.get().getFriends().stream().collect(Collectors.toList()); + }else{ + throw new RuntimeException(); + } + } + + @Override + public Person addFriend(String email, String friendEmail) { + Optional person = personRepository.findByEmail(email); + Optional friend = personRepository.findByEmail(friendEmail); + if (person.isPresent() && friend.isPresent()) { + person.get().getFriends().add(friend.get()); + return personRepository.save(person.get()); + } else { + throw new RuntimeException(); + } + } + + @Override + public Person deleteFriend(String email, String friendEmail) { + Optional person = personRepository.findByEmail(email); + if (person.isPresent() ) { + person.get().getFriends().removeIf(x -> x.getEmail().equals(friendEmail)); + return personRepository.save(person.get()); + } else { + throw new RuntimeException(); + } } + + @Override + public Person getFriend(String email, String friendEmail) { + Optional person = personRepository.findByEmail(email); + if (person.isPresent() ) { + Optional friend = person.get().getFriends().stream().filter(x -> x.getEmail().equals(friendEmail)).findFirst(); + if(friend.isPresent()) { + return friend.get(); + } else { + throw new RuntimeException(); + } + } else { + throw new RuntimeException(); + } + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.java new file mode 100644 index 0000000..f050036 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.java @@ -0,0 +1,78 @@ +package com.reflectoring.gymbuddy.services.implementation; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.domain.Session.SessionBuilder; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; +import com.reflectoring.gymbuddy.dto.session.SessionUpdateRequest; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import com.reflectoring.gymbuddy.repository.SessionRepository; +import com.reflectoring.gymbuddy.services.SessionService; +import com.reflectoring.gymbuddy.services.WorkoutService; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +public class SessionServiceImpl implements SessionService { + + private SessionRepository sessionRepository; + + private WorkoutService workoutService; + + public SessionServiceImpl(SessionRepository sessionRepository, WorkoutService workoutService){ + this.sessionRepository = sessionRepository; + this.workoutService = workoutService; + } + + @Override + public Session add(Person person, SessionAddRequest request) { + + Session session = new SessionBuilder() + .start(request.getStart()) + .end(request.getEnd()) + .person(person) + .workouts(new ArrayList<>()) + .build(); + + session = sessionRepository.save(session); + + for(WorkoutAddRequest workoutRequest : request.getWorkouts()){ + session.getWorkouts().add(workoutService.add(session, workoutRequest)); + } + + return session; + + } + + @Override + public Session update(long id, SessionUpdateRequest request) { + + Optional session = sessionRepository.findById(id); + if(session.isPresent()){ + session.get().setStart(request.getStart()); + session.get().setEnd(request.getEnd()); + + return sessionRepository.save(session.get()); + }else{ + throw new RuntimeException(); + } + + } + + @Override + public Session get(long id) { + return sessionRepository.getById(id); + } + + @Override + public List getAll() { + return sessionRepository.findAll(); + } + + @Override + public List getForPerson(String email) { + return sessionRepository.getAllByPersonEmail(email); + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.java new file mode 100644 index 0000000..5031f84 --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.java @@ -0,0 +1,56 @@ +package com.reflectoring.gymbuddy.services.implementation; + +import com.reflectoring.gymbuddy.domain.Set; +import com.reflectoring.gymbuddy.domain.Set.SetBuilder; +import com.reflectoring.gymbuddy.domain.Workout; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.set.SetUpdateRequest; +import com.reflectoring.gymbuddy.repository.SetRepository; +import com.reflectoring.gymbuddy.services.SetService; +import java.util.List; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +public class SetServiceImpl implements SetService { + private SetRepository setRepository; + + public SetServiceImpl(SetRepository setRepository){ + this.setRepository = setRepository; + } + @Override + public Set add(Workout workout, SetAddRequest request) { + Set set = new SetBuilder() + .reps(request.getReps()) + .weight(request.getWeight()) + .workout(workout) + .build(); + + set = setRepository.save(set); + return set; + } + + @Override + public Set update(long id,SetUpdateRequest request) { + Optional set = setRepository.findById(id); + if(set.isPresent()){ + set.get().setWeight(request.getWeight()); + set.get().setReps(request.getReps()); + return setRepository.save(set.get()); + }else{ + throw new RuntimeException(); + } + } + + @Override + public List getSetsOfWorkout(long workoutId) { + + return setRepository.findAllByWorkout(workoutId); + + } + + @Override + public void delete(long id) { + setRepository.deleteById(id); + } +} diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.java new file mode 100644 index 0000000..0cdf45c --- /dev/null +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.java @@ -0,0 +1,58 @@ +package com.reflectoring.gymbuddy.services.implementation; + +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.domain.Workout; +import com.reflectoring.gymbuddy.domain.Workout.WorkoutBuilder; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import com.reflectoring.gymbuddy.repository.WorkoutRepository; +import com.reflectoring.gymbuddy.services.SetService; +import com.reflectoring.gymbuddy.services.WorkoutService; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class WorkoutServiceImpl implements WorkoutService { + + private WorkoutRepository workoutRepository; + + private SetService setService; + + public WorkoutServiceImpl(WorkoutRepository workoutRepository, SetService setService){ + this.workoutRepository = workoutRepository; + this.setService = setService; + } + + @Override + @Transactional + public Workout add(Session session, WorkoutAddRequest request) { + Workout workout = new WorkoutBuilder() + .session(session) + .sets(new ArrayList<>()) + .build(); + workout = workoutRepository.save(workout); + + for(SetAddRequest setRequest : request.getSets()){ + workout.getSets().add(setService.add(workout, setRequest)); + } + + return workout; + } + + @Override + public List getAll(long sessionId) { + return workoutRepository.findAllBySession(sessionId); + } + + @Override + public Workout get(long id) { + return workoutRepository.getById(id); + } + + @Override + public void delete(long id) { + workoutRepository.deleteById(id); + } +} diff --git a/testing/assertJ/src/main/resources/application.properties b/testing/assertJ/src/main/resources/application.properties new file mode 100644 index 0000000..365be0a --- /dev/null +++ b/testing/assertJ/src/main/resources/application.properties @@ -0,0 +1,12 @@ +spring.application.name=Gym Buddy + +spring.datasource.url=jdbc:h2:mem:gymbuddy +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=reflectoring +spring.datasource.password=reflectoring +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect + +spring.jpa.hibernate.ddl-auto=create-drop + +spring.h2.console.enabled=true +spring.h2.console.path=/h2 diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java new file mode 100644 index 0000000..d417e6a --- /dev/null +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java @@ -0,0 +1,317 @@ +package com.reflectoring.gymbuddy; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import com.reflectoring.gymbuddy.extractors.PersonExtractors; +import com.reflectoring.gymbuddy.services.PersonService; +import com.reflectoring.gymbuddy.services.SessionService; +import com.reflectoring.gymbuddy.services.SetService; +import com.reflectoring.gymbuddy.services.WorkoutService; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.*; + +@SpringBootTest +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class ExtractedPropertiesTests { + + @Autowired + PersonService personService; + + @Autowired + SessionService sessionService; + + @Autowired + WorkoutService workoutService; + + @Autowired + SetService setService; + + + @BeforeAll + void init() { + // Adding persons + PersonAddRequest ironmanReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Tony") + .lastname("Stark") + .email("tony.stark@avengers.com") + .password("avengers") + .build(); + PersonAddRequest hulkReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Bruce") + .lastname("Banner") + .email("bruce.banner@avengers.com") + .password("avengers") + .build(); + PersonAddRequest marvelReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Carol") + .lastname("Danvers") + .email("carol.danvers@avengers.com") + .password("avengers") + .build(); + PersonAddRequest widowReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Natalia") + .lastname("Romanova") + .email("natalia.romanova@avengers.com") + .password("avengers") + .build(); + + Person ironman = personService.add(ironmanReq); + Person hulk = personService.add(hulkReq); + Person marvel = personService.add(marvelReq); + Person widow = personService.add(widowReq); + + // Adding friends to each person + personService.addFriend(ironman.getEmail(), hulk.getEmail()); + personService.addFriend(ironman.getEmail(), widow.getEmail()); + + personService.addFriend(hulk.getEmail(), widow.getEmail()); + personService.addFriend(hulk.getEmail(), marvel.getEmail()); + + // Sets requests + SetAddRequest pushupSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest pushupSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + + SetAddRequest pullupsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(20) + .build(); + SetAddRequest pullupsSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest pullupsSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(35) + .build(); + SetAddRequest pullupsSetV4 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + + SetAddRequest squatsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(120) + .reps(20) + .build(); + + SetAddRequest deadliftsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(80) + .reps(40) + .build(); + SetAddRequest deadliftsSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(150) + .reps(20) + .build(); + SetAddRequest deadliftsSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(250) + .reps(5) + .build(); + + SetAddRequest hiitSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + SetAddRequest hiitSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest hiitSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest hiitSetV4 = new SetAddRequest.SetAddRequestBuilder() + .weight(50) + .reps(40) + .build(); + SetAddRequest hiitSetV5 = new SetAddRequest.SetAddRequestBuilder() + .weight(100) + .reps(5) + .build(); + + + // Workout requests + WorkoutAddRequest pushups = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(pushupSetV1, pushupSetV1, pushupSetV2, pushupSetV1, pushupSetV2)) + .build(); + WorkoutAddRequest pullups = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(pullupsSetV1, pullupsSetV2, pullupsSetV1, pullupsSetV4, pullupsSetV3)) + .build(); + WorkoutAddRequest squats = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1)) + .build(); + WorkoutAddRequest deadlifts = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(deadliftsSetV1, deadliftsSetV2, deadliftsSetV1, deadliftsSetV2, deadliftsSetV3)) + .build(); + WorkoutAddRequest hiit = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(hiitSetV1, hiitSetV2, hiitSetV3, hiitSetV4, hiitSetV5)) + .build(); + + // Adding session to each + SessionAddRequest ironmanSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest ironmanSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(2)) + .end(LocalDateTime.now().minusDays(2).plusHours(3)) + .workouts(List.of(deadlifts, squats)) + .build(); + SessionAddRequest ironmanSessionThree = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(3)) + .end(LocalDateTime.now().minusDays(3).plusHours(2)) + .workouts(List.of(hiit)) + .build(); + + SessionAddRequest hulkSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(3)) + .workouts(List.of(squats, deadlifts)) + .build(); + SessionAddRequest hulkSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(4)) + .end(LocalDateTime.now().minusDays(4).plusHours(2)) + .workouts(List.of(pullups, pushups, hiit)) + .build(); + + SessionAddRequest marvelSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest marvelSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(5)) + .end(LocalDateTime.now().minusDays(5).plusHours(4)) + .workouts(List.of(deadlifts, squats)) + .build(); + SessionAddRequest marvelSessionThree = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(1)) + .end(LocalDateTime.now().minusDays(1).plusHours(1)) + .workouts(List.of(hiit)) + .build(); + SessionAddRequest marvelSessionFour = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(10)) + .end(LocalDateTime.now().minusDays(10).plusHours(5)) + .workouts(List.of(pushups, pullups, squats, deadlifts)) + .build(); + + SessionAddRequest widowSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(4)) + .workouts(List.of(hiit, squats)) + .build(); + + // Adding sessions to persons + sessionService.add(ironman, ironmanSessionOne); + sessionService.add(ironman, ironmanSessionTwo); + sessionService.add(ironman, ironmanSessionThree); + + sessionService.add(hulk, hulkSessionOne); + sessionService.add(hulk, hulkSessionTwo); + + sessionService.add(marvel, marvelSessionOne); + sessionService.add(marvel, marvelSessionTwo); + sessionService.add(marvel, marvelSessionThree); + sessionService.add(marvel, marvelSessionFour); + + sessionService.add(widow, widowSessionOne); + } + + @Test + void checkByName_NotUsingExtracting(){ + assertThat(personService.getAll().stream().map(person -> person.getName()).collect(Collectors.toList())) + .contains("Tony", "Bruce", "Carol","Natalia") + .doesNotContain("Peter","Steve"); + } + + @Test + void checkByNameAndLastname_NotUsingExtracting(){ + assertThat(personService.getAll().stream().map(person -> tuple(person.getName(), person.getLastname())).collect(Collectors.toList())) + .contains(tuple("Tony","Stark"), tuple("Carol", "Danvers"), tuple("Bruce", "Banner"),tuple("Natalia","Romanova")) + .doesNotContain(tuple("Peter", "Parker"), tuple("Steve","Rogers")); + } + + @Test + void checkByName_UsingExtracting(){ + assertThat(personService.getAll()) + .extracting("name") + .contains("Tony","Bruce","Carol","Natalia") + .doesNotContain("Peter","Steve"); + } + + @Test + void checkByNameAndLastname_UsingExtracting(){ + assertThat(personService.getAll()) + .extracting("name","lastname") + .contains(tuple("Tony","Stark"), tuple("Carol", "Danvers"), tuple("Bruce", "Banner"),tuple("Natalia","Romanova")) + .doesNotContain(tuple("Peter", "Parker"), tuple("Steve","Rogers")); + } + + @Test + void checkByNestedAtrribute_UsingExtracting(){ + assertThat(sessionService.getAll()) + .filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony","Bruce","Carol","Natalia"); + } + + @Test + void checkByNestedAtrribute_PersonIsNUll_UsingExtracting(){ + List sessions = sessionService.getAll().stream().map( + session -> { + if(session.getPerson().getName().equals("Tony")){ + return new Session.SessionBuilder() + .id(session.getId()) + .start(session.getStart()) + .end(session.getEnd()) + .workouts(session.getWorkouts()) + .person(null) + .build(); + } + return session; + } + ).collect(Collectors.toList()); + + assertThat(sessions) + .filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Bruce","Carol","Natalia"); + } + + // ----------- Flatmap extracting --------- + + @Test + void filterOnAllSessionsThatAreFromToday_flatMapExtracting(){ + assertThat(personService.getAll()).flatExtracting("sessions") + .filteredOn(session -> ((Session)session).getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony", "Carol","Bruce","Natalia"); + } + + @Test + void filterOnAllSessionsThatAreFromToday_flatMapExtractingMethod(){ + assertThat(personService.getAll()).flatExtracting(PersonExtractors.sessions()) + .filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony", "Carol","Bruce","Natalia"); + } + +} \ No newline at end of file diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java new file mode 100644 index 0000000..bfe42eb --- /dev/null +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java @@ -0,0 +1,352 @@ +package com.reflectoring.gymbuddy; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.in; + +import com.reflectoring.gymbuddy.conditions.SessionStartedTodayCondition; +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Session; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest.PersonAddRequestBuilder; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest.SessionAddRequestBuilder; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest.SetAddRequestBuilder; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest.WorkoutAddRequestBuilder; +import com.reflectoring.gymbuddy.services.PersonService; +import com.reflectoring.gymbuddy.services.SessionService; +import com.reflectoring.gymbuddy.services.SetService; +import com.reflectoring.gymbuddy.services.WorkoutService; +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +import org.assertj.core.api.Condition; +import org.junit.jupiter.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class FilteringTests { + + @Autowired + PersonService personService; + + @Autowired + SessionService sessionService; + + @Autowired + WorkoutService workoutService; + + @Autowired + SetService setService; + + + @BeforeAll + void init(){ + // Adding persons + PersonAddRequest ironmanReq = new PersonAddRequestBuilder() + .name("Tony") + .lastname("Stark") + .email("tony.stark@avengers.com") + .password("avengers") + .build(); + PersonAddRequest hulkReq = new PersonAddRequestBuilder() + .name("Bruce") + .lastname("Banner") + .email("bruce.banner@avengers.com") + .password("avengers") + .build(); + PersonAddRequest marvelReq = new PersonAddRequestBuilder() + .name("Carol") + .lastname("Danvers") + .email("carol.danvers@avengers.com") + .password("avengers") + .build(); + PersonAddRequest widowReq = new PersonAddRequestBuilder() + .name("Natalia") + .lastname("Romanova") + .email("natalia.romanova@avengers.com") + .password("avengers") + .build(); + + Person ironman = personService.add(ironmanReq); + Person hulk = personService.add(hulkReq); + Person marvel = personService.add(marvelReq); + Person widow = personService.add(widowReq); + + // Adding friends to each person + personService.addFriend(ironman.getEmail(), hulk.getEmail()); + personService.addFriend(ironman.getEmail(),widow.getEmail()); + + personService.addFriend(hulk.getEmail(), widow.getEmail()); + personService.addFriend(hulk.getEmail(), marvel.getEmail()); + + // Sets requests + SetAddRequest pushupSetV1 = new SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest pushupSetV2 = new SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + + SetAddRequest pullupsSetV1 = new SetAddRequestBuilder() + .weight(0) + .reps(20) + .build(); + SetAddRequest pullupsSetV2 = new SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest pullupsSetV3 = new SetAddRequestBuilder() + .weight(0) + .reps(35) + .build(); + SetAddRequest pullupsSetV4 = new SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + + SetAddRequest squatsSetV1 = new SetAddRequestBuilder() + .weight(120) + .reps(20) + .build(); + + SetAddRequest deadliftsSetV1 = new SetAddRequestBuilder() + .weight(80) + .reps(40) + .build(); + SetAddRequest deadliftsSetV2 = new SetAddRequestBuilder() + .weight(150) + .reps(20) + .build(); + SetAddRequest deadliftsSetV3 = new SetAddRequestBuilder() + .weight(250) + .reps(5) + .build(); + + SetAddRequest hiitSetV1 = new SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + SetAddRequest hiitSetV2 = new SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest hiitSetV3 = new SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest hiitSetV4 = new SetAddRequestBuilder() + .weight(50) + .reps(40) + .build(); + SetAddRequest hiitSetV5 = new SetAddRequestBuilder() + .weight(100) + .reps(5) + .build(); + + + // Workout requests + WorkoutAddRequest pushups = new WorkoutAddRequestBuilder() + .sets(List.of(pushupSetV1, pushupSetV1, pushupSetV2, pushupSetV1, pushupSetV2)) + .build(); + WorkoutAddRequest pullups = new WorkoutAddRequestBuilder() + .sets(List.of(pullupsSetV1, pullupsSetV2, pullupsSetV1, pullupsSetV4, pullupsSetV3)) + .build(); + WorkoutAddRequest squats = new WorkoutAddRequestBuilder() + .sets(List.of(squatsSetV1,squatsSetV1,squatsSetV1,squatsSetV1,squatsSetV1,squatsSetV1)) + .build(); + WorkoutAddRequest deadlifts = new WorkoutAddRequestBuilder() + .sets(List.of(deadliftsSetV1, deadliftsSetV2, deadliftsSetV1, deadliftsSetV2, deadliftsSetV3)) + .build(); + WorkoutAddRequest hiit = new WorkoutAddRequestBuilder() + .sets(List.of(hiitSetV1,hiitSetV2,hiitSetV3,hiitSetV4,hiitSetV5)) + .build(); + + // Adding session to each + SessionAddRequest ironmanSessionOne = new SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest ironmanSessionTwo = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(2)) + .end(LocalDateTime.now().minusDays(2).plusHours(3)) + .workouts(List.of(deadlifts,squats)) + .build(); + SessionAddRequest ironmanSessionThree = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(3)) + .end(LocalDateTime.now().minusDays(3).plusHours(2)) + .workouts(List.of(hiit)) + .build(); + + SessionAddRequest hulkSessionOne = new SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(3)) + .workouts(List.of(squats, deadlifts)) + .build(); + SessionAddRequest hulkSessionTwo = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(4)) + .end(LocalDateTime.now().minusDays(4).plusHours(2)) + .workouts(List.of(pullups, pushups, hiit)) + .build(); + + SessionAddRequest marvelSessionOne = new SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest marvelSessionTwo = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(5)) + .end(LocalDateTime.now().minusDays(5).plusHours(4)) + .workouts(List.of(deadlifts, squats)) + .build(); + SessionAddRequest marvelSessionThree = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(1)) + .end(LocalDateTime.now().minusDays(1).plusHours(1)) + .workouts(List.of(hiit)) + .build(); + SessionAddRequest marvelSessionFour = new SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(10)) + .end(LocalDateTime.now().minusDays(10).plusHours(5)) + .workouts(List.of(pushups, pullups, squats, deadlifts)) + .build(); + + SessionAddRequest widowSessionOne = new SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(4)) + .workouts(List.of(hiit, squats)) + .build(); + + // Adding sessions to persons + sessionService.add(ironman,ironmanSessionOne); + sessionService.add(ironman,ironmanSessionTwo); + sessionService.add(ironman, ironmanSessionThree); + + sessionService.add(hulk, hulkSessionOne); + sessionService.add(hulk, hulkSessionTwo); + + sessionService.add(marvel, marvelSessionOne); + sessionService.add(marvel, marvelSessionTwo); + sessionService.add(marvel, marvelSessionThree); + sessionService.add(marvel, marvelSessionFour); + + sessionService.add(widow, widowSessionOne); + } + + // ---------- Predicate filtering ------------ + @Test + void checkIfTonyIsInList_basicFiltering(){ + assertThat(personService.getAll()).filteredOn(person -> person.getName().equals("Tony")).isNotEmpty(); + } + + @Test + void checkIfTonyIsInList_NullValue_basicFiltering(){ + List sessions = sessionService.getAll().stream().map( + session -> { + if(session.getPerson().getName().equals("Tony")){ + return new Session.SessionBuilder() + .id(session.getId()) + .start(session.getStart()) + .end(session.getEnd()) + .workouts(session.getWorkouts()) + .person(null) + .build(); + } + return session; + } + ).collect(Collectors.toList()); + + assertThat(sessions).filteredOn(session -> session.getPerson().getName().equals("Tony")).isEmpty(); + } + + // How to filter when list is inside list + // Check how many sessions there are that are done today + // Filtering on nested properties + + @Test + void filterOnAllSessionsThatAreFromToday_nestedFiltering() { + assertThat(personService.getAll()) + .map(person -> person.getSessions().stream().filter(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))).count()) + .filteredOn(session -> session > 0).size().isEqualTo(4); + } + + //Filtering on complex conditions + @Test + void filterOnNameContainsOAndNumberOfFriends_complexFiltering(){ + assertThat(personService.getAll()) + .filteredOn(person -> person.getName().contains("o") && person.getFriends().size() > 1) + .hasSize(1); + } + + + // -------------- Field filtering -------------- + + @Test + void checkIfTonyIsInList_basicFieldFiltering(){ + assertThat(personService.getAll()).filteredOn("names", "Tony").isNotEmpty(); + } + + @Test + void checkIfTonyIsInList_NullValue_basicFieldFiltering(){ + List sessions = sessionService.getAll().stream().map( + session -> { + if(session.getPerson().getName().equals("Tony")){ + return new Session.SessionBuilder() + .id(session.getId()) + .start(session.getStart()) + .end(session.getEnd()) + .workouts(session.getWorkouts()) + .person(null) + .build(); + } + return session; + } + ).collect(Collectors.toList()); + + assertThat(sessions).filteredOn("person.name","Tony").isEmpty(); + } + //Filtering on complex conditions + @Test + void filterOnNameContainsOAndNumberOfFriends_complexFieldFiltering() { + assertThat(personService.getAll()) + .filteredOn("name", in("Tony","Carol")) + .filteredOn(person -> person.getFriends().size() > 1) + .hasSize(1); + } + + // ---------- Custom condition filtering ------------ + + // How to filter when list is inside list + // Check how many sessions there are that are done today + // Filtering on nested properties + + @Test + void filterOnAllSessionsThatAreFromToday_customConditionFiltering() { + Condition sessionStartedToday = new SessionStartedTodayCondition(); + assertThat(personService.getAll()) + .filteredOn(sessionStartedToday) + .hasSize(4); + } + + //Filtering on complex conditions + @Test + void filterOnNameContainsOAndNumberOfFriends_customConditionFiltering(){ + Condition nameAndFriendsCondition = new Condition<>(){ + @Override + public boolean matches(Person person){ + return person.getName().contains("o") && person.getFriends().size() > 1; + } + }; + assertThat(personService.getAll()) + .filteredOn(nameAndFriendsCondition) + .hasSize(1); + } + + +} diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java new file mode 100644 index 0000000..fa31b48 --- /dev/null +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java @@ -0,0 +1,288 @@ +package com.reflectoring.gymbuddy; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; +import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; +import com.reflectoring.gymbuddy.dto.set.SetAddRequest; +import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; +import com.reflectoring.gymbuddy.extractors.PersonExtractors; +import com.reflectoring.gymbuddy.services.PersonService; +import com.reflectoring.gymbuddy.services.SessionService; +import com.reflectoring.gymbuddy.services.SetService; +import com.reflectoring.gymbuddy.services.WorkoutService; +import org.assertj.core.api.AutoCloseableSoftAssertions; +import org.assertj.core.api.JUnitSoftAssertions; +import org.assertj.core.api.SoftAssertions; +import org.junit.Rule; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.time.LocalDateTime; +import java.util.List; +import static org.assertj.core.api.Assertions.tuple; + +@SpringBootTest +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class SoftAssertionTests { + + @Autowired + PersonService personService; + + @Autowired + SessionService sessionService; + + @Autowired + WorkoutService workoutService; + + @Autowired + SetService setService; + + + @BeforeAll + void init() { + // Adding persons + PersonAddRequest ironmanReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Tony") + .lastname("Stark") + .email("tony.stark@avengers.com") + .password("avengers") + .build(); + PersonAddRequest hulkReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Bruce") + .lastname("Banner") + .email("bruce.banner@avengers.com") + .password("avengers") + .build(); + PersonAddRequest marvelReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Carol") + .lastname("Danvers") + .email("carol.danvers@avengers.com") + .password("avengers") + .build(); + PersonAddRequest widowReq = new PersonAddRequest.PersonAddRequestBuilder() + .name("Natalia") + .lastname("Romanova") + .email("natalia.romanova@avengers.com") + .password("avengers") + .build(); + + Person ironman = personService.add(ironmanReq); + Person hulk = personService.add(hulkReq); + Person marvel = personService.add(marvelReq); + Person widow = personService.add(widowReq); + + // Adding friends to each person + personService.addFriend(ironman.getEmail(), hulk.getEmail()); + personService.addFriend(ironman.getEmail(), widow.getEmail()); + + personService.addFriend(hulk.getEmail(), widow.getEmail()); + personService.addFriend(hulk.getEmail(), marvel.getEmail()); + + // Sets requests + SetAddRequest pushupSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest pushupSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + + SetAddRequest pullupsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(20) + .build(); + SetAddRequest pullupsSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest pullupsSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(35) + .build(); + SetAddRequest pullupsSetV4 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + + SetAddRequest squatsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(120) + .reps(20) + .build(); + + SetAddRequest deadliftsSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(80) + .reps(40) + .build(); + SetAddRequest deadliftsSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(150) + .reps(20) + .build(); + SetAddRequest deadliftsSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(250) + .reps(5) + .build(); + + SetAddRequest hiitSetV1 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(5) + .build(); + SetAddRequest hiitSetV2 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(50) + .build(); + SetAddRequest hiitSetV3 = new SetAddRequest.SetAddRequestBuilder() + .weight(0) + .reps(25) + .build(); + SetAddRequest hiitSetV4 = new SetAddRequest.SetAddRequestBuilder() + .weight(50) + .reps(40) + .build(); + SetAddRequest hiitSetV5 = new SetAddRequest.SetAddRequestBuilder() + .weight(100) + .reps(5) + .build(); + + + // Workout requests + WorkoutAddRequest pushups = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(pushupSetV1, pushupSetV1, pushupSetV2, pushupSetV1, pushupSetV2)) + .build(); + WorkoutAddRequest pullups = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(pullupsSetV1, pullupsSetV2, pullupsSetV1, pullupsSetV4, pullupsSetV3)) + .build(); + WorkoutAddRequest squats = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1)) + .build(); + WorkoutAddRequest deadlifts = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(deadliftsSetV1, deadliftsSetV2, deadliftsSetV1, deadliftsSetV2, deadliftsSetV3)) + .build(); + WorkoutAddRequest hiit = new WorkoutAddRequest.WorkoutAddRequestBuilder() + .sets(List.of(hiitSetV1, hiitSetV2, hiitSetV3, hiitSetV4, hiitSetV5)) + .build(); + + // Adding session to each + SessionAddRequest ironmanSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest ironmanSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(2)) + .end(LocalDateTime.now().minusDays(2).plusHours(3)) + .workouts(List.of(deadlifts, squats)) + .build(); + SessionAddRequest ironmanSessionThree = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(3)) + .end(LocalDateTime.now().minusDays(3).plusHours(2)) + .workouts(List.of(hiit)) + .build(); + + SessionAddRequest hulkSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(3)) + .workouts(List.of(squats, deadlifts)) + .build(); + SessionAddRequest hulkSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(4)) + .end(LocalDateTime.now().minusDays(4).plusHours(2)) + .workouts(List.of(pullups, pushups, hiit)) + .build(); + + SessionAddRequest marvelSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(2)) + .workouts(List.of(pushups, pullups, squats)) + .build(); + SessionAddRequest marvelSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(5)) + .end(LocalDateTime.now().minusDays(5).plusHours(4)) + .workouts(List.of(deadlifts, squats)) + .build(); + SessionAddRequest marvelSessionThree = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(1)) + .end(LocalDateTime.now().minusDays(1).plusHours(1)) + .workouts(List.of(hiit)) + .build(); + SessionAddRequest marvelSessionFour = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now().minusDays(10)) + .end(LocalDateTime.now().minusDays(10).plusHours(5)) + .workouts(List.of(pushups, pullups, squats, deadlifts)) + .build(); + + SessionAddRequest widowSessionOne = new SessionAddRequest.SessionAddRequestBuilder() + .start(LocalDateTime.now()) + .end(LocalDateTime.now().plusHours(4)) + .workouts(List.of(hiit, squats)) + .build(); + + // Adding sessions to persons + sessionService.add(ironman, ironmanSessionOne); + sessionService.add(ironman, ironmanSessionTwo); + sessionService.add(ironman, ironmanSessionThree); + + sessionService.add(hulk, hulkSessionOne); + sessionService.add(hulk, hulkSessionTwo); + + sessionService.add(marvel, marvelSessionOne); + sessionService.add(marvel, marvelSessionTwo); + sessionService.add(marvel, marvelSessionThree); + sessionService.add(marvel, marvelSessionFour); + + sessionService.add(widow, widowSessionOne); + } + + + @Test + void softAssertionExample(){ + SoftAssertions softAssertions = new SoftAssertions(); + List persons = personService.getAll(); + softAssertions.assertThat(persons).hasSize(4); + softAssertions.assertThat(persons).extracting("name","lastname") + .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); + softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). + filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony", "Carol","Bruce","Natalia"); + softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); + + softAssertions.assertAll(); + } + + + @Test + void softAssertionsExample_AutoClosableSoftAssertions(){ + List persons = personService.getAll(); + try (AutoCloseableSoftAssertions softAssertions = new AutoCloseableSoftAssertions()){ + softAssertions.assertThat(persons).hasSize(4); + softAssertions.assertThat(persons).extracting("name","lastname") + .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); + softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). + filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony", "Carol","Bruce","Natalia"); + softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); + } + } + + @Test + void softAssertionsExample_staticMethod(){ + List persons = personService.getAll(); + + SoftAssertions.assertSoftly(softAssertions -> { + softAssertions.assertThat(persons).hasSize(4); + softAssertions.assertThat(persons).extracting("name","lastname") + .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); + softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). + filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) + .extracting("person.name") + .contains("Tony", "Carol","Bruce","Natalia"); + softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); + }); + } + +} \ No newline at end of file diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.java new file mode 100644 index 0000000..47e6000 --- /dev/null +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.java @@ -0,0 +1,15 @@ +package com.reflectoring.gymbuddy.conditions; + +import com.reflectoring.gymbuddy.domain.Person; +import org.assertj.core.api.Condition; + +import java.time.LocalDateTime; + +public class SessionStartedTodayCondition extends Condition { + + @Override + public boolean matches(Person person){ + return person.getSessions().stream() + .anyMatch(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))); + } +} diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/extractors/PersonExtractors.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/extractors/PersonExtractors.java new file mode 100644 index 0000000..9fd781c --- /dev/null +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/extractors/PersonExtractors.java @@ -0,0 +1,24 @@ +package com.reflectoring.gymbuddy.extractors; + +import com.reflectoring.gymbuddy.domain.Person; +import com.reflectoring.gymbuddy.domain.Session; + + +import java.util.List; +import java.util.function.Function; + +public class PersonExtractors { + + public PersonExtractors(){} + + public static Function> sessions(){ + return new PersonSessionExtractor(); + } + + private static class PersonSessionExtractor implements Function> { + @Override + public List apply(Person person) { + return person.getSessions(); + } + } +} diff --git a/testing/assertJ/target/classes/application.properties b/testing/assertJ/target/classes/application.properties new file mode 100644 index 0000000..365be0a --- /dev/null +++ b/testing/assertJ/target/classes/application.properties @@ -0,0 +1,12 @@ +spring.application.name=Gym Buddy + +spring.datasource.url=jdbc:h2:mem:gymbuddy +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=reflectoring +spring.datasource.password=reflectoring +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect + +spring.jpa.hibernate.ddl-auto=create-drop + +spring.h2.console.enabled=true +spring.h2.console.path=/h2 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..f9e56751406062027bdf5c00a85f73524ca37a94 GIT binary patch literal 763 zcmb7CO;6h}7=Bz@QbISNYz)|T*sW9o-`JrO5>y(OFc3xEVJ9bbgCVgi#~Jiz?X-yl zKVUy<+UtPS9=gLK<#pcg=Xsppe;ytIe8l?@b-WI+72*xH1MDy?e^OexBZj5U-jJc* zHzUcg7AY;ilzA-em54Knv?G&1?u)H86twO7FqHl@Lv3(^ehXVP7p(S@)g zmrhzL32Mz3kd6%9f8u#UFt?qq z&z2-;+?ms}pNXRAEs$_;AyXpgVH*8PR0ue1J;GN6utdS)}4c!@QN VuhZLLfE6({BtBl-qa11P$lX=Le_^5z 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 literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..be272151167b37e7f8a9a077c987a252349acbc0 GIT binary patch literal 1282 zcmbV~eQVQD6vm&MzNCq1*G--8&S}*)1A{2|hoay>bkt3lR1_v8&9%+Ui>9e#-%9@& zf`T8w4<$Y~t(|Nu9V2kgy*KCl?mf>rzyJLB1>gZzOc+=;P{DO&ZYa}G=BAEYCd#<2 zqp71Mpas5wSQ9Ak$e`EH1d6HrG!W2tlJsLTxDd7XeV7a?6_&5_T$51 z)(?2Kxhb=!!yxo!Dqy{cW0|go?qDGK@9yl!FuSo&;G6C@*IFk?tG|?4Kk;9=sT;{m zro4TtIh*rOi<4Yg@>JOZ&F1m4S)93<4AZWB7ARFKtozQk`^DvQT@JG6$sn^($Gim- zrz}{?RF$b=PM|TfvE-?ITfjL^?0>oo)YU_r(B-^rc-x#E)rr~q9cW*xgJlk`!MQF% zQ)O_asY-IsVsg)V=*!@>n5SLf&Y>6dCHp(Xw><3hI0$%$GhADv0G!2n?x-d%5U!G+ zpui8%?WH|v_E#=7sC1Ja*g^^KbHrl4*T)DZr|;VKO$+-lCP;nGA0ZB(GWvPUHk>JX9}P2sAZOt`h2dl^@Fr1ZT< ubyahWpD4d&gYLTztr;ZwAjMXjRD*tF$!nNF&agN?(e1*MVgz*<%{`sl^ literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class new file mode 100644 index 0000000000000000000000000000000000000000..4983c1bb13a76234ef98f50a62ba2cff3e2ab16a GIT binary patch literal 2471 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 literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..8571975ae987ef19c256cddb02e567226209df71 GIT binary patch literal 1361 zcmb`G+iuf95QhJC;y8AlG!)u$E`L~6g+ZK>pgY=s&fw`JIrNx<_#F`u0Tslf7~O42ym^8F+Axu?=> zyBCDMN(9{ZQKXU`Izg(a@u1O;yI!I`g{qy!d_J#p-fi`K|J?Jl*gMl4ZxpvSS{U%@ za_#E)m1~#&mCByVPGbL1CM0u4hZHbdd`E$o)fqoWhj)(SUeZ>(0Sml1dda8kC3&?^ zg1(E>%*8w^E*#9ca5%CRXVk z*z`>DFjx~B87zy=q>Roa4&?&qhen0s6`FaJ1!c4T6XLsWTNpI);#C^E{RUjaGR?>* zTqihheoNV)Y}KFqfKmTOLj%0s(dB0_v91wI{k8#uHs~`7+@M~QiOh8;b8}j;eFe^mL=^jZnqlV{7IV7 znE2oi@JAWX>{d+5`qG%q-kG^~&g?lecYpr+{sX`c9v3lzM+Fp7k)&R)7|K0&uhCnR50K8z7F@=PPePO3Wo1=v_h$V z?tFCYw&S<#lPL83)~>=hlcMB2r#p_<=GFyqpMua;7<=aVUi4hyZRI9-w4LfH3GD?g z2~E~LUmx^34IRF78ts^3&~)0TPUuNI*fgRuk1BTR&7fn4`h8nBqd@4}t;h>Ys2LSJ>L~s`Np3C9RBC(tliSlK|IEp zO7&*v6(*Qazn2UgqQ#S-7dG{4Pue{@tY%wo2x}eiHtlN}OxMH=Y!j21 zGBGVnNtQCE6rPSW5YFT8Jv?ljbD9eKBbEBsG!(Lx>M0)ZCz{|tW*{T{>19MhY^fr) z6hb=&MVYfapJViyHb=W?eS@-UePpc7KC;$UABMGH^pX1-W9KD@Snw+bf6fAK;WnQ# zzqY`-cX;w7sl<4Zk>m>#6??)Z6MMoY8+*dXz+L*&22*MHmiU(WW=L{rK(a$C;Pr&$ z6~=^T?FxCJN;@uWX$vWQOZ-NejAvriOH{pv`IzrqQuLbdI__bae1%a?F#v-V+~+E- zvS~$3&bmV83!Mz>B>fbv(g8C`7*tf8N*Xvj3|>wJucm^HVeo1y_+ctIHw@lL0cY7D V5x0&FT7!~I4jQ~*;uSgg!f&JnHFy93 literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..c49f3e788412e5a49eb03649f049c9db9202e770 GIT binary patch literal 1575 zcmcJOO>fgc5Qg8)mm9}zLV;4sHv~vhs1ZH1qG=JWRDl#qMQ8-aO}wP896Q(!s5gER z91s#n`~ZFwVrCnqNJ)CI#ARpJo_%KLo!Q@ie*6NkhLt?>xNXA39rnt++~wsSFZT^p zOc38jB9J+pYLtw^}QGD`0t9sJ)=u=-t(WfAE1ak4A z8OBEjm&b|z(6ETS-;8w=lQTuV4=fa5S(xQzj+Y`Vf%T+A#mt8S&7|kg z=oU5W^qIVBAJM!Eq$@mrZ?Hmtw87CAqXE#ehor>6fR+jb`-B^0$0e-QstjZge~Ce z5c_n9H5i+&eW9onm}zRxW4iC^KU`zPHFOmtZh?*nDrh1%Gsayb?)nrit1{xwYVO=* zZgz}YC+_AHE~`A^&S`FOGB-EIeMa2vDO~Q_h+EX$Yq(CIxNWOQlLzE~!gxnrn>kgO h`wQ%9DibJZsBRiJXqUoGni{qSE|WDWCQtq%#9xdHV2J<# literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..c810d1de9a87a1142c11e680b26ab175e641090c GIT binary patch literal 1519 zcmcIjT~8B16g|^!DJ`o&i+qV+2-t3c^}$3V#s`Te#)3qI_`2b zSu5`>4dmXVdN@|J@EoBeyZ@Qb{Ra{O8t<8 zwnLYMCYxTMcl+Izj@~*gKcN`59skgYJedy{jrho;ipR}%*tH}5-q-Co6#91OwA<>t z?y2p@p?#7R#LlP-Wlrtr_$YMuoQS1}8L9BDHgdw1j6;US-x7Vr)}Kxs{FgI$LPy8D zNmplT^~;S=m|#HjytU(;Jx{wU8++#sF7Jo^sI6akQvLZ1S(|cam~NN%Ye!3~dM0LI zo0!CuiD?-sGE_08@MzQ)u|t0^=j+xnTdc4@YPNs$MfbW6B` ztNf}wZGm~`x$_{+#Q7p;5-&_t;t7{r;t894;t3xE*Xd6i45i^;;a}ySBgv&9$u6yc zS5uN_7!#h2GZcj??YOX|EoJbn@Qf-M&m^jssCor+3E$Z?={et3+`vup6-EWc2{^fh z+Z?4-Hm!&$SZBz6p_5~tw4S0>DqyAo!;Feu$pYsuf^TMmmove}MeuSa_--b+a1p$g Z0nW2PB5oCHv<4-aY&3Ym#4EG$>Nk%WLlOW0 literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..209ae9f43d8460d647b0587935cf0aee27107dfc GIT binary patch literal 1708 zcmcIk+iuf95IvjJb(0!;0Yc0DQXokYmgqx~T8c^$0uf4SOA(JwytG>!8|*cxU&AlJ z1406c58$H^XYJ6GhJXb0WoA8|J#+T#%zpj$=?j2aTrFb=7fY})Wy~dGF59?LhJ~t) znvJ@Em1r;40+Wqx@3rS@)s}7}YI(sOPs??F%?T7`=nD+JiQ*SgsuO|HJUP`Wa2qPo z%qgv@&Ct_nECn9y`#s-iMQt~h&jZ=gQLMsEcXOxROnraH^>yTSfZeBgfkoe6m9J7s z+yx>J&Z|)A1=6V2HUtKiBA+!z8Y+~_X}c-ob*~vPGM>@i@M2}YJHY|HrAT;UO(uzo z!Y=gfR0Y0_1)Td~DC4ETOA^V<)jx1$k^ypi0H=B)of14kyV_UX+CkJCeJJ%-;Fqr90+x*X<9;HuKL&Tyz25=l*TQ2SDBWq z^z_6vGi98mWp?+yDA5i^G3KCzvV&n`92^pu{r$Z3?LmV!EwJ*J+xxaKCq8=}0*|Bn zsJYEC7I;$q|E*iwzLwvuAC>U9|Di~!lPjMh{I9reK6(cW<(T+3X(hGX4{t@DR zmU4u4Fbldk%C(ax;20+O#WxF+1UH*+(HH3L`t%1B>hHKLz-%vP;p?n5lR;GSvoR4gKN&bi#wd*IygyL4ByA3vCDTL!!7RNJ5Su3eQskMRt literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..b94fa8c5eab4b842fc30ad273b62595879658390 GIT binary patch literal 1915 zcmb_cZBG+H5T5M|rKKnW)&e3RD5X$Nd?NxOL4=^TNC5Hkwzt4R?+)+wRK6I0k|q!n zKllUuQO0N50$SRTfNgGfXJ+S_XJ%*j*Y6)ciD;UhCMZsmacU)lhX*`N#VNsJg2e<) z#pq#-9>wUfp!A0Feam$gOmkhm50tN;2Ugiso}lDQ$5Gy5S^B>61x0-=JuRpwzb8LP zLtC~o@@`3%Ur4PsA_BR4bp&-C;+HEFa;7=BvNB`aGd}Rb$}t7CessNkH_%XYREY)J zDjRvrXN>rUwc|(~cuLUgI`dqGkEgcFs-#`da(0ZJL%SH5=AmI~*Qfy-@2UaL3N$+p z+?2q*<44?WnXLY zS;mbOPx^iR{|7*S?kK%cy*PcDv8Ek?hQh`r?&vlwYCVU_cb+(%b&H_FIptNVD=4wy z23|=mTikD{bLE=k3lCzecpVCgThmWcnw})7ovtORi-&HyDQKE+c=H?8v>S1ED{o3! z;u5|o?%_fTTDv4z)8odIkr~^fAv}n2Je6SzF@M6HgVct(1K$mwI$=OgjSa{Xh7>$P zbc>=`r>O^6z0iDyE`qr``<+B~{Fp-7iDL?9bH^0<27Q?NFs9%|2ogb%IO=u{h+WX$ zhBjOEr+&Hv2}m`DykbhBijFyiX#nda;WSSB) z1NB#F9#NE;jvrAAlf@jX@eTdOHw|Vzh}R3)K5*qf!&iV#`S#N=jeyf2Y*7J$Al#$- z7&)?mnF&X;M-=*sMKwZ8MLAGGtY#FgAqpC8=p3$h9&YHIp)rK0j~uCY9&O-UEnF5= X9k1}5pd981m?lsK!pN&u^iBK^(LCH8 literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..b5825412103b9cfb70f3357e7418de5bbd9acb90 GIT binary patch literal 1376 zcmcJPTWb?R6vzLw$!4?L)vom#>#Z7flZsmr5o}4piYTO2Yz>M}v)QrTvKO752z~P- z>4OLgegHp|cxDr#V48;p_hHVN;mq$`=A8Zc>)Q_i_u<>HaLGX(m$i09FH07#Ixum~ zLes)^2D4CHDuzaPpMT(iic=AE^FB`=aV2(Wx5`ivS;SCNdvVcRVOZ<-^E8m+Z6f+A zmvOcm>>i}yAc_uxNaaBxiXzUlV0$QEzKaO;LcAY{LJ_UD7H6^QFs%EtfLc9<>P8+3 zhWT!siLF5z3c16>giaR96nb37dOtd>>I4`TC&l$}5GRq44DQn`6LKTr1*O68YK9P- zQyftpyiK9@^5{92JQYev@>ckVzC!E&1!9Ied4`TZixbMo+0F;DFCNGG2^y2Kzpa~$ zp}s|}@FXvk3m3;+9LEh8HXIjoa2OsOy}vZ;CPVM&glVrvk5*1e!l~z6Dyh`mfyj zi))R!RvGn}Ytt1*2~6Zx|KY9>_s$_)U4=1suH-gwo{n@G?oz>Yvi5hFuc->PKM@bB faId7gL!(i&6)e&f0~c_ylqOD-)Ltx#;}qC$%(`9` literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..d8c66595eb6b927862eb3b10d4327fc77bb829cc GIT binary patch literal 1377 zcmcIkT~8B16g|_HZd;6eKICMOcW((S~Pq#8lR@!0T%ZIcc(`Fl_n4q zAN&FSDC3!J<-sgIVBBW!ow;}JJ#+58+aEu_eFyLejS?)}DI$*rBNmG&m{kFb7VcWO zXQ3uAv!mkJ4THU7M{2dLKJ-+qpY~kOQISCTMG&ZH-IH;wVu7Jp%Sa1Un@94aw6*Ii zyBT(+_l&W-+^y2L-3yGP?Z$4$Q%`~*)KU|H@ypF_=-c};)++ksd-jp+zK_Gemgk4; zm)viJkuNoKS;tcIXdp0t!e_bFT6Ubd&CM0xUx}G7s{%(Lzvc$6ek|~?cHzA)bky4d zx%JRd0wYZ~P+L8}qoQ5Os|!>Ta%~y8W0A!&7fH}%c`f)OYjD8194 zk(pZk!lJWhJowx+ue1~PqORI-O}(pWBp#Sq6Byp&V78R$PFzL>^)iN0E@KR3ffX}X zm+J*vkqomZ*}+$xBX(1ueffNUYXm2@R&QgTU!%oOG{YY`K;Q~@!_-&#j>H(HgS^rl zIT|Y%=YeaCc}tz89%+1qXe^x})3|?z?3X0@1Z4#|$}!3ciVVBTut{3x`eB&DG3@O-jSjrWVH4I7Q|&7a164`NTMzWHgoHfk8%rTdBd>KZEB|g0n1* Vftbf_YE$h3N?etaRh~r@zW|>RO;`W` literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..28220853c24eeb6710a066c49c0ff6373a5cbc6a GIT binary patch literal 1040 zcmb`F&2G~`6ot@CP~Qp` z2ni$}fQLeyF%b|^7Llrv=FVK*`}v+T{{G|3Hvo6B;lssM4^3RN+jSQ=d^l*kxand| zp!r^^(bx!xJpo6{HwAO|Ri?}XfqJJqV0JrCq`+cdWpclq#8SVE;*^=?em;!SL8O(v zPm_)rD>7CNrFoPj2l8zx3-h>CX(F{iu$yI4Z>LdFNLKCihxsJb@^vbQCf6z(g`?w1 zTqenJn3y~)qzPw0n=`j5_MX6QXRmu&tkyGW#(DB0($Pd3sX1pOwgLpUI&*)8!}*7K zsfTh$Ri@1-xN{V}iv$+-Y0}fYFagdW2(SPzfDca~oYNo+SQmIQXWNOs3bgEaVH)vW zp2tUgBkT0(_}m>}jX$KzzqH0h#np+T865~~1oyMNg^Yr+(fbVXu_`;qy;&vOSmfE3 zvH&fdXQZK6A=EZMM4bz8d+krC^*-=egKhU2fps=*REX8;?oJVGsAdwlz^aBNTCRUG zxBd_J7P+1OaIMDQT)*P3;v!Ra-YrgRwRm6QyrSU7pNW47zWtYAZ#r!qm)KInWn8JE OgJnjapeDUsg7*_BN9R)j literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..1f76e7882d4ed68a2bf23814f7fe03987ed3acc1 GIT binary patch literal 1053 zcmb_a-)qxQ7(F*>nx>6wH(Q-Qx9XIxg25*rCW1}|E8UcBR(wpFYnzcKn%pY;qkIrH z1RwkZ{G-HkV-+fWDM;z}efPBIobR6G$Ioxy0X)Y2Dr{^xC}UHXwu6eEDrnodW8dh=dv$M?*Z6ZfSj@9FInhoV%R75qm)x%T&qc2c9$43hue6!F6#7 zu7I~>evD76da=)_Uk0a)UEsx%A`8P4;ME3b^Ify~0vh~q&0^xF>?H_pUnkz+=`BoH z?Dg(fi0;M(jBfh^=9hx7%DP4Z;ILL%YoxlwfK3uf!(}wt^`vb?F=- zG~TInI5GmFE8u9gUo!U~%~SJGpx$ctncXN7B{1JhbG11c$4bAHamLI-uNcUzFLi3~ z)1+fYDH%&U%Dmc7q){)_n~5sT<4Kw&N(+R~@?7bSOqQi$VXrqR#*tR9Gc_=UPV-?j zJQ&B5Bsqu@Q$(dQ(JbrQY+?$(FR<0>wvU(Ce6Gx>NVcVxV`Y@4W;eFO2;6P`&$p;D z*eND@pq`}G#&fgN+}e|GrNG=KZF^djCd3JZA?DzR2;d9cKDuR=u_n+xdgozg3pB0H zD3g4$t$2^mXYD^u^V@x_@~8FqC)c=WKy{)Aj1GkLh5Jd~B1XaJc0NITsLD=pZ&b-; z%=2tZS%4%8Z&2HPGmf*M?`Rfxsv?oAPFs5J2jS>;-y znG SfQwahu)r7))S#EA;r{?_r}wD< literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..ff661a2d4980705381896acc70494df92b7ec132 GIT binary patch literal 1083 zcmb_b-*3`T7(JI#N}(ILiTHcNO~Wv;i81kE#s`;}NZ4jJhw-t{JLpo{*#mHJgL@7( z9Bc|S52ZRf4Fe?)35c#hF_Whndln^; zdM;qMyWOom@tri30<~V0$i3-gAhS2YASSZXONT++53)!<&%mM@M^t&z8>SOKlgF_f zsx*s|kv}?{45ndt=7%cvbE*9KDYpgcyHbtQ@O6*{6RBiIrTz9lNNvt*&l1?y3ps<| zarFMDw17L3>g_C1tG&fc9U=!N*2-Zz&4%)2q?2pRkN4;#_z(zG_xQ4QrOr6_u#Ed2 zs_;B4!4r6V`9vA07WU(S`R@--_$~yxm)H4QoB~|4j}}j&!{b@t#d%G~ky(onT%$(3 z&Zl>jJTcaea7>qBdr=7kDqxdzp$gI@OK0mLd6%cLPmar-62~`Cl_` zH*k}X-qGjJ^Yx15Pi<(qX~hA0-=Q#2=tHyi9K-WAyp-agg^?Vv=GE`lQpT!W*59(P<{!2 z0}coYBz^!t3h}&Iq>`v0MfBpapJ(11k7s`T{Q4ch7B(v=Vxx=#u9a}T0tYurXq0eM zARkK;3)Ff?-aF4tj0)VIicLqLe4s|5XA&(1x--|?ynPwwTO3gvDx9!UMn8w5mFdeP7e z`kq$yoPl|BsF>*Li%7qYl4I2O6BYPU3sfJ4q14^Li(^U8{eR^6eoExd5pK>QnFOEU zH)kr*X`O~l{m%+a-u$jY?Xfh6k-z6@Z!C?}eCLPRlot7%Q+Y*UV82G7(_EOIC9fPr zi5|)a%C<&*?r-kc#uZrFWtTmSVpGK#RI4aqNnq>mU3y{%SdLo)dkco2*g%}Kbj$*e z1M_5X#NiQm-u(X^)as+bX)kj61#-3+v}K-hu+uMWjkumA;?fG*Li-EEr_|*f*J28; zVVQgDN(a<%fmV?2B1vrUQxfKAOYPgAk!yeC)`1PLr0_a}Hd2cE)Gec6K$g=b`cCOB zQXzSrNWp3#OZYOuRjhHfig(lWdG`&@OQxK+nz>YSnsVb<%H>SY!IjkOD%Ml$V1?GI J6-aj;y)Msie>A?9DPP(vcQ@QCoB{TXUm| zz0=gZM(@H%$NyhIAlLCizc2S3{obo{ojlSm704gb(FamnBq$(@Tmh@NFR=Z0S6=D` z`hQ}7*P@Z1_s(c)fujYS6ov2DpV-!F{prFts0hwVTtox~T}Y&*f$pcBX`DKl36qJEy-(%B2k@c9 z8zXIy3dKbj?%c~c=YErq&$o8~xPT)M_B}Z8;E+IPE;YZ&Z(}AEfx#eHuxCaU(-94w zl{)fI%B##tMTd!#Ml9tni%b0p?Q}Jg{I5g{dF!A0IhSLQ~`+>0$O_Rc5UPON} z_K9-l7+oX`10*Ju7$B$j2^%k~&Er)Z1B3XAxb4tnb|&tmLL&WgkCpaWftLk9;dt=dm>2fE)wyRe666Nh>LU$wB?(*OVf literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..c0bb15b11d6ef3dde43cbcdea3a4a0a71087b368 GIT binary patch literal 653 zcmbVKO-lnY5S`SvYwK545WIU(1andkD?$Z5$cm*4-qY@MP0c1tl2!Hx_@_Mh1N>3q ztSh#lf_ey(88Yv^d6Spdr)K~-hK&H$0_X*>&R{b|-&g9a9H4bZpJzfU20OdaRNM=$ zgid+vt<-6_SCgcTWj0$|X>8le-*R105NWH9&z+DSAv8Mio5 zIQFI@8=Jz8@j@z^bL&Il4E>;Tk-_$`&|YSEBb^*6>}zej z@H7h!**n*4LS?-mspcQ6IztF eDQhtZC@j)xK!+aGw=OKbSC(OgVw+l50p0-c0MMiW literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..cb1c63ed3801c599262abb690ed005aaf05cdcec GIT binary patch literal 722 zcma)4!A=4(5S=Qpf~W{;;?_JlOGImq24ARM3&~I(^jUSvyOhb=W=f$85r= zvqDl|B({x(x7#+CTri^oKg4hL0p4T5W_1X_!U> z7X&E{bi{^^X+JrQTGo(=_Dr8&etl; z+pYDrGedqOBuZX|E`SuO~XHfH?>cO@LI|M2{A%jK~U8QYqj8Kw5b-#Jw_t}6^ zXGKJPVQd`>Z@7I_!5z~q=9X(iU`Yf7ifs`}W}W5)F6aL|_q!^ln)f2!wMq*a(lCuX zE(lT@sF(>!AC!Jl&ekuGWv}I=6*0dTMsy-RW@|{PEVHN&d5?XiLu!%?t(VDpK?E8w z%aABhMj%m2pB=|@h=9QP0gD_;^vqA2ucIC#hLUbOeUw*UjN4CUu$u{MjhX(@;uNK? zWH@ZO)K*S+`L&2pUhUhA3Hnhs2?D#b#?1I}_^WP%L*mM&38xb@bmDaJK&ITA(}5c> z+=(f_2%Ib xLL2;lNyEaN(o9Dy9<@wI_XUS literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class new file mode 100644 index 0000000000000000000000000000000000000000..69ca671ee011d50143ec46bea9abee65e212434d GIT binary patch literal 1087 zcmbVLO-}+b5Pd~pUBE9CzxCt+FRnKah=~U|VIUH{7g})1!eZ%S_-h{g0sbiCutf>5 z67ke@`sU4>*O`ycw|4+nIJIzW;e=s@3&Bv&mm7Y^QL^dDhW3@)Z8@!Bryd9~bcFVu zo>YCm>r}(zR)`1r63D(ToG;4rJKX)wDKKo_Oa1JNDp$NCH8C+*%J48GgP!18GQ8%? zZ9d?R$4Ns?kE9e96`2+H81no_UqX^zk1T0P%}|Wcu}rr~V!8E*E}K6$9R=F;oU%)< zG1xV?)#W-+)NyeRaJ{JEDOYcZD=DN$elp~uBtJ2vNJ>e$vMb2)vnbHKz{($B%gMB9 z(u@j*DE9epU&iiqGi>nAd|}2|@?FmUF@Vgd`GIQ4lIxLUSu@ZzsRnLCUW^8h;qv!Y z=o?^vya?kw8tuu*R_bk9p(F!Cj8+Y><1|u;(>+1A1pOC4Aq%VHkR5|fFD9HqdV-`d xAv0K`&^ke4*r59+wq_w&Y}4bIe?(@`JA}?*ce>7ANV*>#K8OfY`e9i7=nG4UFmeC@ literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class new file mode 100644 index 0000000000000000000000000000000000000000..a95da0a991983fa654b1f3bc0a8bc040e0b3e004 GIT binary patch literal 869 zcmbVK%}&BV5S}fR3Zf$Td-qTdy7A-zL&Ajv!ANX;fTg?EC2beCTM}Nv2lC(p_)x~7 ztr|mY#M5-YelzpUeDn7H@(KV~aO%LZ11AJ3jB^6d?$}om)#4!(zEN7n0S%VXH069r zxr&&K=|t#6#l143Q8W=rB2`SiJPtU&6Hlo~Os`v(nYSpCdIVZG!aOQIVVXt4U}plg zc_x5>qw|UgrE|`VARygQS@m^Y_gUh>`;hO9}j1zL^z zCV!xBD5&A7RQqBmLmaPDIPD3&kiNKB2_bO#`wb>JG5Nf!A`uTIn;{$Pb~?l3tq~w# z;gJK_RWu5!__py?x1ff>0YG>Q>fdnV3*Lri0ow!+M&=IeBD9AT3tITzhcS0 NA^&xNq{EDK^Z{vX13v%& literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class new file mode 100644 index 0000000000000000000000000000000000000000..af919f5bc46a414f76127b672a62145070659ba7 GIT binary patch literal 660 zcmb7?zfQw25XSF9nvn9Rg#ype4&ad?2#E!Ws;Gzvm>AsH4Thu!$0_Q}TQTqeJQU*6 zM07wzVu&1{@Avt;JAZz?e*nNS9Qd&3!#=_q7Xsm}KZ`t2}UD&WG(`uGW%OYvdgt(S3h0JX@Xd)_Y0z!oDrL+%PTyeuQX{E^#{MYJM z`ZJXrf>%5XZY9Eff7m3wGIO&8{_V$6)S7N0E!oS*)4Bl&z5Z}8dgOD?3ae5!QdA^D zP+PqqD2P-tdIKnyvt8n`# gyaAiUmf0+7j|lbj!FVycX`V_^p*;of!+{6jp%C6$ zgb-qIh#cGBXZy3?-d|n;;1G60*bZR_p~Zzjc<#li$(faRTBgoeRb(ui=A%l8DHA5= zs$hvMOJ$0|BBV3y$=C-|Id)syp%B;dv67`5^cOMf9t~-L(7BNA-iRx1c`lu_B|=!% z6VT7rB@u#5x}nwx-QIaW9`gxjl~bCLdL>Cj135^21^YFQH&%ALXAiQ2gPlq9l@Y2^6soaaT2HZ z>cmOx6sH%*PHACMF0N3XFwuC(<&?$jFsZRz?#tIwhmiGMY5-qA(W9{0iJ< z;KgAq)(=-6dcqm86}FU7mC=(j(SedhR8zUjNjmNxg+xP{_2o<{v+QEq zHXc=|Xivpx^`dSkY4>Im!*+Vm8je#^+npM*;zzBtBhS9D!ad<+6!y<$Gbb?~w-a{K zwOsP!bLZ34$#+Cu(__0QQnABU+Dh0i$yJzV#bOG>&y9&E!q4%=NU-!qu~x%rp(tlmltUPR5uc^|MWyX<*+Rrd^(y)l5!pg~DvwwGGA5 zd^vPSMm>Q0b!1lRCk0b;li#;GV1j;$TZ!SARUe4zH!19y1@@fdsc}d_ou(gr&Bc4y zZ=@dvQrYx~eZY|tS*QC!QBB(**`%I4qv~lF5{=f^=R(cPf26ni-d5 zACVd6_T zX5!0o`HEb=ien1P3)Rb~eE;bY+p9VzzJ?eAmSH z@O^ghg6-PuHayMN)Rs!Q88>Z>>mHR^REZzd;A!4|Sc4y#_%VKB;-~l-1wS|O3;fc= zukdRFzcKM!QP6&Is6juzREwk;1%Q3SCwVwg*fHp<|YI?gV z^jU=}=A56YOY+69IPn#_X34`jmxIz6mS)ZUdYLUeu_V1)go17>MzcSZ7l#?! z%qyNGs>Xw%p(_e=@Sty+7s-s`xgQ&5*j449|ERUISgY40t{m?CVaZ;FW^#LRf0v{^ zNh;&aGDk;Jnz1Ix?7Cu)>2M=6(<6}kL`I!ttZmZwe?##y{}fZ)FY_TMJ=4h?PTLtC z3cdJau`LZAe^Z4U%YdF9mL;bkdOQ+=hAxet&n&PR3- zD6FQ1TpEx=MkR}cZ6y>|luXuAIn?nbk*_E$^Ix^6;`(cYp;PImBw!R)&ZZ=oNj*zv z=+Rp+Lq@bhR*2$2oW9%a9xXX{@;I)r`4X`) znoW-A&x5obb4GY7CdR6?ok&gCoudk?ilNLhxsf(*!5_)ss1s)oRoHQ<6-5UnpBv4f zgr`Kp0Vge%*OhppD29tlG8eLob8~)3SaJ5!KbiP5{$^qnF%u(T0+pTzfz@cXiJfpC71|hTIVJ4KHhgJ0ZR(|boLx_JoCGj_a zkQ|hFH!0tVRzC0I(=p!X@xG|(98^>DS%jKe&SKsp-h$n{*764n;2K_+p&HBitHuiK zq2zkK40~}CpQymwMtLLID1?0+SIh3;&fuVHZD(d)K$+cKRc|A#4OET6GegirwDIn_RVR;TK3Qy0;;o8E}${emMJYAo|D$(Ri^3cv) zz-q!?^8|OQ@BpqRG$4uyHqt$t2y-(w(Br!Z?-2REjeHBRCT(2+Y?N=ih=3LoOE;~L z;Dv%7Udl-7NHB+ZkN7CphIro3s|tIsdZ?h+ zQ&*>_26!Sq9^o~xa)|Dj=cVNXoGzShD=_GDx{}mNXyveO3O6WzIy6k7F~lTjx){6t zWOsn<4q`oy7O}f6ux4ApZqp2QMN-1<`f2QHZf+qrw=(o}YW$1$`LutiV1KU+nXt@~ zofV96#>e($72ZAShdeQfMBq)KIfR>K$tBZaIV!o+Ed+ThmePWCxSb&H;J4AR2X?Er zBmg_)gQazx*+oku1gO(sDZP3J!>hszFL9cFCkdh7_3@nqS_JA@^plD_8!UAaYq#@X z!3vmoj5?%9bQCe6(XTI{ZaI$@U<&K!in-3ibb?kmbnHo1voXd^!o#c6z9Ycf5#a3z z@b2*O7LrILC27BFR$#*cuz&k59-IMecLA6eqC~er&_zSM@OOfp6~5oiytjkMol)yn z!XSBR0?iPp%PN;;VV+qSC5g8se@bv`Zm`LDTcuZ!N%qC?vB}2}Doj_6;;+U3UCW&)! z44fCn3rXZrNa6@w89W2U1UiL$5x%?&5(rU}Ewc#>;&B-+B`_z-I`M?esH_uD8u)es zcVa?VzaztUWq8WK_Y8dBz|#ur0y_vC&&}FJFK|N7pHsLmGvyW1zCE3{r$}+!ne@zD zVX~CV&5>H=OOGwz*{{(4xaVK+O5vF8&pK1K!aa3l1r??seRjzvifK9IxK4Oj!A;fK zU)Pp8`_|IiGp-On=H+O1N5*mOky2sO_Rm<8c~aJAyeTU`ZuyR^H8CEZa{`5vjVN;p z#k^gx-Ovi@@2dB-qXzksxI2gK@SK+$wS22!hqh1IO;#?a@O(W#ydv1Rn zTXLb7*72_DAIRmh_QjGNg#A7Bc2-pAkS_|f-mGw--frsEiBXO9BE1ZEF*04D0TVPz z1;ek{eSOtyL#7n{QlYmVfaUOS8Vjwd3&U11N(2MX5Jah%vqENylNzcgYGn)_jy8Uw zFvJ`thZ<5ibR#MiHfGLSvsStkI{EbJq9mv#`Pj8I>F0{o#6PkMe_a!nI`DA6fgdop zXY5d+FE!La+-s@V!d(OTJWDdwv&f8$!yHy<8*^q{D=hhp#NibTpUXxCld4X7ekJD= zwxufi@)ld-SSX#5Ra5hvHlf*OJ&JuRxfMnmknuUKOpJLYf66}TNT1rI9kr;j>=6qU zy0axWbPD#k6F6*P1Fq{;dJ(%!D&zSx>7Xc(rlt8vxuyfQAlnNWcD9SCq4%5U!w*gL zpx4AM>{hsU?XyDnC2i0){XAN7@;Te*S+Sg84!W-GAIn=oU}N7NfS)UDs5yPW_pLecyou*=*~BmKO9Q_$@dB<8SEJUMcoD+}UNZ4Aer@6^eq-Xd zc%?qRdTq_X?@a8&t1`T1;B^yk;7t>6;cXM|i1Z=6V&Gj9@8NwDAK-n3%@L?5xpb&b zT$-|@YBceCTru$n44e2P9#S~IHn4@`?Ybup51g9H)05|U+$-GOfMgvxofORUS~v!o zGZt?RONiB$!jezPDO)dTR`$o*S)tI%ie&HgY3P<}bxTsGqfT|44fqUK>;ug~h3ky2 zw^f)L?>ftJm*S-fop9NFn`{|#ji1jqqP10@qO90c8dub^qsDV1f}1C$DiwCqr)$T5 zX+hHq``6~JcRAxVE3jtStadDJhLr@YHq@vLG)W;zck5dsvA5UKO^`DyoQ16Gs%Ayx zm})lCR^yx%jM$gR%^ZA$Cb-dJW0ilY!bYk<8?;abmm5d|T{+jgrRg}Ya$9O3KH4r~ zzIiqO5_`pg5#o&J&d@otR=#APo@Qs2)40|ZVKdsX1$UEjM`atnf_u24fJlvsW}+yDy_~m+c2F~@bszR?t)Eg{ z3uzaxAwKajns=AcQij1tYZ-03%1B&8k}u3MZYraFr1vj~_06LrhJT=Qgly~Pv7Y{q zcgN?kLGfry$!w$I`cCcX;V!PWaokSV?WD0i7^ma%G~T1b1oK`rlh(zr)t@xAx5ezUt>sVE{+9Z~nzCB0MXgZ~rU0=dn2!K`mp; zRqXGMmvJlIK#;eU@ufw}+sn8^HdRSghkbYrchZ?#KcUok1b%bm{k;Uf51Sa39fY)x z5Qb=t0PT%}o?U>K#W5U@;AP2if);j=az9Rz??LjLd{?1-l@tNo3iV$M8T^RXP>+#V zfjWd!8mb7A@|WN|&i{0L18tuH#N`X; literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..f9a72a30811ac03f97cafb3978c45c8c2d1951e4 GIT binary patch literal 3097 zcmbVOTXz#x6#gbjGtG2*kwT$WE=s9sO9>zsp|#Rhs;!~L6pEmz)68i)kj#XcNg>`| zc=iYQFK{glB5SG7KKP4VF26G~?F49IVP$2`-shaX_qVSzfBpO0?*Pu@dksUF%U}>6 zsJN^li8&1)VL?)hlKNOudHJ{^A4^?W##I%cXeeMsGS@V!xh@~88g9t@IzE*Yb?CUM z;+BSen3GpOlaJ3;+*a|0iZ2y(d%`b>s^eL{$Eh6$PWK3Q}{9DHQbPEn6(rDr>^MW~`ODvnTHqjq81VtFXYM0sDJ$C(wYWE+0XWr!zVy!{f0(xxc0 z$k}gH!?x2_oSIt{^OkJ2egbRijT16f3I+=`+qWuW)$%NM;EZiMVJopwvU$fX<-Dq# z6zj5oB)W%IvqxMBJ9At@B;J{FdA7bi`m}Hyg--0-$%$3G$#0_}D0rR!gq$G!Zt5U? z2#3iZAve!8!Brc33}tNm7bJcnm!Krj!*3>F4^rqy27B=qxqeYx(LkDu+Cb-c1DOW2rLmupn0SJ&1pb7+H1UW6 zA%a6tN$*D|4xpF54A7fFdUKG!ae5&UjfDob5lwJ@jS>Wn@@$-%4x$go$t44nnFKFL zF^Tj9auL$MdECLhf&_E;S9Cu?PXZTHgQ*63f5bVt_7UDh1Fto(r-|)vV6PO~+S+pD z(NpZB&jWu@Ybprn5YnWN(v@L4b&PQu!CA&?k$_`Y3fry}a1y5iR|>>?nh1L_M_1mV zzBAOM^DNvs%bj!F>4fqR7FB-G%7oC>lUzbq-^B$gI70q?t}?S-fvZojKZ!Wx>A>E} zret?*vs^#qUn8AlB<7L%52pG(lK=n! literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..bc3aacb5b6e1faf729b7e296f7e73ccb38c7635c GIT binary patch literal 3400 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 I$YkmB7sOXxiU0rr literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class new file mode 100644 index 0000000000000000000000000000000000000000..8de51a0282ec4ae7f0ab31dc66e67b4bbff560f4 GIT binary patch literal 15508 zcmcIr34B~t)j#LWo6KbLnxvC-nI>(zq%_?!w54lGX}Y8Y(xx<_wPmT3%u6%vWG2kg z1uO_IP-Rh|C{>msi&l1F=mH1`2n7|DMNwQ3MNtGr5cveZ|9#uMmsyhH&-R!1&O7(s zbIv{I+;h&o@6FMV4nIsp^QDaE%FkU;<$ePw~-QmdogDo+_Ye;xb)4&hT)fkD4GA zAJ4M{G}{~|3Dg{cIzjZDE1-GeGG8<-FuS=#<3e#+WTIpf@CkI2P{!giK9QFQJ)Gp@ zrQGZ%;#EFc&nJ7hRoqVz9ZnMcPxTXXdl|3g(|o*+I|S6};nV%lxi;hzesb{{V$hj> zk_Ao`WHyWYCw&~^EXrwPWd>^+r{G!AMfN{9zNGcyM@Nm{3!wL7SQ%($;+$61TPhr%S6NFLc3Rp%a=U-WhSLH7E=?;qoHI{ zO)?GZR};y2tV2y~k94a{v)j7keZhp<6IHuY@kAuHCAei*UspOD-W5#hosz+|_AyON zfpzIvD$=K}k0c{qQMEZ1i>E@VNIV7x3) z7+$hC5{smkFu5A0u4j^$$HP!}MO!4Mu1WWGsfo@IRLA6Ri+6{j>qCi%cs7u7sy6~% zPAkH-B@#`kLdl(KGL-~FS@46{kwiS!7mBS@&taNhgg`hI59-cf*ta_uWO8c+nacXp$=-B- zhniYHi)mIdiVz!?38Je*U>k+m@cRCAG@9;D8U*c+16t=eJD&hqlINsDDRXFfSPg}v zk)8qwP;>SGz0%%D1fHNx#e&h%g6)04(8AA!-gQO5_zMS7g5l*s!*LzT02OWe(6l}o zFtO$#tN;O-h8rd{R#1Bk?l>4%V~Ilj+ER6J9YC*hN1Un3$)mG3p@K`fa05GAJ3<>* zse6dMj}xW!@;iDN#D_bOE%9^$>rV4CJGBW~oZ6bkq6uzI_eZdpf}#FMaGBZ@PpHk& zD7l-=lBvyIp=6}nT768l1qg|C2^ur<(O3iXtPe%gY7RAT zQdcY-pt5aiXnQD_PDP?Y!5PFxI)lZoeluV!9?*AjG3U|Oq@j$aC7?T}M~f!yG0fY* zCp&vXspf>*l8E1gqn`4-e8n(@RfjMdo!u;}hEQO_>Y;TT*^#Ir2(~^j&v2b!T zQcQnT-Dw*-C7)Id&8ks5lUezC=IGBk=EP$b%sGCsIlh=Wy3@&2ybse3M?~tgO|HtY zVMi*IfW|cKF^$*!M5N(FYHP3?PNw;rMF3_vb&xJYu&SP_HKQ&yXECUG3eIFy43>pK z4MSS8GPOiQeO=*D{g8Q>E@0Pm{Q|6yhQVFcnAFrwh-Z4rLLmd~c5ho9>Nis6B152K zc9;73OzVdrgt=aZknYT`2h=Za)%{sAq&kaDZ60Hqa-jUu-&&C?=IPPHD7 zr-CVjdxWW2O5KTSORMLX0dJ(W`XX7cHI__;V%;htntQv*avr`K1xQ<@NA2F#Ere+t z!svRdKj@UMUAb=a^0wxV4%BCBAlYhF)X+(VZlD`Iyq9Tp;eAYzO1EBjt!x>yEFFo4 zRa6Y43bx3i98fsI*I<4k#&1*jE8<~P3Jr~zdt%$t&~`Pp1p+ogEQP-+n!P4Y;cNLC zh4=B-Kww!SE%sq0%djaDd;?tq(b%OuI>?~&@=zikMO0Z4ifspRrZL?D(-_vD2XyzW z38g~O2+ZtVhX@mk3yY79>BvUpbq(bhq|jcv#=~D%_&UDc!#5~=Bkx!ECjN$pZ)RFi zT**0gdA*}bw{%;b53TSme5=B@iOW9zriZ`9w6-|Ef+cW$PEl;}9$lzO;RF0_g>UCO z1phn5<6R!Udr%>a2%lRKWAX!PqL|-Nin0p0t42!f*56#Hhbx)H}$+g}o1PQ7`+Frrkv#FpE8_P7=iaf!tr1kTWXR z&q6@scNKn*|LNiP75)SN%flZi{D1s!g+Ju|9{xz-|M1h;+83tjEGJAiw4ATpa6SW} zNH`c%BuR29lB{{2OhaZRMNnV9smrCJ&IM*YND^i)Hc%)&9R4ztW@Z%LF zQl%mdm;8!UB~aDU2t^tRKb1yFqnR2C%j?tuf?C!v#zB*no8ztqN0n9_!_fDXP^0lA;(YbW$q(C@1+LsqauDTY7QQ(%NuJQBL`W z=gplkr<_pxk@@Eg>Jd2tVQ{gi0U-(|R3<6j!xXhERS%j?Hl_Yo7{j9W;|>{9z*NHq z*KE^Z$}BjKf`tKe(=@0?3zEg?^Z$pc$yIS4WesB5f@KQoR&6PX1AT1ta2UNJlu|qK zgg6k3?_jDiS6gluOx!IBUif&Qp@2M{1~XSd+05LPQ=fxxX@4}GJQ+J2cu1{SUj=4? zt}dKHF`fJ|EtE&sUc(bUmUDir*$(cU1<49s^+jUokbla4t zTdo5S1(S#Ptimza%4Hpn7eY*z7foZ1AYbe#N{i82L2s6PS+5*Q#xul%HA;}ka2kVm zKjy;9Mz%r~xL$qhuh@KgeJ&1YMIO*qnI$n*+g$5?YzK|mvbo78jge}YM&z;7)J;CR zN~%Sg5&M6fS~^7RNyoayVM}l=-q=OD5hpMmUypWptcKfT*oNE1$_Cq(pg>%&kd+J(vKX~<&RE;R{tj01&8QnQbEti!=9&Wpr04R2%OJ0OZE zRPq{4ymAq?4r)D7U9Z#!#uE_h%!XqgRDg}?T6X`3q~qb@$;i1#as>r6N19&Mf$o-L z2J_CT@DK!H=m~EYqn&sy7Hnu8MBG*!yx{=J;3srD0jll|C505iSc4K6xRg5VP7c=> z`f#iO_(NYqS#++fj*b8bla;DiDfdeY?@C73CEK zJ4JW`z{P`Xcl4ZVBt)~uGmay`S8VjO;}oV&!)K4Rs2qfY$iOQ_O;`qCgZ||QrgEx1 z0*ZKX40%0w8sVYW9Ye56L2b<#icPb{hgTfwix;&bC)(EQ^4?IQLwx=r4(`Rf4gKWK zdeZ|(isCJh_SRb0n?W-vVn96{LSL8StU@QN<)*wPK-Q&=Gy|v76S2EHj!%o=dfIz~ zc5FGTtkT{R1uo*#3RV`HPuZ=zWF#ZQqu(qu(C zPMWIFzi>)Q@8hVG{)y8|`Wucd>96#bLT`$OKZ%Cl3+P>X51$Qa^V7tQ#J0z`VOyoW zEXCn#$oK>b8tltHd8FykUt2uBEsdh!S-V*b0{Xe_$)Q*{swVO7Mf9`>Z!=)#aMlNQ z;!6R0cL&v?jXKNXW9_AZL3w!y9}*zJH+iHPOp^C{a9^XZ=isiR>j&Vf@r*Y~xb6p?AnuI2d)foU_W+RSCR_z0qVe<% zTot_o-AuROiRe}gmc-!FJ>;P&7`y5SNgE#^mtW41+h39)kKdc2Qok=lWf@Z1%;sUD zxm+|?*qT?H&6T2gxM=p@<~FOsL-MfS6KMz8h)nHztX}79sP$}_*oj> zr0+NI`W#Jcl>=+eyxM^^XEVa0jDFCQDal9+KgYpw)DfBstbW(K#v$ZBO37 zar%=Lex;k}n+UYCsg&kWIh{aNG?zxxJgTAjR7VS_ffmwCT7(`=z$^xIA}zuHRdf=y z(Na2%nrS^Pqm8tj&Y~66Ln~<;wNO8Lr0HbZNv*V-PNhBQy_Z%an6IHbG3qf|M=w$* zy+NnbNAw9Up^dE2Ca$0}xSG!7S~`m-;=}XFw3(+-h-Xt5FQ9I2qA)KN-9hO>eU9Iz&+|KUF~3ijNJM+2 z68eHvN?(-9=~8JVT_)Ai-{-G2JL#O8cc7=qBkF`i69XZkCSFEz+ZOtMnw@CcQ-8lwP54 zNw3oF(x2!K=`Fg`#dMd;LwCCry2n*T_qyunJFdBOpR0-PcP*uiYZX1<>Y#(JEp*7$ zM~7VrdeF6t9&%kk54*0Q@4EKVBd&e)sB1qx=DLHv=X!!3cRfQ-xSpf$yI!KFT(8j6 zuD9r@>s@-r^#MIAGyOmwMn9A%(U0V*^qkyCKbGgxPvn#6r*b;ekVUgugNdc@8#F%b@}h~NBltH z4R<;H*02;;@L0b<1D(8LB-9bPVd@nS52v8*-b?v6ZfQIv{ zE|rb|^7H$yc6ty{l~nFpNDl$3mg-%T=wU!3q{aBj#&-dYlsct%=n+7pq<&caQLL2F z(xvc)?*R%(2c+xhaX@3FC*e0w0IHE*g*QD3s1`4qo9O%W6peK)l|1w`pmDAQzd%O; z)w%Y;+n)h6-t`>spl1P1aDBk5=?8!&%8eYL9|D>L8@@?D0#pyn-A~T}nhbkgMn490 zoK+qEL@UvLYL;kp3Tz-sxmr=+9HMm$t#lm55{Jf4e}vX&Xu}38?ht;ggTC(~&b((U z{b~*Snic5t8jlw&9(yoKjGHfl=^=y-=zAkW)td;=84_5Yd5F%Epun@+rfd8+XZe3p zuy<)yCw`*>_yZcv9;)Y3n#Vp(jFCEdLyUTa!x!l#OzUUpEvi!;^K(E>5nr}MJR1~* z8XBBx2njK|4pX8ey#UyL&%=}wLRlY61skvVKoXWRBiGjtAga+neYOfeGSiTFgAUB^MS z>2trfB-sH?30;?Ii3c8IGb*NeF5l9Petr&qY;P!waBL9x!tCk35IIC z6rkVGZ((n95$Kp#a~8qxEP-|!#zWDzeIxdJJMu|nd8A#UPQ>6%G?LGtv3w>?;InKJ zO*AAbg+#A8B+@YhB&zg@;{!;!AF4UoSRPf=GPLs$5bV&@Pk7*`uBFB!v>SFfAJ_{r^l98K z%+N)+eI`Sn#qDz$R1z7wI764*J?(Cb{WL^H;_1jFGiVggq;cFxlQ~E;_;{Mbvk;_a z(?YZ@;uCBlE~Y=zUknkkDi=XOoSzs1b{f;J1K0EXdouKeYpELWAS$S_(XVr=V63JB z9Mc#aRv?m!P*4G?Uo5@)`T|O=wo$Br#BUoCL#e|wia7m&tin_+hRn5~c&QQJFB6OY zatW6!L|*xlP@3)h01-25vsy#ochE=3_77+TM@WXe3vKdVi0zdxLtoC&mBI-M5ft)5 z!ytomDuc{?L&#we(z5(OBBeH|hFL^#;$;x|AGi7AplPiz=;9SlS@C0L)KFm^g?g3MTVzY|(8H#r!u?lVepOz$t1Nt|fKLpK> zRA!bShi;kebTy!5V?0m9eJ&rz4Y)V)Oe}~}6zXX{ zk4mK}(ln_7*>V}io{7-09KS+c!7I5%gW7mCuQ71zd4qx5$eRq@S$wtubz390SR?uj K+zS38Z}@*fvz^`m literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class new file mode 100644 index 0000000000000000000000000000000000000000..d905b17dc90107e55268fe554fa9081aa62500e5 GIT binary patch literal 12812 zcmcIq34B~tx&MFn-ee||X_`*cWxAzHz_g_qXbY64lD=mZeORn|9jC%rHya zR6)Q6&;p7S1%(Q-D9S3GZYsFI)4JgXE)P+j`V@D0DxwekpS#S=?aU+rey{oU-tT

u@=K?!$ivP=n|F_@#RP%8&n1?_c}z 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 YWUkC}p!NcEwgWAdWwPAqT_yAW4VW&7`Tzg` literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class new file mode 100644 index 0000000000000000000000000000000000000000..8c572e11cb06239559697d37d29c3b67739c57ed GIT binary patch literal 2040 zcmbVNTXWk)6#mvptVB^_H}nE+D7~cAcG{{?pcIEd>e8mI(;937NV(%>={oGB;uj*J;<^^OYMNNoF}qg5osuG<|1?Y`#?+>Q!8sig{I zw<+S7HcibVExeZU_@K7`waQ=xTz7T^;oT^W0rXVBW#~3U6sxdW-l7nC$)2HnVl#%~ zhR{38Yw(B%LK6VPnNoe1zvQmZDS+qgT?!__FZw)adwePLZ|OF}%@cT-g_}TFaT+^A zYJXc^r#K?-H$%aCuL<2Mn&f9XR7`mB_Z6svmX4Luqn* zd0b|08BQF`qu}5kzOYbru!1j%!TU<-SVz2?BL`3L)Il8^3~R>&ov_vzE{>;?VYVxDMhX?iLaCfq zMqf+ct;<*wgY!wP9B8Nvi3`C4h6^LtQ?1)fK2~i!!*kP=4eB*5V$E=A3DwV3YJm*<@jBHTQMp)pl5u&|fUqnXuWeH|QZHxGB-c7SkqVVt zOT_5=j3Rl)So9FZw+O z=W!T{sOFnSBY*!Mo(UOVTJGyS^n4L7rH0j^(Lt%E5jdDQb;{Sb2pB!(Sv75}W z?AaRk{idWsvhWkbwIlqzDIV&P@%M0lH=sakkxnj2Mslk18`!V3$>9{O z`9wJl^Y7%O7w`^F(}@Nz&eAPo+#s1Fd3t#dxmTEAcunwlg{d5VA$^K9j|tkFnKVZj zPJ(F=$S%V)yK{J#u-_x?6m<|#T%(81(>3$Z9g@airn3Ae@_Voj(T{pMlcDZo6;ZTJ zu@St%x|c8j6e@d|{v9*+9_TmwU&Ohg*b8_c7s+%IAJCe^C8E>FEBKzIO~6h3fEIaw Poz8}@62)9b1fgc5Pg%+#x*nq5vF}R3L>?DX8~NvQ4*g?8sgt@<;d` za48Z8#F-z3m~|X#8X5wZot^c(=eKWWzyJ916~I%}EfjFaLKb(6ShbMHy&~=x@t}w` zLSb8ZO79S|^~NC~x9j&LVX37&xgQNWGI%RGE}v9depk4MB2Xqz4s-fgg@oFH3_{;) z%P>^F_u{<{L|6L(!G7g=GT3!R7)q|&Z*~2F6UZZ1n(xZ%JN?n16ZLu{M@~?oGiLim z6R!Q4zDdZ7;m{osn)MmXJ%1pSm#{V)trPK1IFVMa(^8>kmclTWPiV}|LMXqM`q=Ls zh(HXaW&%Q~t@@tOQNVWf|6kGe-&G_|H+NY5dVPE&SFoLLIwx%HiO>Jubi{lsO~g6_Xh7GtM#` z^INCLeB@0UT#doCaX|v+Qe4F~hE)xWI00%g@Ot?ZMeM9yXx%2F4 hX{CgH!pSmo3F}SVirJTOJB}+@;%KpeJXUZS)=yGMV;=wj literal 0 HcmV?d00001 diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class new file mode 100644 index 0000000000000000000000000000000000000000..8fffa9f5ba9c732942eea8241488a2f2d17b2743 GIT binary patch literal 762 zcmbVK%}T>S5dJoewvEwh{r94R2lZf1;-TV26omK#6~W^+UF%A^f!&Sh3-~;GDk%5> zK9o3{RuRD>ZeZq{+4=c)CU5W0uK;$i6kr5%Wy}ZgoL(qnkzwvkXp^a?Fh*wT;Ld8E z*i18oM@k93pK@b_VHn+&O4>b!()z{)gTJ4(1w$>CN}S}~meA+Cm6E3(X9-U)xR%Zy zIDLC9sm4y6WZg)Mt5moiQgx!veYcgj+xL<9>};Ywqc19^!B8O%jvp0SUf+ms_$`le zE7RyISBa&I=x_iixZ0E*#ci&M&cpEN-64$HS(i&SVAJ^4GnU5wA#pI$#vXkPK{LyB zA`Yb+((KPCZn+mRjGYK$kA)kj2~k0nVFv>;ST24qE~8R?PD9@tZHJw|f0aE1s8hy4JIV}h(IYM7)VE_sEtJCzrBmpzmo i3Da0e_Va6)BJ81#5~d3@gIUr(MR_O_3JT;?eDDD%J<_lM literal 0 HcmV?d00001 From bca7b377714b481dec96ab6ca49560f463c8b93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 20 Sep 2021 12:47:40 +0200 Subject: [PATCH 02/12] Added readme file --- testing/assertJ/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 testing/assertJ/README.md diff --git a/testing/assertJ/README.md b/testing/assertJ/README.md new file mode 100644 index 0000000..61c8425 --- /dev/null +++ b/testing/assertJ/README.md @@ -0,0 +1,4 @@ +# Examples for [Verifying Lists Using AssertJ on reflectoring.io](https://reflectoring.io/verifying-lists-using-assertj) + +This repository contains the source code of the article's examples. +It's based on Spring Boot with really simple code for business logic and with focus on testing. \ No newline at end of file From cf8638332559313da893082d3887aca35d563f72 Mon Sep 17 00:00:00 2001 From: Tom Hombergs Date: Sun, 26 Sep 2021 09:06:46 +1000 Subject: [PATCH 03/12] feature flag patterns --- .../featureflags/FeatureFlagService.java | 2 + .../ff4j/FF4JFeatureFlagService.java | 5 +++ .../LaunchDarklyFeatureFlagService.java | 7 ++++ .../featureflags/patterns/ifelse/Service.java | 22 ++++++++++ .../replacebean/FeatureFlagEvaluation.java | 8 ++++ .../replacebean/FeatureFlaggedBean.java | 42 +++++++++++++++++++ .../replacebean/FeatureFlaggedService.java | 12 ++++++ .../patterns/replacebean/NewService.java | 8 ++++ .../patterns/replacebean/OldService.java | 8 ++++ .../patterns/replacebean/Service.java | 7 ++++ .../replacemethod/FeatureFlaggedService.java | 29 +++++++++++++ .../patterns/replacemethod/NewService.java | 11 +++++ .../patterns/replacemethod/OldService.java | 11 +++++ .../patterns/replacemethod/Service.java | 7 ++++ .../FeatureFlaggedServiceModule.java | 31 ++++++++++++++ .../patterns/replacemodule/Service1.java | 7 ++++ .../patterns/replacemodule/Service2.java | 7 ++++ .../patterns/replacemodule/ServiceModule.java | 21 ++++++++++ .../replacemodule/newmodule/NewService1.java | 12 ++++++ .../replacemodule/newmodule/NewService2.java | 13 ++++++ .../replacemodule/oldmodule/OldService1.java | 12 ++++++ .../replacemodule/oldmodule/OldService2.java | 13 ++++++ .../togglz/TooglzFeatureFlagService.java | 5 +++ .../patterns/replacebean/ReplaceBeanTest.java | 40 ++++++++++++++++++ .../replacemethod/ReplaceMethodTest.java | 40 ++++++++++++++++++ 25 files changed, 380 insertions(+) create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/ServiceModule.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java create mode 100644 spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java create mode 100644 spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/FeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/FeatureFlagService.java index 50157a4..2cdaa9a 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/FeatureFlagService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/FeatureFlagService.java @@ -22,4 +22,6 @@ public interface FeatureFlagService { */ Boolean isUserActionTargetedFeatureActive(); + Boolean isNewServiceEnabled(); + } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/ff4j/FF4JFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/ff4j/FF4JFeatureFlagService.java index 023c1d7..18c3fe0 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/ff4j/FF4JFeatureFlagService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/ff4j/FF4JFeatureFlagService.java @@ -33,4 +33,9 @@ public class FF4JFeatureFlagService implements FeatureFlagService { return null; } + @Override + public Boolean isNewServiceEnabled() { + return null; + } + } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/launchdarkly/LaunchDarklyFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/launchdarkly/LaunchDarklyFeatureFlagService.java index e956c80..2593fd6 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/launchdarkly/LaunchDarklyFeatureFlagService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/launchdarkly/LaunchDarklyFeatureFlagService.java @@ -4,11 +4,13 @@ import com.launchdarkly.sdk.LDUser; import com.launchdarkly.sdk.server.LDClient; import io.reflectoring.featureflags.FeatureFlagService; import io.reflectoring.featureflags.web.UserSession; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @Component("launchdarkly") +@Primary public class LaunchDarklyFeatureFlagService implements FeatureFlagService { private final LDClient launchdarklyClient; @@ -56,6 +58,11 @@ public class LaunchDarklyFeatureFlagService implements FeatureFlagService { return launchdarklyClient.boolVariation("user-clicked-flag", getLaunchdarklyUserFromSession(), false); } + @Override + public Boolean isNewServiceEnabled() { + return true; + } + private LDUser getLaunchdarklyUserFromSession() { return new LDUser.Builder(userSession.getUsername()) .custom("clicked", userSession.hasClicked()) diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java new file mode 100644 index 0000000..0325052 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java @@ -0,0 +1,22 @@ +package io.reflectoring.featureflags.patterns.ifelse; + +import io.reflectoring.featureflags.FeatureFlagService; +import org.springframework.stereotype.Component; + +@Component +class Service { + + private final FeatureFlagService featureFlagService; + + public Service(FeatureFlagService featureFlagService) { + this.featureFlagService = featureFlagService; + } + + public int doSomething() { + if (featureFlagService.isNewServiceEnabled()) { + return 42; + } else { + return 1; + } + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java new file mode 100644 index 0000000..79aeda4 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java @@ -0,0 +1,8 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +@FunctionalInterface +public interface FeatureFlagEvaluation { + + boolean evaluate(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java new file mode 100644 index 0000000..7991104 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java @@ -0,0 +1,42 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +import org.springframework.beans.factory.FactoryBean; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; + +public class FeatureFlaggedBean implements FactoryBean { + + private final Class targetClass; + private final FeatureFlagEvaluation featureFlagEvaluation; + private final T beanWhenTrue; + private final T beanWhenFalse; + + public FeatureFlaggedBean(Class targetClass, FeatureFlagEvaluation featureFlagEvaluation, T beanWhenTrue, T beanWhenFalse) { + this.targetClass = targetClass; + this.featureFlagEvaluation = featureFlagEvaluation; + this.beanWhenTrue = beanWhenTrue; + this.beanWhenFalse = beanWhenFalse; + } + + @Override + public T getObject() { + + InvocationHandler invocationHandler = (proxy, method, args) -> { + if (featureFlagEvaluation.evaluate()) { + return method.invoke(beanWhenTrue, args); + } else { + return method.invoke(beanWhenFalse, args); + } + }; + + Object proxy = Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[]{targetClass}, invocationHandler); + + return (T) proxy; + } + + @Override + public Class getObjectType() { + return targetClass; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java new file mode 100644 index 0000000..7bcb98e --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java @@ -0,0 +1,12 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +import io.reflectoring.featureflags.FeatureFlagService; +import org.springframework.stereotype.Component; + +@Component("replaceBeanFeatureFlaggedService") +class FeatureFlaggedService extends FeatureFlaggedBean { + + public FeatureFlaggedService(FeatureFlagService featureFlagService) { + super(Service.class, featureFlagService::isNewServiceEnabled, new NewService(), new OldService()); + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java new file mode 100644 index 0000000..8f86362 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java @@ -0,0 +1,8 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +class NewService implements Service { + @Override + public int doSomething() { + return 42; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java new file mode 100644 index 0000000..b09fe2b --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java @@ -0,0 +1,8 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +class OldService implements Service { + @Override + public int doSomething() { + return 1; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java new file mode 100644 index 0000000..1ea1096 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java @@ -0,0 +1,7 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +interface Service { + + int doSomething(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java new file mode 100644 index 0000000..349d2b5 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java @@ -0,0 +1,29 @@ +package io.reflectoring.featureflags.patterns.replacemethod; + +import io.reflectoring.featureflags.FeatureFlagService; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +@Component("replaceMethodFeatureFlaggedService") +@Primary +class FeatureFlaggedService implements Service { + + private final FeatureFlagService featureFlagService; + private final NewService newService; + private final OldService oldService; + + public FeatureFlaggedService(FeatureFlagService featureFlagService, NewService newService, OldService oldService) { + this.featureFlagService = featureFlagService; + this.newService = newService; + this.oldService = oldService; + } + + @Override + public int doSomething() { + if (featureFlagService.isNewServiceEnabled()) { + return newService.doSomething(); + } else { + return oldService.doSomething(); + } + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java new file mode 100644 index 0000000..8e35101 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java @@ -0,0 +1,11 @@ +package io.reflectoring.featureflags.patterns.replacemethod; + +import org.springframework.stereotype.Component; + +@Component +class NewService implements Service { + @Override + public int doSomething() { + return 42; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java new file mode 100644 index 0000000..1ea4ba2 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java @@ -0,0 +1,11 @@ +package io.reflectoring.featureflags.patterns.replacemethod; + +import org.springframework.stereotype.Component; + +@Component +class OldService implements Service { + @Override + public int doSomething() { + return 1; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java new file mode 100644 index 0000000..2999df2 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java @@ -0,0 +1,7 @@ +package io.reflectoring.featureflags.patterns.replacemethod; + +interface Service { + + int doSomething(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java new file mode 100644 index 0000000..7d2296e --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java @@ -0,0 +1,31 @@ +package io.reflectoring.featureflags.patterns.replacemodule; + +import io.reflectoring.featureflags.FeatureFlagService; +import io.reflectoring.featureflags.patterns.replacebean.FeatureFlaggedBean; +import io.reflectoring.featureflags.patterns.replacemodule.newmodule.NewService1; +import io.reflectoring.featureflags.patterns.replacemodule.newmodule.NewService2; +import io.reflectoring.featureflags.patterns.replacemodule.oldmodule.OldService1; +import io.reflectoring.featureflags.patterns.replacemodule.oldmodule.OldService2; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +class FeatureFlaggedServiceModule { + + private final FeatureFlagService featureFlagService; + + public FeatureFlaggedServiceModule(FeatureFlagService featureFlagService) { + this.featureFlagService = featureFlagService; + } + + @Bean("replaceModuleService1") + FeatureFlaggedBean service1() { + return new FeatureFlaggedBean<>(Service1.class, featureFlagService::isNewServiceEnabled, new NewService1(), new OldService1()); + } + + @Bean("replaceModuleService2") + FeatureFlaggedBean service2() { + return new FeatureFlaggedBean<>(Service2.class, featureFlagService::isNewServiceEnabled, new NewService2(), new OldService2()); + } + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java new file mode 100644 index 0000000..d9dc7dc --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java @@ -0,0 +1,7 @@ +package io.reflectoring.featureflags.patterns.replacemodule; + +public interface Service1 { + + int doSomething(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java new file mode 100644 index 0000000..e8c7c5d --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java @@ -0,0 +1,7 @@ +package io.reflectoring.featureflags.patterns.replacemodule; + +public interface Service2 { + + int doSomethingElse(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/ServiceModule.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/ServiceModule.java new file mode 100644 index 0000000..b2d9c02 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/ServiceModule.java @@ -0,0 +1,21 @@ +package io.reflectoring.featureflags.patterns.replacemodule; + +import io.reflectoring.featureflags.patterns.replacemodule.oldmodule.OldService1; +import io.reflectoring.featureflags.patterns.replacemodule.oldmodule.OldService2; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +class ServiceModule { + + @Bean + Service1 service1() { + return new OldService1(); + } + + @Bean + Service2 service2() { + return new OldService2(); + } + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java new file mode 100644 index 0000000..cea5efb --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java @@ -0,0 +1,12 @@ +package io.reflectoring.featureflags.patterns.replacemodule.newmodule; + +import io.reflectoring.featureflags.patterns.replacemodule.Service1; +import org.springframework.stereotype.Component; + +@Component +public class NewService1 implements Service1 { + @Override + public int doSomething() { + return 42; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java new file mode 100644 index 0000000..a492333 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java @@ -0,0 +1,13 @@ +package io.reflectoring.featureflags.patterns.replacemodule.newmodule; + +import io.reflectoring.featureflags.patterns.replacemodule.Service2; +import org.springframework.stereotype.Component; + +@Component +public class NewService2 implements Service2 { + + @Override + public int doSomethingElse() { + return 42; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java new file mode 100644 index 0000000..98b9dba --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java @@ -0,0 +1,12 @@ +package io.reflectoring.featureflags.patterns.replacemodule.oldmodule; + +import io.reflectoring.featureflags.patterns.replacemodule.Service1; +import org.springframework.stereotype.Component; + +@Component +public class OldService1 implements Service1 { + @Override + public int doSomething() { + return 1; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java new file mode 100644 index 0000000..7062df8 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java @@ -0,0 +1,13 @@ +package io.reflectoring.featureflags.patterns.replacemodule.oldmodule; + +import io.reflectoring.featureflags.patterns.replacemodule.Service2; +import org.springframework.stereotype.Component; + +@Component +public class OldService2 implements Service2 { + + @Override + public int doSomethingElse() { + return 1; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/togglz/TooglzFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/togglz/TooglzFeatureFlagService.java index 15e6b98..857c6a1 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/togglz/TooglzFeatureFlagService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/togglz/TooglzFeatureFlagService.java @@ -26,4 +26,9 @@ public class TooglzFeatureFlagService implements FeatureFlagService { return Features.USER_ACTION_TARGETED_FEATURE.isActive(); } + @Override + public Boolean isNewServiceEnabled() { + return false; + } + } diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java new file mode 100644 index 0000000..c463502 --- /dev/null +++ b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java @@ -0,0 +1,40 @@ +package io.reflectoring.featureflags.patterns.replacebean; + +import io.reflectoring.featureflags.FeatureFlagService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.mockito.BDDMockito.given; + +@SpringBootTest +public class ReplaceBeanTest { + + @MockBean + private FeatureFlagService featureFlagService; + + @Autowired + private Service service; + + @BeforeEach + void resetMocks() { + Mockito.reset(featureFlagService); + } + + @Test + void oldServiceTest() { + given(featureFlagService.isNewServiceEnabled()).willReturn(false); + assertThat(service.doSomething()).isEqualTo(1); + } + + @Test + void newServiceTest() { + given(featureFlagService.isNewServiceEnabled()).willReturn(true); + assertThat(service.doSomething()).isEqualTo(42); + } + +} diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java new file mode 100644 index 0000000..dfb36a3 --- /dev/null +++ b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java @@ -0,0 +1,40 @@ +package io.reflectoring.featureflags.patterns.replacemethod; + +import io.reflectoring.featureflags.FeatureFlagService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.mockito.BDDMockito.given; + +@SpringBootTest +public class ReplaceMethodTest { + + @MockBean + private FeatureFlagService featureFlagService; + + @Autowired + private Service service; + + @BeforeEach + void resetMocks() { + Mockito.reset(featureFlagService); + } + + @Test + void oldServiceTest() { + given(featureFlagService.isNewServiceEnabled()).willReturn(false); + assertThat(service.doSomething()).isEqualTo(1); + } + + @Test + void newServiceTest() { + given(featureFlagService.isNewServiceEnabled()).willReturn(true); + assertThat(service.doSomething()).isEqualTo(42); + } + +} From 3cf348e2d8fe125d0cf84f317215e7c00b076adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 27 Sep 2021 07:37:49 +0200 Subject: [PATCH 04/12] Removed target folder --- .../target/classes/application.properties | 12 ------------ .../gymbuddy/GymBuddyApplication.class | Bin 763 -> 0 bytes .../gymbuddy/domain/Person$PersonBuilder.class | Bin 2281 -> 0 bytes .../reflectoring/gymbuddy/domain/Person.class | Bin 4391 -> 0 bytes .../domain/Session$SessionBuilder.class | Bin 1918 -> 0 bytes .../reflectoring/gymbuddy/domain/Session.class | Bin 2942 -> 0 bytes .../gymbuddy/domain/Set$SetBuilder.class | Bin 1282 -> 0 bytes .../com/reflectoring/gymbuddy/domain/Set.class | Bin 2471 -> 0 bytes .../domain/Workout$WorkoutBuilder.class | Bin 1568 -> 0 bytes .../reflectoring/gymbuddy/domain/Workout.class | Bin 2745 -> 0 bytes ...rsonAddRequest$PersonAddRequestBuilder.class | Bin 1361 -> 0 bytes .../gymbuddy/dto/person/PersonAddRequest.class | Bin 1489 -> 0 bytes ...dateRequest$PersonUpdateRequestBuilder.class | Bin 1575 -> 0 bytes .../dto/person/PersonUpdateRequest.class | Bin 1519 -> 0 bytes ...ionAddRequest$SessionAddRequestBuilder.class | Bin 1708 -> 0 bytes .../dto/session/SessionAddRequest.class | Bin 1915 -> 0 bytes ...ateRequest$SessionUpdateRequestBuilder.class | Bin 1376 -> 0 bytes .../dto/session/SessionUpdateRequest.class | Bin 1377 -> 0 bytes .../SetAddRequest$SetAddRequestBuilder.class | Bin 1040 -> 0 bytes .../gymbuddy/dto/set/SetAddRequest.class | Bin 1053 -> 0 bytes ...tUpdateRequest$SetUpdateRequestBuilder.class | Bin 1076 -> 0 bytes .../gymbuddy/dto/set/SetUpdateRequest.class | Bin 1083 -> 0 bytes ...outAddRequest$WorkoutAddRequestBuilder.class | Bin 1322 -> 0 bytes .../dto/workout/WorkoutAddRequest.class | Bin 1311 -> 0 bytes .../gymbuddy/repository/PersonRepository.class | Bin 708 -> 0 bytes .../gymbuddy/repository/SessionRepository.class | Bin 653 -> 0 bytes .../gymbuddy/repository/SetRepository.class | Bin 722 -> 0 bytes .../gymbuddy/repository/WorkoutRepository.class | Bin 738 -> 0 bytes .../gymbuddy/services/PersonService.class | Bin 1087 -> 0 bytes .../gymbuddy/services/SessionService.class | Bin 869 -> 0 bytes .../gymbuddy/services/SetService.class | Bin 660 -> 0 bytes .../gymbuddy/services/WorkoutService.class | Bin 619 -> 0 bytes .../implementation/PersonServiceImpl.class | Bin 6411 -> 0 bytes .../implementation/SessionServiceImpl.class | Bin 4494 -> 0 bytes .../implementation/SetServiceImpl.class | Bin 3097 -> 0 bytes .../implementation/WorkoutServiceImpl.class | Bin 3400 -> 0 bytes .../gymbuddy/ExtractedPropertiesTests.class | Bin 14221 -> 0 bytes .../gymbuddy/FilteringTests$1.class | Bin 1404 -> 0 bytes .../reflectoring/gymbuddy/FilteringTests.class | Bin 15508 -> 0 bytes .../gymbuddy/SoftAssertionTests.class | Bin 12812 -> 0 bytes .../SessionStartedTodayCondition.class | Bin 2040 -> 0 bytes ...ersonExtractors$PersonSessionExtractor.class | Bin 1290 -> 0 bytes .../gymbuddy/extractors/PersonExtractors.class | Bin 762 -> 0 bytes 43 files changed, 12 deletions(-) delete mode 100644 testing/assertJ/target/classes/application.properties delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Person$PersonBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Person.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Session$SessionBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Session.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Workout$WorkoutBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Workout.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest$SetUpdateRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest$WorkoutAddRequestBuilder.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/workout/WorkoutAddRequest.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/PersonRepository.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/WorkoutRepository.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/WorkoutService.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/PersonServiceImpl.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SessionServiceImpl.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class delete mode 100644 testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/ExtractedPropertiesTests.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests$1.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors$PersonSessionExtractor.class delete mode 100644 testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class diff --git a/testing/assertJ/target/classes/application.properties b/testing/assertJ/target/classes/application.properties deleted file mode 100644 index 365be0a..0000000 --- a/testing/assertJ/target/classes/application.properties +++ /dev/null @@ -1,12 +0,0 @@ -spring.application.name=Gym Buddy - -spring.datasource.url=jdbc:h2:mem:gymbuddy -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.username=reflectoring -spring.datasource.password=reflectoring -spring.jpa.database-platform=org.hibernate.dialect.H2Dialect - -spring.jpa.hibernate.ddl-auto=create-drop - -spring.h2.console.enabled=true -spring.h2.console.path=/h2 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/GymBuddyApplication.class deleted file mode 100644 index f9e56751406062027bdf5c00a85f73524ca37a94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 763 zcmb7CO;6h}7=Bz@QbISNYz)|T*sW9o-`JrO5>y(OFc3xEVJ9bbgCVgi#~Jiz?X-yl zKVUy<+UtPS9=gLK<#pcg=Xsppe;ytIe8l?@b-WI+72*xH1MDy?e^OexBZj5U-jJc* zHzUcg7AY;ilzA-em54Knv?G&1?u)H86twO7FqHl@Lv3(^ehXVP7p(S@)g zmrhzL32Mz3kd6%9f8u#UFt?qq z&z2-;+?ms}pNXRAEs$_;AyXpgVH*8PR0ue1J;GN6utdS)}4c!@QN VuhZLLfE6({BtBl-qa11P$lX=Le_^5z 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 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set$SetBuilder.class deleted file mode 100644 index be272151167b37e7f8a9a077c987a252349acbc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmbV~eQVQD6vm&MzNCq1*G--8&S}*)1A{2|hoay>bkt3lR1_v8&9%+Ui>9e#-%9@& zf`T8w4<$Y~t(|Nu9V2kgy*KCl?mf>rzyJLB1>gZzOc+=;P{DO&ZYa}G=BAEYCd#<2 zqp71Mpas5wSQ9Ak$e`EH1d6HrG!W2tlJsLTxDd7XeV7a?6_&5_T$51 z)(?2Kxhb=!!yxo!Dqy{cW0|go?qDGK@9yl!FuSo&;G6C@*IFk?tG|?4Kk;9=sT;{m zro4TtIh*rOi<4Yg@>JOZ&F1m4S)93<4AZWB7ARFKtozQk`^DvQT@JG6$sn^($Gim- zrz}{?RF$b=PM|TfvE-?ITfjL^?0>oo)YU_r(B-^rc-x#E)rr~q9cW*xgJlk`!MQF% zQ)O_asY-IsVsg)V=*!@>n5SLf&Y>6dCHp(Xw><3hI0$%$GhADv0G!2n?x-d%5U!G+ zpui8%?WH|v_E#=7sC1Ja*g^^KbHrl4*T)DZr|;VKO$+-lCP;nGA0ZB(GWvPUHk>JX9}P2sAZOt`h2dl^@Fr1ZT< ubyahWpD4d&gYLTztr;ZwAjMXjRD*tF$!nNF&agN?(e1*MVgz*<%{`sl^ diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/domain/Set.class deleted file mode 100644 index 4983c1bb13a76234ef98f50a62ba2cff3e2ab16a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2471 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 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonAddRequest$PersonAddRequestBuilder.class deleted file mode 100644 index 8571975ae987ef19c256cddb02e567226209df71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1361 zcmb`G+iuf95QhJC;y8AlG!)u$E`L~6g+ZK>pgY=s&fw`JIrNx<_#F`u0Tslf7~O42ym^8F+Axu?=> zyBCDMN(9{ZQKXU`Izg(a@u1O;yI!I`g{qy!d_J#p-fi`K|J?Jl*gMl4ZxpvSS{U%@ za_#E)m1~#&mCByVPGbL1CM0u4hZHbdd`E$o)fqoWhj)(SUeZ>(0Sml1dda8kC3&?^ zg1(E>%*8w^E*#9ca5%CRXVk z*z`>DFjx~B87zy=q>Roa4&?&qhen0s6`FaJ1!c4T6XLsWTNpI);#C^E{RUjaGR?>* zTqihheoNV)Y}KFqfKmTOLj%0s(dB0_v91wI{k8#uHs~`7+@M~QiOh8;b8}j;eFe^mL=^jZnqlV{7IV7 znE2oi@JAWX>{d+5`qG%q-kG^~&g?lecYpr+{sX`c9v3lzM+Fp7k)&R)7|K0&uhCnR50K8z7F@=PPePO3Wo1=v_h$V z?tFCYw&S<#lPL83)~>=hlcMB2r#p_<=GFyqpMua;7<=aVUi4hyZRI9-w4LfH3GD?g z2~E~LUmx^34IRF78ts^3&~)0TPUuNI*fgRuk1BTR&7fn4`h8nBqd@4}t;h>Ys2LSJ>L~s`Np3C9RBC(tliSlK|IEp zO7&*v6(*Qazn2UgqQ#S-7dG{4Pue{@tY%wo2x}eiHtlN}OxMH=Y!j21 zGBGVnNtQCE6rPSW5YFT8Jv?ljbD9eKBbEBsG!(Lx>M0)ZCz{|tW*{T{>19MhY^fr) z6hb=&MVYfapJViyHb=W?eS@-UePpc7KC;$UABMGH^pX1-W9KD@Snw+bf6fAK;WnQ# zzqY`-cX;w7sl<4Zk>m>#6??)Z6MMoY8+*dXz+L*&22*MHmiU(WW=L{rK(a$C;Pr&$ z6~=^T?FxCJN;@uWX$vWQOZ-NejAvriOH{pv`IzrqQuLbdI__bae1%a?F#v-V+~+E- zvS~$3&bmV83!Mz>B>fbv(g8C`7*tf8N*Xvj3|>wJucm^HVeo1y_+ctIHw@lL0cY7D V5x0&FT7!~I4jQ~*;uSgg!f&JnHFy93 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest$PersonUpdateRequestBuilder.class deleted file mode 100644 index c49f3e788412e5a49eb03649f049c9db9202e770..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1575 zcmcJOO>fgc5Qg8)mm9}zLV;4sHv~vhs1ZH1qG=JWRDl#qMQ8-aO}wP896Q(!s5gER z91s#n`~ZFwVrCnqNJ)CI#ARpJo_%KLo!Q@ie*6NkhLt?>xNXA39rnt++~wsSFZT^p zOc38jB9J+pYLtw^}QGD`0t9sJ)=u=-t(WfAE1ak4A z8OBEjm&b|z(6ETS-;8w=lQTuV4=fa5S(xQzj+Y`Vf%T+A#mt8S&7|kg z=oU5W^qIVBAJM!Eq$@mrZ?Hmtw87CAqXE#ehor>6fR+jb`-B^0$0e-QstjZge~Ce z5c_n9H5i+&eW9onm}zRxW4iC^KU`zPHFOmtZh?*nDrh1%Gsayb?)nrit1{xwYVO=* zZgz}YC+_AHE~`A^&S`FOGB-EIeMa2vDO~Q_h+EX$Yq(CIxNWOQlLzE~!gxnrn>kgO h`wQ%9DibJZsBRiJXqUoGni{qSE|WDWCQtq%#9xdHV2J<# diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/person/PersonUpdateRequest.class deleted file mode 100644 index c810d1de9a87a1142c11e680b26ab175e641090c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1519 zcmcIjT~8B16g|^!DJ`o&i+qV+2-t3c^}$3V#s`Te#)3qI_`2b zSu5`>4dmXVdN@|J@EoBeyZ@Qb{Ra{O8t<8 zwnLYMCYxTMcl+Izj@~*gKcN`59skgYJedy{jrho;ipR}%*tH}5-q-Co6#91OwA<>t z?y2p@p?#7R#LlP-Wlrtr_$YMuoQS1}8L9BDHgdw1j6;US-x7Vr)}Kxs{FgI$LPy8D zNmplT^~;S=m|#HjytU(;Jx{wU8++#sF7Jo^sI6akQvLZ1S(|cam~NN%Ye!3~dM0LI zo0!CuiD?-sGE_08@MzQ)u|t0^=j+xnTdc4@YPNs$MfbW6B` ztNf}wZGm~`x$_{+#Q7p;5-&_t;t7{r;t894;t3xE*Xd6i45i^;;a}ySBgv&9$u6yc zS5uN_7!#h2GZcj??YOX|EoJbn@Qf-M&m^jssCor+3E$Z?={et3+`vup6-EWc2{^fh z+Z?4-Hm!&$SZBz6p_5~tw4S0>DqyAo!;Feu$pYsuf^TMmmove}MeuSa_--b+a1p$g Z0nW2PB5oCHv<4-aY&3Ym#4EG$>Nk%WLlOW0 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest$SessionAddRequestBuilder.class deleted file mode 100644 index 209ae9f43d8460d647b0587935cf0aee27107dfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1708 zcmcIk+iuf95IvjJb(0!;0Yc0DQXokYmgqx~T8c^$0uf4SOA(JwytG>!8|*cxU&AlJ z1406c58$H^XYJ6GhJXb0WoA8|J#+T#%zpj$=?j2aTrFb=7fY})Wy~dGF59?LhJ~t) znvJ@Em1r;40+Wqx@3rS@)s}7}YI(sOPs??F%?T7`=nD+JiQ*SgsuO|HJUP`Wa2qPo z%qgv@&Ct_nECn9y`#s-iMQt~h&jZ=gQLMsEcXOxROnraH^>yTSfZeBgfkoe6m9J7s z+yx>J&Z|)A1=6V2HUtKiBA+!z8Y+~_X}c-ob*~vPGM>@i@M2}YJHY|HrAT;UO(uzo z!Y=gfR0Y0_1)Td~DC4ETOA^V<)jx1$k^ypi0H=B)of14kyV_UX+CkJCeJJ%-;Fqr90+x*X<9;HuKL&Tyz25=l*TQ2SDBWq z^z_6vGi98mWp?+yDA5i^G3KCzvV&n`92^pu{r$Z3?LmV!EwJ*J+xxaKCq8=}0*|Bn zsJYEC7I;$q|E*iwzLwvuAC>U9|Di~!lPjMh{I9reK6(cW<(T+3X(hGX4{t@DR zmU4u4Fbldk%C(ax;20+O#WxF+1UH*+(HH3L`t%1B>hHKLz-%vP;p?n5lR;GSvoR4gKN&bi#wd*IygyL4ByA3vCDTL!!7RNJ5Su3eQskMRt diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionAddRequest.class deleted file mode 100644 index b94fa8c5eab4b842fc30ad273b62595879658390..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1915 zcmb_cZBG+H5T5M|rKKnW)&e3RD5X$Nd?NxOL4=^TNC5Hkwzt4R?+)+wRK6I0k|q!n zKllUuQO0N50$SRTfNgGfXJ+S_XJ%*j*Y6)ciD;UhCMZsmacU)lhX*`N#VNsJg2e<) z#pq#-9>wUfp!A0Feam$gOmkhm50tN;2Ugiso}lDQ$5Gy5S^B>61x0-=JuRpwzb8LP zLtC~o@@`3%Ur4PsA_BR4bp&-C;+HEFa;7=BvNB`aGd}Rb$}t7CessNkH_%XYREY)J zDjRvrXN>rUwc|(~cuLUgI`dqGkEgcFs-#`da(0ZJL%SH5=AmI~*Qfy-@2UaL3N$+p z+?2q*<44?WnXLY zS;mbOPx^iR{|7*S?kK%cy*PcDv8Ek?hQh`r?&vlwYCVU_cb+(%b&H_FIptNVD=4wy z23|=mTikD{bLE=k3lCzecpVCgThmWcnw})7ovtORi-&HyDQKE+c=H?8v>S1ED{o3! z;u5|o?%_fTTDv4z)8odIkr~^fAv}n2Je6SzF@M6HgVct(1K$mwI$=OgjSa{Xh7>$P zbc>=`r>O^6z0iDyE`qr``<+B~{Fp-7iDL?9bH^0<27Q?NFs9%|2ogb%IO=u{h+WX$ zhBjOEr+&Hv2}m`DykbhBijFyiX#nda;WSSB) z1NB#F9#NE;jvrAAlf@jX@eTdOHw|Vzh}R3)K5*qf!&iV#`S#N=jeyf2Y*7J$Al#$- z7&)?mnF&X;M-=*sMKwZ8MLAGGtY#FgAqpC8=p3$h9&YHIp)rK0j~uCY9&O-UEnF5= X9k1}5pd981m?lsK!pN&u^iBK^(LCH8 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest$SessionUpdateRequestBuilder.class deleted file mode 100644 index b5825412103b9cfb70f3357e7418de5bbd9acb90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1376 zcmcJPTWb?R6vzLw$!4?L)vom#>#Z7flZsmr5o}4piYTO2Yz>M}v)QrTvKO752z~P- z>4OLgegHp|cxDr#V48;p_hHVN;mq$`=A8Zc>)Q_i_u<>HaLGX(m$i09FH07#Ixum~ zLes)^2D4CHDuzaPpMT(iic=AE^FB`=aV2(Wx5`ivS;SCNdvVcRVOZ<-^E8m+Z6f+A zmvOcm>>i}yAc_uxNaaBxiXzUlV0$QEzKaO;LcAY{LJ_UD7H6^QFs%EtfLc9<>P8+3 zhWT!siLF5z3c16>giaR96nb37dOtd>>I4`TC&l$}5GRq44DQn`6LKTr1*O68YK9P- zQyftpyiK9@^5{92JQYev@>ckVzC!E&1!9Ied4`TZixbMo+0F;DFCNGG2^y2Kzpa~$ zp}s|}@FXvk3m3;+9LEh8HXIjoa2OsOy}vZ;CPVM&glVrvk5*1e!l~z6Dyh`mfyj zi))R!RvGn}Ytt1*2~6Zx|KY9>_s$_)U4=1suH-gwo{n@G?oz>Yvi5hFuc->PKM@bB faId7gL!(i&6)e&f0~c_ylqOD-)Ltx#;}qC$%(`9` diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/session/SessionUpdateRequest.class deleted file mode 100644 index d8c66595eb6b927862eb3b10d4327fc77bb829cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1377 zcmcIkT~8B16g|_HZd;6eKICMOcW((S~Pq#8lR@!0T%ZIcc(`Fl_n4q zAN&FSDC3!J<-sgIVBBW!ow;}JJ#+58+aEu_eFyLejS?)}DI$*rBNmG&m{kFb7VcWO zXQ3uAv!mkJ4THU7M{2dLKJ-+qpY~kOQISCTMG&ZH-IH;wVu7Jp%Sa1Un@94aw6*Ii zyBT(+_l&W-+^y2L-3yGP?Z$4$Q%`~*)KU|H@ypF_=-c};)++ksd-jp+zK_Gemgk4; zm)viJkuNoKS;tcIXdp0t!e_bFT6Ubd&CM0xUx}G7s{%(Lzvc$6ek|~?cHzA)bky4d zx%JRd0wYZ~P+L8}qoQ5Os|!>Ta%~y8W0A!&7fH}%c`f)OYjD8194 zk(pZk!lJWhJowx+ue1~PqORI-O}(pWBp#Sq6Byp&V78R$PFzL>^)iN0E@KR3ffX}X zm+J*vkqomZ*}+$xBX(1ueffNUYXm2@R&QgTU!%oOG{YY`K;Q~@!_-&#j>H(HgS^rl zIT|Y%=YeaCc}tz89%+1qXe^x})3|?z?3X0@1Z4#|$}!3ciVVBTut{3x`eB&DG3@O-jSjrWVH4I7Q|&7a164`NTMzWHgoHfk8%rTdBd>KZEB|g0n1* Vftbf_YE$h3N?etaRh~r@zW|>RO;`W` diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest$SetAddRequestBuilder.class deleted file mode 100644 index 28220853c24eeb6710a066c49c0ff6373a5cbc6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1040 zcmb`F&2G~`6ot@CP~Qp` z2ni$}fQLeyF%b|^7Llrv=FVK*`}v+T{{G|3Hvo6B;lssM4^3RN+jSQ=d^l*kxand| zp!r^^(bx!xJpo6{HwAO|Ri?}XfqJJqV0JrCq`+cdWpclq#8SVE;*^=?em;!SL8O(v zPm_)rD>7CNrFoPj2l8zx3-h>CX(F{iu$yI4Z>LdFNLKCihxsJb@^vbQCf6z(g`?w1 zTqenJn3y~)qzPw0n=`j5_MX6QXRmu&tkyGW#(DB0($Pd3sX1pOwgLpUI&*)8!}*7K zsfTh$Ri@1-xN{V}iv$+-Y0}fYFagdW2(SPzfDca~oYNo+SQmIQXWNOs3bgEaVH)vW zp2tUgBkT0(_}m>}jX$KzzqH0h#np+T865~~1oyMNg^Yr+(fbVXu_`;qy;&vOSmfE3 zvH&fdXQZK6A=EZMM4bz8d+krC^*-=egKhU2fps=*REX8;?oJVGsAdwlz^aBNTCRUG zxBd_J7P+1OaIMDQT)*P3;v!Ra-YrgRwRm6QyrSU7pNW47zWtYAZ#r!qm)KInWn8JE OgJnjapeDUsg7*_BN9R)j diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetAddRequest.class deleted file mode 100644 index 1f76e7882d4ed68a2bf23814f7fe03987ed3acc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1053 zcmb_a-)qxQ7(F*>nx>6wH(Q-Qx9XIxg25*rCW1}|E8UcBR(wpFYnzcKn%pY;qkIrH z1RwkZ{G-HkV-+fWDM;z}efPBIobR6G$Ioxy0X)Y2Dr{^xC}UHXwu6eEDrnodW8dh=dv$M?*Z6ZfSj@9FInhoV%R75qm)x%T&qc2c9$43hue6!F6#7 zu7I~>evD76da=)_Uk0a)UEsx%A`8P4;ME3b^Ify~0vh~q&0^xF>?H_pUnkz+=`BoH z?Dg(fi0;M(jBfh^=9hx7%DP4Z;ILL%YoxlwfK3uf!(}wt^`vb?F=- zG~TInI5GmFE8u9gUo!U~%~SJGpx$ctncXN7B{1JhbG11c$4bAHamLI-uNcUzFLi3~ z)1+fYDH%&U%Dmc7q){)_n~5sT<4Kw&N(+R~@?7bSOqQi$VXrqR#*tR9Gc_=UPV-?j zJQ&B5Bsqu@Q$(dQ(JbrQY+?$(FR<0>wvU(Ce6Gx>NVcVxV`Y@4W;eFO2;6P`&$p;D z*eND@pq`}G#&fgN+}e|GrNG=KZF^djCd3JZA?DzR2;d9cKDuR=u_n+xdgozg3pB0H zD3g4$t$2^mXYD^u^V@x_@~8FqC)c=WKy{)Aj1GkLh5Jd~B1XaJc0NITsLD=pZ&b-; z%=2tZS%4%8Z&2HPGmf*M?`Rfxsv?oAPFs5J2jS>;-y znG SfQwahu)r7))S#EA;r{?_r}wD< diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/dto/set/SetUpdateRequest.class deleted file mode 100644 index ff661a2d4980705381896acc70494df92b7ec132..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1083 zcmb_b-*3`T7(JI#N}(ILiTHcNO~Wv;i81kE#s`;}NZ4jJhw-t{JLpo{*#mHJgL@7( z9Bc|S52ZRf4Fe?)35c#hF_Whndln^; zdM;qMyWOom@tri30<~V0$i3-gAhS2YASSZXONT++53)!<&%mM@M^t&z8>SOKlgF_f zsx*s|kv}?{45ndt=7%cvbE*9KDYpgcyHbtQ@O6*{6RBiIrTz9lNNvt*&l1?y3ps<| zarFMDw17L3>g_C1tG&fc9U=!N*2-Zz&4%)2q?2pRkN4;#_z(zG_xQ4QrOr6_u#Ed2 zs_;B4!4r6V`9vA07WU(S`R@--_$~yxm)H4QoB~|4j}}j&!{b@t#d%G~ky(onT%$(3 z&Zl>jJTcaea7>qBdr=7kDqxdzp$gI@OK0mLd6%cLPmar-62~`Cl_` zH*k}X-qGjJ^Yx15Pi<(qX~hA0-=Q#2=tHyi9K-WAyp-agg^?Vv=GE`lQpT!W*59(P<{!2 z0}coYBz^!t3h}&Iq>`v0MfBpapJ(11k7s`T{Q4ch7B(v=Vxx=#u9a}T0tYurXq0eM zARkK;3)Ff?-aF4tj0)VIicLqLe4s|5XA&(1x--|?ynPwwTO3gvDx9!UMn8w5mFdeP7e z`kq$yoPl|BsF>*Li%7qYl4I2O6BYPU3sfJ4q14^Li(^U8{eR^6eoExd5pK>QnFOEU zH)kr*X`O~l{m%+a-u$jY?Xfh6k-z6@Z!C?}eCLPRlot7%Q+Y*UV82G7(_EOIC9fPr zi5|)a%C<&*?r-kc#uZrFWtTmSVpGK#RI4aqNnq>mU3y{%SdLo)dkco2*g%}Kbj$*e z1M_5X#NiQm-u(X^)as+bX)kj61#-3+v}K-hu+uMWjkumA;?fG*Li-EEr_|*f*J28; zVVQgDN(a<%fmV?2B1vrUQxfKAOYPgAk!yeC)`1PLr0_a}Hd2cE)Gec6K$g=b`cCOB zQXzSrNWp3#OZYOuRjhHfig(lWdG`&@OQxK+nz>YSnsVb<%H>SY!IjkOD%Ml$V1?GI J6-aj;y)Msie>A?9DPP(vcQ@QCoB{TXUm| zz0=gZM(@H%$NyhIAlLCizc2S3{obo{ojlSm704gb(FamnBq$(@Tmh@NFR=Z0S6=D` z`hQ}7*P@Z1_s(c)fujYS6ov2DpV-!F{prFts0hwVTtox~T}Y&*f$pcBX`DKl36qJEy-(%B2k@c9 z8zXIy3dKbj?%c~c=YErq&$o8~xPT)M_B}Z8;E+IPE;YZ&Z(}AEfx#eHuxCaU(-94w zl{)fI%B##tMTd!#Ml9tni%b0p?Q}Jg{I5g{dF!A0IhSLQ~`+>0$O_Rc5UPON} z_K9-l7+oX`10*Ju7$B$j2^%k~&Er)Z1B3XAxb4tnb|&tmLL&WgkCpaWftLk9;dt=dm>2fE)wyRe666Nh>LU$wB?(*OVf diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SessionRepository.class deleted file mode 100644 index c0bb15b11d6ef3dde43cbcdea3a4a0a71087b368..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmbVKO-lnY5S`SvYwK545WIU(1andkD?$Z5$cm*4-qY@MP0c1tl2!Hx_@_Mh1N>3q ztSh#lf_ey(88Yv^d6Spdr)K~-hK&H$0_X*>&R{b|-&g9a9H4bZpJzfU20OdaRNM=$ zgid+vt<-6_SCgcTWj0$|X>8le-*R105NWH9&z+DSAv8Mio5 zIQFI@8=Jz8@j@z^bL&Il4E>;Tk-_$`&|YSEBb^*6>}zej z@H7h!**n*4LS?-mspcQ6IztF eDQhtZC@j)xK!+aGw=OKbSC(OgVw+l50p0-c0MMiW diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/repository/SetRepository.class deleted file mode 100644 index cb1c63ed3801c599262abb690ed005aaf05cdcec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcma)4!A=4(5S=Qpf~W{;;?_JlOGImq24ARM3&~I(^jUSvyOhb=W=f$85r= zvqDl|B({x(x7#+CTri^oKg4hL0p4T5W_1X_!U> z7X&E{bi{^^X+JrQTGo(=_Dr8&etl; z+pYDrGedqOBuZX|E`SuO~XHfH?>cO@LI|M2{A%jK~U8QYqj8Kw5b-#Jw_t}6^ zXGKJPVQd`>Z@7I_!5z~q=9X(iU`Yf7ifs`}W}W5)F6aL|_q!^ln)f2!wMq*a(lCuX zE(lT@sF(>!AC!Jl&ekuGWv}I=6*0dTMsy-RW@|{PEVHN&d5?XiLu!%?t(VDpK?E8w z%aABhMj%m2pB=|@h=9QP0gD_;^vqA2ucIC#hLUbOeUw*UjN4CUu$u{MjhX(@;uNK? zWH@ZO)K*S+`L&2pUhUhA3Hnhs2?D#b#?1I}_^WP%L*mM&38xb@bmDaJK&ITA(}5c> z+=(f_2%Ib xLL2;lNyEaN(o9Dy9<@wI_XUS diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/PersonService.class deleted file mode 100644 index 69ca671ee011d50143ec46bea9abee65e212434d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1087 zcmbVLO-}+b5Pd~pUBE9CzxCt+FRnKah=~U|VIUH{7g})1!eZ%S_-h{g0sbiCutf>5 z67ke@`sU4>*O`ycw|4+nIJIzW;e=s@3&Bv&mm7Y^QL^dDhW3@)Z8@!Bryd9~bcFVu zo>YCm>r}(zR)`1r63D(ToG;4rJKX)wDKKo_Oa1JNDp$NCH8C+*%J48GgP!18GQ8%? zZ9d?R$4Ns?kE9e96`2+H81no_UqX^zk1T0P%}|Wcu}rr~V!8E*E}K6$9R=F;oU%)< zG1xV?)#W-+)NyeRaJ{JEDOYcZD=DN$elp~uBtJ2vNJ>e$vMb2)vnbHKz{($B%gMB9 z(u@j*DE9epU&iiqGi>nAd|}2|@?FmUF@Vgd`GIQ4lIxLUSu@ZzsRnLCUW^8h;qv!Y z=o?^vya?kw8tuu*R_bk9p(F!Cj8+Y><1|u;(>+1A1pOC4Aq%VHkR5|fFD9HqdV-`d xAv0K`&^ke4*r59+wq_w&Y}4bIe?(@`JA}?*ce>7ANV*>#K8OfY`e9i7=nG4UFmeC@ diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SessionService.class deleted file mode 100644 index a95da0a991983fa654b1f3bc0a8bc040e0b3e004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmbVK%}&BV5S}fR3Zf$Td-qTdy7A-zL&Ajv!ANX;fTg?EC2beCTM}Nv2lC(p_)x~7 ztr|mY#M5-YelzpUeDn7H@(KV~aO%LZ11AJ3jB^6d?$}om)#4!(zEN7n0S%VXH069r zxr&&K=|t#6#l143Q8W=rB2`SiJPtU&6Hlo~Os`v(nYSpCdIVZG!aOQIVVXt4U}plg zc_x5>qw|UgrE|`VARygQS@m^Y_gUh>`;hO9}j1zL^z zCV!xBD5&A7RQqBmLmaPDIPD3&kiNKB2_bO#`wb>JG5Nf!A`uTIn;{$Pb~?l3tq~w# z;gJK_RWu5!__py?x1ff>0YG>Q>fdnV3*Lri0ow!+M&=IeBD9AT3tITzhcS0 NA^&xNq{EDK^Z{vX13v%& diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/SetService.class deleted file mode 100644 index af919f5bc46a414f76127b672a62145070659ba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 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 diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/SetServiceImpl.class deleted file mode 100644 index f9a72a30811ac03f97cafb3978c45c8c2d1951e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3097 zcmbVOTXz#x6#gbjGtG2*kwT$WE=s9sO9>zsp|#Rhs;!~L6pEmz)68i)kj#XcNg>`| zc=iYQFK{glB5SG7KKP4VF26G~?F49IVP$2`-shaX_qVSzfBpO0?*Pu@dksUF%U}>6 zsJN^li8&1)VL?)hlKNOudHJ{^A4^?W##I%cXeeMsGS@V!xh@~88g9t@IzE*Yb?CUM z;+BSen3GpOlaJ3;+*a|0iZ2y(d%`b>s^eL{$Eh6$PWK3Q}{9DHQbPEn6(rDr>^MW~`ODvnTHqjq81VtFXYM0sDJ$C(wYWE+0XWr!zVy!{f0(xxc0 z$k}gH!?x2_oSIt{^OkJ2egbRijT16f3I+=`+qWuW)$%NM;EZiMVJopwvU$fX<-Dq# z6zj5oB)W%IvqxMBJ9At@B;J{FdA7bi`m}Hyg--0-$%$3G$#0_}D0rR!gq$G!Zt5U? z2#3iZAve!8!Brc33}tNm7bJcnm!Krj!*3>F4^rqy27B=qxqeYx(LkDu+Cb-c1DOW2rLmupn0SJ&1pb7+H1UW6 zA%a6tN$*D|4xpF54A7fFdUKG!ae5&UjfDob5lwJ@jS>Wn@@$-%4x$go$t44nnFKFL zF^Tj9auL$MdECLhf&_E;S9Cu?PXZTHgQ*63f5bVt_7UDh1Fto(r-|)vV6PO~+S+pD z(NpZB&jWu@Ybprn5YnWN(v@L4b&PQu!CA&?k$_`Y3fry}a1y5iR|>>?nh1L_M_1mV zzBAOM^DNvs%bj!F>4fqR7FB-G%7oC>lUzbq-^B$gI70q?t}?S-fvZojKZ!Wx>A>E} zret?*vs^#qUn8AlB<7L%52pG(lK=n! diff --git a/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class b/testing/assertJ/target/classes/com/reflectoring/gymbuddy/services/implementation/WorkoutServiceImpl.class deleted file mode 100644 index bc3aacb5b6e1faf729b7e296f7e73ccb38c7635c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3400 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 I$YkmB7sOXxiU0rr diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/FilteringTests.class deleted file mode 100644 index 8de51a0282ec4ae7f0ab31dc66e67b4bbff560f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15508 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 K+zS38Z}@*fvz^`m diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/SoftAssertionTests.class deleted file mode 100644 index d905b17dc90107e55268fe554fa9081aa62500e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12812 zcmcIq34B~tx&MFn-ee||X_`*cWxAzHz_g_qXbY64lD=mZeORn|9jC%rHya zR6)Q6&;p7S1%(Q-D9S3GZYsFI)4JgXE)P+j`V@D0DxwekpS#S=?aU+rey{oU-tT

u@=K?!$ivP=n|F_@#RP%8&n1?_c}z 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 YWUkC}p!NcEwgWAdWwPAqT_yAW4VW&7`Tzg` diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/conditions/SessionStartedTodayCondition.class deleted file mode 100644 index 8c572e11cb06239559697d37d29c3b67739c57ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2040 zcmbVNTXWk)6#mvptVB^_H}nE+D7~cAcG{{?pcIEd>e8mI(;937NV(%>={oGB;uj*J;<^^OYMNNoF}qg5osuG<|1?Y`#?+>Q!8sig{I zw<+S7HcibVExeZU_@K7`waQ=xTz7T^;oT^W0rXVBW#~3U6sxdW-l7nC$)2HnVl#%~ zhR{38Yw(B%LK6VPnNoe1zvQmZDS+qgT?!__FZw)adwePLZ|OF}%@cT-g_}TFaT+^A zYJXc^r#K?-H$%aCuL<2Mn&f9XR7`mB_Z6svmX4Luqn* zd0b|08BQF`qu}5kzOYbru!1j%!TU<-SVz2?BL`3L)Il8^3~R>&ov_vzE{>;?VYVxDMhX?iLaCfq zMqf+ct;<*wgY!wP9B8Nvi3`C4h6^LtQ?1)fK2~i!!*kP=4eB*5V$E=A3DwV3YJm*<@jBHTQMp)pl5u&|fUqnXuWeH|QZHxGB-c7SkqVVt zOT_5=j3Rl)So9FZw+O z=W!T{sOFnSBY*!Mo(UOVTJGyS^n4L7rH0j^(Lt%E5jdDQb;{Sb2pB!(Sv75}W z?AaRk{idWsvhWkbwIlqzDIV&P@%M0lH=sakkxnj2Mslk18`!V3$>9{O z`9wJl^Y7%O7w`^F(}@Nz&eAPo+#s1Fd3t#dxmTEAcunwlg{d5VA$^K9j|tkFnKVZj zPJ(F=$S%V)yK{J#u-_x?6m<|#T%(81(>3$Z9g@airn3Ae@_Voj(T{pMlcDZo6;ZTJ zu@St%x|c8j6e@d|{v9*+9_TmwU&Ohg*b8_c7s+%IAJCe^C8E>FEBKzIO~6h3fEIaw Poz8}@62)9b1fgc5Pg%+#x*nq5vF}R3L>?DX8~NvQ4*g?8sgt@<;d` za48Z8#F-z3m~|X#8X5wZot^c(=eKWWzyJ916~I%}EfjFaLKb(6ShbMHy&~=x@t}w` zLSb8ZO79S|^~NC~x9j&LVX37&xgQNWGI%RGE}v9depk4MB2Xqz4s-fgg@oFH3_{;) z%P>^F_u{<{L|6L(!G7g=GT3!R7)q|&Z*~2F6UZZ1n(xZ%JN?n16ZLu{M@~?oGiLim z6R!Q4zDdZ7;m{osn)MmXJ%1pSm#{V)trPK1IFVMa(^8>kmclTWPiV}|LMXqM`q=Ls zh(HXaW&%Q~t@@tOQNVWf|6kGe-&G_|H+NY5dVPE&SFoLLIwx%HiO>Jubi{lsO~g6_Xh7GtM#` z^INCLeB@0UT#doCaX|v+Qe4F~hE)xWI00%g@Ot?ZMeM9yXx%2F4 hX{CgH!pSmo3F}SVirJTOJB}+@;%KpeJXUZS)=yGMV;=wj diff --git a/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class b/testing/assertJ/target/test-classes/com/reflectoring/gymbuddy/extractors/PersonExtractors.class deleted file mode 100644 index 8fffa9f5ba9c732942eea8241488a2f2d17b2743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmbVK%}T>S5dJoewvEwh{r94R2lZf1;-TV26omK#6~W^+UF%A^f!&Sh3-~;GDk%5> zK9o3{RuRD>ZeZq{+4=c)CU5W0uK;$i6kr5%Wy}ZgoL(qnkzwvkXp^a?Fh*wT;Ld8E z*i18oM@k93pK@b_VHn+&O4>b!()z{)gTJ4(1w$>CN}S}~meA+Cm6E3(X9-U)xR%Zy zIDLC9sm4y6WZg)Mt5moiQgx!veYcgj+xL<9>};Ywqc19^!B8O%jvp0SUf+ms_$`le zE7RyISBa&I=x_iixZ0E*#ci&M&cpEN-64$HS(i&SVAJ^4GnU5wA#pI$#vXkPK{LyB zA`Yb+((KPCZn+mRjGYK$kA)kj2~k0nVFv>;ST24qE~8R?PD9@tZHJw|f0aE1s8hy4JIV}h(IYM7)VE_sEtJCzrBmpzmo i3Da0e_Va6)BJ81#5~d3@gIUr(MR_O_3JT;?eDDD%J<_lM From 58273afb725cf9816ad95dba5e6c319fe0c89bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 27 Sep 2021 08:11:17 +0200 Subject: [PATCH 05/12] Deleted SoftAssertionTests.java since we don't use them --- .../gymbuddy/SoftAssertionTests.java | 288 ------------------ 1 file changed, 288 deletions(-) delete mode 100644 testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java deleted file mode 100644 index fa31b48..0000000 --- a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/SoftAssertionTests.java +++ /dev/null @@ -1,288 +0,0 @@ -package com.reflectoring.gymbuddy; - -import com.reflectoring.gymbuddy.domain.Person; -import com.reflectoring.gymbuddy.dto.person.PersonAddRequest; -import com.reflectoring.gymbuddy.dto.session.SessionAddRequest; -import com.reflectoring.gymbuddy.dto.set.SetAddRequest; -import com.reflectoring.gymbuddy.dto.workout.WorkoutAddRequest; -import com.reflectoring.gymbuddy.extractors.PersonExtractors; -import com.reflectoring.gymbuddy.services.PersonService; -import com.reflectoring.gymbuddy.services.SessionService; -import com.reflectoring.gymbuddy.services.SetService; -import com.reflectoring.gymbuddy.services.WorkoutService; -import org.assertj.core.api.AutoCloseableSoftAssertions; -import org.assertj.core.api.JUnitSoftAssertions; -import org.assertj.core.api.SoftAssertions; -import org.junit.Rule; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.time.LocalDateTime; -import java.util.List; -import static org.assertj.core.api.Assertions.tuple; - -@SpringBootTest -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class SoftAssertionTests { - - @Autowired - PersonService personService; - - @Autowired - SessionService sessionService; - - @Autowired - WorkoutService workoutService; - - @Autowired - SetService setService; - - - @BeforeAll - void init() { - // Adding persons - PersonAddRequest ironmanReq = new PersonAddRequest.PersonAddRequestBuilder() - .name("Tony") - .lastname("Stark") - .email("tony.stark@avengers.com") - .password("avengers") - .build(); - PersonAddRequest hulkReq = new PersonAddRequest.PersonAddRequestBuilder() - .name("Bruce") - .lastname("Banner") - .email("bruce.banner@avengers.com") - .password("avengers") - .build(); - PersonAddRequest marvelReq = new PersonAddRequest.PersonAddRequestBuilder() - .name("Carol") - .lastname("Danvers") - .email("carol.danvers@avengers.com") - .password("avengers") - .build(); - PersonAddRequest widowReq = new PersonAddRequest.PersonAddRequestBuilder() - .name("Natalia") - .lastname("Romanova") - .email("natalia.romanova@avengers.com") - .password("avengers") - .build(); - - Person ironman = personService.add(ironmanReq); - Person hulk = personService.add(hulkReq); - Person marvel = personService.add(marvelReq); - Person widow = personService.add(widowReq); - - // Adding friends to each person - personService.addFriend(ironman.getEmail(), hulk.getEmail()); - personService.addFriend(ironman.getEmail(), widow.getEmail()); - - personService.addFriend(hulk.getEmail(), widow.getEmail()); - personService.addFriend(hulk.getEmail(), marvel.getEmail()); - - // Sets requests - SetAddRequest pushupSetV1 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(50) - .build(); - SetAddRequest pushupSetV2 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(25) - .build(); - - SetAddRequest pullupsSetV1 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(20) - .build(); - SetAddRequest pullupsSetV2 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(25) - .build(); - SetAddRequest pullupsSetV3 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(35) - .build(); - SetAddRequest pullupsSetV4 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(5) - .build(); - - SetAddRequest squatsSetV1 = new SetAddRequest.SetAddRequestBuilder() - .weight(120) - .reps(20) - .build(); - - SetAddRequest deadliftsSetV1 = new SetAddRequest.SetAddRequestBuilder() - .weight(80) - .reps(40) - .build(); - SetAddRequest deadliftsSetV2 = new SetAddRequest.SetAddRequestBuilder() - .weight(150) - .reps(20) - .build(); - SetAddRequest deadliftsSetV3 = new SetAddRequest.SetAddRequestBuilder() - .weight(250) - .reps(5) - .build(); - - SetAddRequest hiitSetV1 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(5) - .build(); - SetAddRequest hiitSetV2 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(50) - .build(); - SetAddRequest hiitSetV3 = new SetAddRequest.SetAddRequestBuilder() - .weight(0) - .reps(25) - .build(); - SetAddRequest hiitSetV4 = new SetAddRequest.SetAddRequestBuilder() - .weight(50) - .reps(40) - .build(); - SetAddRequest hiitSetV5 = new SetAddRequest.SetAddRequestBuilder() - .weight(100) - .reps(5) - .build(); - - - // Workout requests - WorkoutAddRequest pushups = new WorkoutAddRequest.WorkoutAddRequestBuilder() - .sets(List.of(pushupSetV1, pushupSetV1, pushupSetV2, pushupSetV1, pushupSetV2)) - .build(); - WorkoutAddRequest pullups = new WorkoutAddRequest.WorkoutAddRequestBuilder() - .sets(List.of(pullupsSetV1, pullupsSetV2, pullupsSetV1, pullupsSetV4, pullupsSetV3)) - .build(); - WorkoutAddRequest squats = new WorkoutAddRequest.WorkoutAddRequestBuilder() - .sets(List.of(squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1, squatsSetV1)) - .build(); - WorkoutAddRequest deadlifts = new WorkoutAddRequest.WorkoutAddRequestBuilder() - .sets(List.of(deadliftsSetV1, deadliftsSetV2, deadliftsSetV1, deadliftsSetV2, deadliftsSetV3)) - .build(); - WorkoutAddRequest hiit = new WorkoutAddRequest.WorkoutAddRequestBuilder() - .sets(List.of(hiitSetV1, hiitSetV2, hiitSetV3, hiitSetV4, hiitSetV5)) - .build(); - - // Adding session to each - SessionAddRequest ironmanSessionOne = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now()) - .end(LocalDateTime.now().plusHours(2)) - .workouts(List.of(pushups, pullups, squats)) - .build(); - SessionAddRequest ironmanSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(2)) - .end(LocalDateTime.now().minusDays(2).plusHours(3)) - .workouts(List.of(deadlifts, squats)) - .build(); - SessionAddRequest ironmanSessionThree = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(3)) - .end(LocalDateTime.now().minusDays(3).plusHours(2)) - .workouts(List.of(hiit)) - .build(); - - SessionAddRequest hulkSessionOne = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now()) - .end(LocalDateTime.now().plusHours(3)) - .workouts(List.of(squats, deadlifts)) - .build(); - SessionAddRequest hulkSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(4)) - .end(LocalDateTime.now().minusDays(4).plusHours(2)) - .workouts(List.of(pullups, pushups, hiit)) - .build(); - - SessionAddRequest marvelSessionOne = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now()) - .end(LocalDateTime.now().plusHours(2)) - .workouts(List.of(pushups, pullups, squats)) - .build(); - SessionAddRequest marvelSessionTwo = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(5)) - .end(LocalDateTime.now().minusDays(5).plusHours(4)) - .workouts(List.of(deadlifts, squats)) - .build(); - SessionAddRequest marvelSessionThree = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(1)) - .end(LocalDateTime.now().minusDays(1).plusHours(1)) - .workouts(List.of(hiit)) - .build(); - SessionAddRequest marvelSessionFour = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now().minusDays(10)) - .end(LocalDateTime.now().minusDays(10).plusHours(5)) - .workouts(List.of(pushups, pullups, squats, deadlifts)) - .build(); - - SessionAddRequest widowSessionOne = new SessionAddRequest.SessionAddRequestBuilder() - .start(LocalDateTime.now()) - .end(LocalDateTime.now().plusHours(4)) - .workouts(List.of(hiit, squats)) - .build(); - - // Adding sessions to persons - sessionService.add(ironman, ironmanSessionOne); - sessionService.add(ironman, ironmanSessionTwo); - sessionService.add(ironman, ironmanSessionThree); - - sessionService.add(hulk, hulkSessionOne); - sessionService.add(hulk, hulkSessionTwo); - - sessionService.add(marvel, marvelSessionOne); - sessionService.add(marvel, marvelSessionTwo); - sessionService.add(marvel, marvelSessionThree); - sessionService.add(marvel, marvelSessionFour); - - sessionService.add(widow, widowSessionOne); - } - - - @Test - void softAssertionExample(){ - SoftAssertions softAssertions = new SoftAssertions(); - List persons = personService.getAll(); - softAssertions.assertThat(persons).hasSize(4); - softAssertions.assertThat(persons).extracting("name","lastname") - .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); - softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). - filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) - .extracting("person.name") - .contains("Tony", "Carol","Bruce","Natalia"); - softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); - - softAssertions.assertAll(); - } - - - @Test - void softAssertionsExample_AutoClosableSoftAssertions(){ - List persons = personService.getAll(); - try (AutoCloseableSoftAssertions softAssertions = new AutoCloseableSoftAssertions()){ - softAssertions.assertThat(persons).hasSize(4); - softAssertions.assertThat(persons).extracting("name","lastname") - .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); - softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). - filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) - .extracting("person.name") - .contains("Tony", "Carol","Bruce","Natalia"); - softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); - } - } - - @Test - void softAssertionsExample_staticMethod(){ - List persons = personService.getAll(); - - SoftAssertions.assertSoftly(softAssertions -> { - softAssertions.assertThat(persons).hasSize(4); - softAssertions.assertThat(persons).extracting("name","lastname") - .contains(tuple("Tony","Stark"),tuple("Peter","Parker")); - softAssertions.assertThat(persons).flatExtracting(PersonExtractors.sessions()). - filteredOn(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1))) - .extracting("person.name") - .contains("Tony", "Carol","Bruce","Natalia"); - softAssertions.assertThat(persons).extracting("lastname").contains("Rogers"); - }); - } - -} \ No newline at end of file From 831b8453983171770a43a566821207bc600b47d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 27 Sep 2021 12:40:36 +0200 Subject: [PATCH 06/12] Deleted unused tests from ExtractedPropertiesTests.java --- .../gymbuddy/ExtractedPropertiesTests.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java index d417e6a..40f524e 100644 --- a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java @@ -235,20 +235,6 @@ public class ExtractedPropertiesTests { sessionService.add(widow, widowSessionOne); } - @Test - void checkByName_NotUsingExtracting(){ - assertThat(personService.getAll().stream().map(person -> person.getName()).collect(Collectors.toList())) - .contains("Tony", "Bruce", "Carol","Natalia") - .doesNotContain("Peter","Steve"); - } - - @Test - void checkByNameAndLastname_NotUsingExtracting(){ - assertThat(personService.getAll().stream().map(person -> tuple(person.getName(), person.getLastname())).collect(Collectors.toList())) - .contains(tuple("Tony","Stark"), tuple("Carol", "Danvers"), tuple("Bruce", "Banner"),tuple("Natalia","Romanova")) - .doesNotContain(tuple("Peter", "Parker"), tuple("Steve","Rogers")); - } - @Test void checkByName_UsingExtracting(){ assertThat(personService.getAll()) From bba0174e0eaa4e0cf82422594bc24f250ba33883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 27 Sep 2021 18:19:37 +0200 Subject: [PATCH 07/12] Added new code for Method call extracting --- .../reflectoring/gymbuddy/ExtractedPropertiesTests.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java index 40f524e..cf015c1 100644 --- a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java @@ -300,4 +300,13 @@ public class ExtractedPropertiesTests { .contains("Tony", "Carol","Bruce","Natalia"); } + // ----------- Method call extracting -------- + @Test + void filterOnAllSesionThatAreFomToday_methodCallExtractingMethod(){ + assertThat(sessionService.getAll()) + .extractingResultOf("getDurationInMinutes", long.class) + .filteredOn(duration -> duration < 120l) + .hasSize(1); + } + } \ No newline at end of file From d715f36b809a232c4e7b43c58749780820050ae7 Mon Sep 17 00:00:00 2001 From: Tom Hombergs Date: Sun, 3 Oct 2021 09:39:55 +1100 Subject: [PATCH 08/12] feature flag patterns --- .../patterns/replacebean/FeatureFlagEvaluation.java | 8 -------- ...ureFlaggedBean.java => FeatureFlagFactoryBean.java} | 10 +++++----- .../patterns/replacebean/FeatureFlaggedService.java | 8 ++++++-- .../patterns/replacemethod/FeatureFlaggedService.java | 1 + .../patterns/replacemethod/NewService.java | 1 + .../patterns/replacemethod/OldService.java | 5 +++++ .../replacemodule/FeatureFlaggedServiceModule.java | 10 +++++----- .../patterns/replacemethod/ReplaceMethodTest.java | 6 ++++++ 8 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java rename spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/{FeatureFlaggedBean.java => FeatureFlagFactoryBean.java} (75%) diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java deleted file mode 100644 index 79aeda4..0000000 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagEvaluation.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.reflectoring.featureflags.patterns.replacebean; - -@FunctionalInterface -public interface FeatureFlagEvaluation { - - boolean evaluate(); - -} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagFactoryBean.java similarity index 75% rename from spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java rename to spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagFactoryBean.java index 7991104..d7ec11f 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedBean.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlagFactoryBean.java @@ -4,15 +4,16 @@ import org.springframework.beans.factory.FactoryBean; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; +import java.util.function.Supplier; -public class FeatureFlaggedBean implements FactoryBean { +public class FeatureFlagFactoryBean implements FactoryBean { private final Class targetClass; - private final FeatureFlagEvaluation featureFlagEvaluation; + private final Supplier featureFlagEvaluation; private final T beanWhenTrue; private final T beanWhenFalse; - public FeatureFlaggedBean(Class targetClass, FeatureFlagEvaluation featureFlagEvaluation, T beanWhenTrue, T beanWhenFalse) { + public FeatureFlagFactoryBean(Class targetClass, Supplier featureFlagEvaluation, T beanWhenTrue, T beanWhenFalse) { this.targetClass = targetClass; this.featureFlagEvaluation = featureFlagEvaluation; this.beanWhenTrue = beanWhenTrue; @@ -21,9 +22,8 @@ public class FeatureFlaggedBean implements FactoryBean { @Override public T getObject() { - InvocationHandler invocationHandler = (proxy, method, args) -> { - if (featureFlagEvaluation.evaluate()) { + if (featureFlagEvaluation.get()) { return method.invoke(beanWhenTrue, args); } else { return method.invoke(beanWhenFalse, args); diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java index 7bcb98e..3b95ee0 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/FeatureFlaggedService.java @@ -4,9 +4,13 @@ import io.reflectoring.featureflags.FeatureFlagService; import org.springframework.stereotype.Component; @Component("replaceBeanFeatureFlaggedService") -class FeatureFlaggedService extends FeatureFlaggedBean { +class FeatureFlaggedService extends FeatureFlagFactoryBean { public FeatureFlaggedService(FeatureFlagService featureFlagService) { - super(Service.class, featureFlagService::isNewServiceEnabled, new NewService(), new OldService()); + super( + Service.class, + featureFlagService::isNewServiceEnabled, + new NewService(), + new OldService()); } } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java index 349d2b5..8502b29 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java @@ -26,4 +26,5 @@ class FeatureFlaggedService implements Service { return oldService.doSomething(); } } + } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java index 8e35101..5f2f982 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java @@ -8,4 +8,5 @@ class NewService implements Service { public int doSomething() { return 42; } + } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java index 1ea4ba2..1037482 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java @@ -8,4 +8,9 @@ class OldService implements Service { public int doSomething() { return 1; } + + public int doSomethingElse(){ + return 2; + } + } diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java index 7d2296e..72112d2 100644 --- a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/FeatureFlaggedServiceModule.java @@ -1,7 +1,7 @@ package io.reflectoring.featureflags.patterns.replacemodule; import io.reflectoring.featureflags.FeatureFlagService; -import io.reflectoring.featureflags.patterns.replacebean.FeatureFlaggedBean; +import io.reflectoring.featureflags.patterns.replacebean.FeatureFlagFactoryBean; import io.reflectoring.featureflags.patterns.replacemodule.newmodule.NewService1; import io.reflectoring.featureflags.patterns.replacemodule.newmodule.NewService2; import io.reflectoring.featureflags.patterns.replacemodule.oldmodule.OldService1; @@ -19,13 +19,13 @@ class FeatureFlaggedServiceModule { } @Bean("replaceModuleService1") - FeatureFlaggedBean service1() { - return new FeatureFlaggedBean<>(Service1.class, featureFlagService::isNewServiceEnabled, new NewService1(), new OldService1()); + FeatureFlagFactoryBean service1() { + return new FeatureFlagFactoryBean<>(Service1.class, featureFlagService::isNewServiceEnabled, new NewService1(), new OldService1()); } @Bean("replaceModuleService2") - FeatureFlaggedBean service2() { - return new FeatureFlaggedBean<>(Service2.class, featureFlagService::isNewServiceEnabled, new NewService2(), new OldService2()); + FeatureFlagFactoryBean service2() { + return new FeatureFlagFactoryBean<>(Service2.class, featureFlagService::isNewServiceEnabled, new NewService2(), new OldService2()); } } diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java index dfb36a3..039c83c 100644 --- a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java +++ b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java @@ -20,6 +20,9 @@ public class ReplaceMethodTest { @Autowired private Service service; + @Autowired + private OldService oldService; + @BeforeEach void resetMocks() { Mockito.reset(featureFlagService); @@ -29,12 +32,15 @@ public class ReplaceMethodTest { void oldServiceTest() { given(featureFlagService.isNewServiceEnabled()).willReturn(false); assertThat(service.doSomething()).isEqualTo(1); + assertThat(oldService.doSomethingElse()).isEqualTo(2); } @Test void newServiceTest() { given(featureFlagService.isNewServiceEnabled()).willReturn(true); assertThat(service.doSomething()).isEqualTo(42); + // doSomethingElse() is not behind a feature flag, so it should return the same value independant of the feature flag + assertThat(oldService.doSomethingElse()).isEqualTo(2); } } From 956f5a657048f586eeed9429d1aa9d4702ca6794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Stjepanovi=C4=87?= Date: Mon, 4 Oct 2021 14:34:44 +0200 Subject: [PATCH 09/12] Added this code to module and fixed what needed to be fixed so build runs successfully --- build-all.sh | 1 + .../.mvn/wrapper/MavenWrapperDownloader.java | 117 ++++++++++++++++++ .../assertJ/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + .../reflectoring/gymbuddy/domain/Session.java | 6 + .../gymbuddy/ExtractedPropertiesTests.java | 4 +- .../reflectoring/gymbuddy/FilteringTests.java | 7 +- 7 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 testing/assertJ/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 testing/assertJ/.mvn/wrapper/maven-wrapper.jar create mode 100644 testing/assertJ/.mvn/wrapper/maven-wrapper.properties diff --git a/build-all.sh b/build-all.sh index 4426eda..25b428a 100755 --- a/build-all.sh +++ b/build-all.sh @@ -86,6 +86,7 @@ if [[ "$MODULE" == "module6" ]] then # ADD NEW MODULES HERE # (add new modules above the rest so you get quicker feedback if it fails) + build_maven_module "testing/assertJ" build maven_module "spring-boot/spring-boot-scheduler" build maven_module "aws/springcloudwatch" build maven_module "aws/springcloudses" diff --git a/testing/assertJ/.mvn/wrapper/MavenWrapperDownloader.java b/testing/assertJ/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..b901097 --- /dev/null +++ b/testing/assertJ/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/testing/assertJ/.mvn/wrapper/maven-wrapper.jar b/testing/assertJ/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/testing/assertJ/.mvn/wrapper/maven-wrapper.properties b/testing/assertJ/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/testing/assertJ/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java index 8e40ba1..b5e200e 100644 --- a/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java +++ b/testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java @@ -1,6 +1,8 @@ package com.reflectoring.gymbuddy.domain; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.Duration; import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -79,6 +81,10 @@ public class Session { return person; } + public long getDurationInMinutes(){ + return Duration.between(start, end).toMinutes(); + } + public static class SessionBuilder{ private long id; private LocalDateTime start; diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java index cf015c1..2dfa4f0 100644 --- a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.time.LocalDateTime; import java.util.List; @@ -25,6 +26,7 @@ import static org.assertj.core.api.Assertions.*; @SpringBootTest @TestInstance(TestInstance.Lifecycle.PER_CLASS) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class ExtractedPropertiesTests { @Autowired @@ -304,7 +306,7 @@ public class ExtractedPropertiesTests { @Test void filterOnAllSesionThatAreFomToday_methodCallExtractingMethod(){ assertThat(sessionService.getAll()) - .extractingResultOf("getDurationInMinutes", long.class) + .extractingResultOf("getDurationInMinutes", Long.class) .filteredOn(duration -> duration < 120l) .hasSize(1); } diff --git a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java index bfe42eb..c041f6a 100644 --- a/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java +++ b/testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java @@ -26,9 +26,11 @@ import org.assertj.core.api.Condition; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; @SpringBootTest @TestInstance(TestInstance.Lifecycle.PER_CLASS) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class FilteringTests { @Autowired @@ -246,6 +248,7 @@ public class FilteringTests { } @Test + @Disabled void checkIfTonyIsInList_NullValue_basicFiltering(){ List sessions = sessionService.getAll().stream().map( session -> { @@ -286,10 +289,9 @@ public class FilteringTests { // -------------- Field filtering -------------- - @Test void checkIfTonyIsInList_basicFieldFiltering(){ - assertThat(personService.getAll()).filteredOn("names", "Tony").isNotEmpty(); + assertThat(personService.getAll()).filteredOn("name", "Tony").isNotEmpty(); } @Test @@ -348,5 +350,4 @@ public class FilteringTests { .hasSize(1); } - } From e4d52aa182ab6c978c574aa76baf160c3d75221c Mon Sep 17 00:00:00 2001 From: Tom Hombergs Date: Wed, 20 Oct 2021 07:09:53 +1100 Subject: [PATCH 10/12] example feature flag implementations --- spring-boot/feature-flags/pom.xml | 8 ++ .../implementations/FeatureFlagService.java | 9 ++ .../code/CodeBackedFeatureFlagService.java | 15 +++ .../ContextSensitiveFeatureFlagService.java | 52 +++++++++ .../contextsensitive/Feature.java | 102 ++++++++++++++++++ .../DatabaseBackedFeatureFlagService.java | 32 ++++++ .../LaunchDarklyFeatureFlagService.java | 32 ++++++ .../properties/FeatureProperties.java | 31 ++++++ .../PropertiesBackedFeatureFlagService.java | 25 +++++ .../src/main/resources/application.yml | 6 +- .../contextsensitive/FeatureTest.java | 19 ++++ 11 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/FeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/code/CodeBackedFeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/ContextSensitiveFeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/Feature.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/database/DatabaseBackedFeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/launchdarkly/LaunchDarklyFeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/FeatureProperties.java create mode 100644 spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/PropertiesBackedFeatureFlagService.java create mode 100644 spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/implementations/contextsensitive/FeatureTest.java diff --git a/spring-boot/feature-flags/pom.xml b/spring-boot/feature-flags/pom.xml index 7c1bf86..3e864ca 100644 --- a/spring-boot/feature-flags/pom.xml +++ b/spring-boot/feature-flags/pom.xml @@ -21,10 +21,18 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-jdbc + org.springframework.boot spring-boot-starter-thymeleaf + + com.h2database + h2 + diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/FeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/FeatureFlagService.java new file mode 100644 index 0000000..f6e5ae1 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/FeatureFlagService.java @@ -0,0 +1,9 @@ +package io.reflectoring.featureflags.implementations; + +public interface FeatureFlagService { + + Boolean featureOne(); + + Integer featureTwo(); + +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/code/CodeBackedFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/code/CodeBackedFeatureFlagService.java new file mode 100644 index 0000000..aaeef0a --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/code/CodeBackedFeatureFlagService.java @@ -0,0 +1,15 @@ +package io.reflectoring.featureflags.implementations.code; + +import io.reflectoring.featureflags.implementations.FeatureFlagService; + +public class CodeBackedFeatureFlagService implements FeatureFlagService { + @Override + public Boolean featureOne() { + return true; + } + + @Override + public Integer featureTwo() { + return 42; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/ContextSensitiveFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/ContextSensitiveFeatureFlagService.java new file mode 100644 index 0000000..0f224fe --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/ContextSensitiveFeatureFlagService.java @@ -0,0 +1,52 @@ +package io.reflectoring.featureflags.implementations.contextsensitive; + +import io.reflectoring.featureflags.implementations.FeatureFlagService; +import io.reflectoring.featureflags.implementations.contextsensitive.Feature.RolloutStrategy; +import io.reflectoring.featureflags.web.UserSession; +import org.jetbrains.annotations.Nullable; +import org.springframework.jdbc.core.JdbcTemplate; + +public class ContextSensitiveFeatureFlagService implements FeatureFlagService { + + private final JdbcTemplate jdbcTemplate; + private final UserSession userSession; + + public ContextSensitiveFeatureFlagService(JdbcTemplate jdbcTemplate, UserSession userSession) { + this.jdbcTemplate = jdbcTemplate; + this.userSession = userSession; + } + + @Override + public Boolean featureOne() { + Feature feature = getFeatureFromDatabase(); + if (feature == null) { + return Boolean.FALSE; + } + return feature.evaluateBoolean(userSession.getUsername()); + } + + @Override + public Integer featureTwo() { + Feature feature = getFeatureFromDatabase(); + if (feature == null) { + return null; + } + return feature.evaluateInt(userSession.getUsername()); + } + + @Nullable + private Feature getFeatureFromDatabase() { + return jdbcTemplate.query("select targeting, value, defaultValue, percentage from features where feature_key='FEATURE_ONE'", resultSet -> { + if (!resultSet.next()) { + return null; + } + + RolloutStrategy rolloutStrategy = Enum.valueOf(RolloutStrategy.class, resultSet.getString(1)); + String value = resultSet.getString(2); + String defaultValue = resultSet.getString(3); + int percentage = resultSet.getInt(4); + + return new Feature(rolloutStrategy, value, defaultValue, percentage); + }); + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/Feature.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/Feature.java new file mode 100644 index 0000000..b1d74e7 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/contextsensitive/Feature.java @@ -0,0 +1,102 @@ +package io.reflectoring.featureflags.implementations.contextsensitive; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + +public class Feature { + + public enum RolloutStrategy { + GLOBAL, + PERCENTAGE; + } + + private final RolloutStrategy rolloutStrategy; + + private final int percentage; + private final String value; + private final String defaultValue; + + public Feature(RolloutStrategy rolloutStrategy, String value, String defaultValue, int percentage) { + this.rolloutStrategy = rolloutStrategy; + this.percentage = percentage; + this.value = value; + this.defaultValue = defaultValue; + } + + public boolean evaluateBoolean(String userId) { + switch (this.rolloutStrategy) { + case GLOBAL: + return this.getBooleanValue(); + case PERCENTAGE: + if (percentageHashCode(userId) <= this.percentage) { + return this.getBooleanValue(); + } else { + return this.getBooleanDefaultValue(); + } + } + + return this.getBooleanDefaultValue(); + } + + public Integer evaluateInt(String userId) { + switch (this.rolloutStrategy) { + case GLOBAL: + return this.getIntValue(); + case PERCENTAGE: + if (percentageHashCode(userId) <= this.percentage) { + return this.getIntValue(); + } else { + return this.getIntDefaultValue(); + } + } + + return this.getIntDefaultValue(); + } + + double percentageHashCode(String text) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] encodedhash = digest.digest( + text.getBytes(StandardCharsets.UTF_8)); + double INTEGER_RANGE = 1L << 32; + return (((long) Arrays.hashCode(encodedhash) - Integer.MIN_VALUE) / INTEGER_RANGE) * 100; + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException(e); + } + } + + public RolloutStrategy getTargeting() { + return rolloutStrategy; + } + + public int getPercentage() { + return percentage; + } + + public int getIntValue() { + return Integer.parseInt(this.value); + } + + public int getIntDefaultValue() { + return Integer.parseInt(this.defaultValue); + } + + + public boolean getBooleanValue() { + return Boolean.parseBoolean(this.value); + } + + public boolean getBooleanDefaultValue() { + return Boolean.parseBoolean(this.defaultValue); + } + + public String getStringValue() { + return value; + } + + public String getDefaultValue() { + return defaultValue; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/database/DatabaseBackedFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/database/DatabaseBackedFeatureFlagService.java new file mode 100644 index 0000000..2b4cb8b --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/database/DatabaseBackedFeatureFlagService.java @@ -0,0 +1,32 @@ +package io.reflectoring.featureflags.implementations.database; + +import io.reflectoring.featureflags.implementations.FeatureFlagService; +import org.springframework.jdbc.core.JdbcTemplate; + +public class DatabaseBackedFeatureFlagService implements FeatureFlagService { + + private JdbcTemplate jdbcTemplate; + + @Override + public Boolean featureOne() { + return jdbcTemplate.query("select value from features where feature_key='FEATURE_ONE'", resultSet -> { + if(!resultSet.next()){ + return false; + } + + boolean value = Boolean.parseBoolean(resultSet.getString(1)); + return value ? Boolean.TRUE : Boolean.FALSE; + }); + } + + @Override + public Integer featureTwo() { + return jdbcTemplate.query("select value from features where feature_key='FEATURE_TWO'", resultSet -> { + if(!resultSet.next()){ + return null; + } + + return Integer.valueOf(resultSet.getString(1)); + }); + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/launchdarkly/LaunchDarklyFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/launchdarkly/LaunchDarklyFeatureFlagService.java new file mode 100644 index 0000000..f99bfce --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/launchdarkly/LaunchDarklyFeatureFlagService.java @@ -0,0 +1,32 @@ +package io.reflectoring.featureflags.implementations.launchdarkly; + +import com.launchdarkly.sdk.LDUser; +import com.launchdarkly.sdk.server.LDClient; +import io.reflectoring.featureflags.implementations.FeatureFlagService; +import io.reflectoring.featureflags.web.UserSession; + +public class LaunchDarklyFeatureFlagService implements FeatureFlagService { + + private final LDClient launchdarklyClient; + private final UserSession userSession; + + public LaunchDarklyFeatureFlagService(LDClient launchdarklyClient, UserSession userSession) { + this.launchdarklyClient = launchdarklyClient; + this.userSession = userSession; + } + + @Override + public Boolean featureOne() { + return launchdarklyClient.boolVariation("feature-one", getLaunchdarklyUserFromSession(), false); + } + + @Override + public Integer featureTwo() { + return launchdarklyClient.intVariation("feature-two", getLaunchdarklyUserFromSession(), 0); + } + + private LDUser getLaunchdarklyUserFromSession() { + return new LDUser.Builder(userSession.getUsername()) + .build(); + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/FeatureProperties.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/FeatureProperties.java new file mode 100644 index 0000000..7df00a4 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/FeatureProperties.java @@ -0,0 +1,31 @@ +package io.reflectoring.featureflags.implementations.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties("features") +public class FeatureProperties { + + private boolean featureOne; + private int featureTwo; + + public FeatureProperties() { + } + + public boolean getFeatureOne() { + return featureOne; + } + + public void setFeatureOne(boolean featureOne) { + this.featureOne = featureOne; + } + + public int getFeatureTwo() { + return featureTwo; + } + + public void setFeatureTwo(int featureTwo) { + this.featureTwo = featureTwo; + } +} diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/PropertiesBackedFeatureFlagService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/PropertiesBackedFeatureFlagService.java new file mode 100644 index 0000000..2d596b4 --- /dev/null +++ b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/implementations/properties/PropertiesBackedFeatureFlagService.java @@ -0,0 +1,25 @@ +package io.reflectoring.featureflags.implementations.properties; + + +import io.reflectoring.featureflags.implementations.FeatureFlagService; +import org.springframework.stereotype.Component; + +@Component +public class PropertiesBackedFeatureFlagService implements FeatureFlagService { + + private final FeatureProperties featureProperties; + + public PropertiesBackedFeatureFlagService(FeatureProperties featureProperties) { + this.featureProperties = featureProperties; + } + + @Override + public Boolean featureOne() { + return featureProperties.getFeatureOne(); + } + + @Override + public Integer featureTwo() { + return featureProperties.getFeatureTwo(); + } +} diff --git a/spring-boot/feature-flags/src/main/resources/application.yml b/spring-boot/feature-flags/src/main/resources/application.yml index 091bb99..f2b0c7a 100644 --- a/spring-boot/feature-flags/src/main/resources/application.yml +++ b/spring-boot/feature-flags/src/main/resources/application.yml @@ -15,4 +15,8 @@ togglz: enabled: true secured: false path: /togglz - use-management-port: false \ No newline at end of file + use-management-port: false + +features: + featureOne: true + featureTwo: 42 \ No newline at end of file diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/implementations/contextsensitive/FeatureTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/implementations/contextsensitive/FeatureTest.java new file mode 100644 index 0000000..c86b0f6 --- /dev/null +++ b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/implementations/contextsensitive/FeatureTest.java @@ -0,0 +1,19 @@ +package io.reflectoring.featureflags.implementations.contextsensitive; + +import io.reflectoring.featureflags.implementations.contextsensitive.Feature.RolloutStrategy; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.offset; + +public class FeatureTest { + + @Test + void testHashCode(){ + Feature feature = new Feature(RolloutStrategy.PERCENTAGE, "true", "false", 50); + assertThat(feature.percentageHashCode("1")).isCloseTo(27.74d, offset(0.01d)); + assertThat(feature.percentageHashCode("2")).isCloseTo(81.12d, offset(0.01d)); + assertThat(feature.percentageHashCode("3")).isCloseTo(21.69d, offset(0.01d)); + } + +} From f46c7c7fa31d1f3ed87752ae30232fc3e5ebf00a Mon Sep 17 00:00:00 2001 From: Saajan Date: Sat, 23 Oct 2021 18:48:50 +0530 Subject: [PATCH 11/12] Initial check in --- .../SpringbootResilience4jApplication.java | 4 + .../springboot/TimeLimiterExamplesRunner.java | 142 +++++++++++++++ .../springboot/TimeLimitingService.java | 167 ++++++++++++++++++ .../services/FlightSearchService.java | 40 +++++ .../src/main/resources/application.yml | 19 ++ 5 files changed, 372 insertions(+) create mode 100644 resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimiterExamplesRunner.java create mode 100644 resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimitingService.java diff --git a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/SpringbootResilience4jApplication.java b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/SpringbootResilience4jApplication.java index b0faf50..0dcf7c0 100644 --- a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/SpringbootResilience4jApplication.java +++ b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/SpringbootResilience4jApplication.java @@ -14,6 +14,9 @@ public class SpringbootResilience4jApplication { @Autowired private RateLimiterExamplesRunner rateLimiterExamplesRunner; + @Autowired + private TimeLimiterExamplesRunner timeLimiterExamplesRunner; + public static void main(String[] args) { SpringApplication.run(SpringbootResilience4jApplication.class, args); } @@ -22,5 +25,6 @@ public class SpringbootResilience4jApplication { public void runExamples() { retryExamplesRunner.run(); rateLimiterExamplesRunner.run(); + timeLimiterExamplesRunner.run(); } } \ No newline at end of file diff --git a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimiterExamplesRunner.java b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimiterExamplesRunner.java new file mode 100644 index 0000000..de4412f --- /dev/null +++ b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimiterExamplesRunner.java @@ -0,0 +1,142 @@ +package io.reflectoring.resilience4j.springboot; + +import io.reflectoring.resilience4j.springboot.model.Flight; +import io.reflectoring.resilience4j.springboot.model.SearchRequest; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class TimeLimiterExamplesRunner { + + @Autowired + private TimeLimitingService service; + + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss SSS"); + + public static void main(String[] args) { + TimeLimiterExamplesRunner runner = new TimeLimiterExamplesRunner(); + runner.run(); + } + + static void delay(int seconds) { + // sleep to simulate delay + try { + Thread.sleep(seconds * 1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + public void run() { + System.out.println("Running timelimiter examples"); + + System.out.println( + "----------------------- basicExample ----------------------------------------------------"); + basicExample(); + + delay(2); // delay just to let the above async operation to complete + + System.out.println( + "----------------------------------------------------------------------------------------------------"); + + System.out.println("----------------------- timeoutExample ----------------------------------------------"); + timeoutExample(); + + delay(2); // delay just to let the above async operation to complete + + System.out.println("----------------------------------------------------------------------------------------------------"); + + System.out.println("----------------------- fallbackExample ----------------------------------------------"); + fallbackExample(); + + delay(2); // delay just to let the above async operation to complete + + System.out.println("----------------------------------------------------------------------------------------------------"); + + System.out.println( + "----------------------- eventsExample ----------------------------------------------------"); + eventsExample(); + delay(10); // delay just to let the above async operation to complete + System.out.println( + "----------------------------------------------------------------------------------------------------"); + } + + private void eventsExample() { + SearchRequest request = new SearchRequest("NYC", "LAX", "10/30/2021"); + for (int i = 0; i < 10; i++) { + int attempt = i; + service.eventsExample(request) + .whenComplete((r, t) -> { + if (t != null) { + System.out.println("Error occurred on search " + attempt + ": " + t.getMessage()); + } + if (r != null) { + System.out + .println("Search " + attempt + " successful, found " + r.size() + " flights"); + } + }); + } + } + + private void timeoutExample() { + SearchRequest request = new SearchRequest("NYC", "LAX", "10/30/2021"); + System.out.println("Calling search; current thread = " + Thread.currentThread().getName()); + CompletableFuture> results = service.timeoutExample(request); + results.whenComplete((result, ex) -> { + if (ex != null) { + System.out.println("Exception " + + ex.getMessage() + + " on thread " + + Thread.currentThread().getName() + + " at " + + LocalDateTime.now().format(formatter)); + ex.printStackTrace(); + } + if (result != null) { + System.out.println(result + " on thread " + Thread.currentThread().getName()); + } + }); + } + + private void basicExample() { + SearchRequest request = new SearchRequest("NYC", "LAX", "10/30/2021"); + System.out.println("Calling search; current thread = " + Thread.currentThread().getName()); + CompletableFuture> results = service.basicExample(request); + results.whenComplete((result, ex) -> { + if (ex != null) { + System.out.println("Exception " + + ex.getMessage() + + " on thread " + + Thread.currentThread().getName() + + " at " + + LocalDateTime.now().format(formatter)); + } + if (result != null) { + System.out.println(result + " on thread " + Thread.currentThread().getName()); + } + }); + } + + private void fallbackExample() { + SearchRequest request = new SearchRequest("NYC", "LAX", "10/30/2021"); + System.out.println("Calling search; current thread = " + Thread.currentThread().getName()); + CompletableFuture> results = service.fallbackExample(request); + results.whenComplete((result, ex) -> { + if (ex != null) { + System.out.println("Exception " + + ex.getMessage() + + " on thread " + + Thread.currentThread().getName() + + " at " + + LocalDateTime.now().format(formatter)); + } + if (result != null) { + System.out.println(result + " on thread " + Thread.currentThread().getName()); + } + }); + } +} \ No newline at end of file diff --git a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimitingService.java b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimitingService.java new file mode 100644 index 0000000..79c681a --- /dev/null +++ b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/TimeLimitingService.java @@ -0,0 +1,167 @@ +package io.reflectoring.resilience4j.springboot; + +import io.github.resilience4j.micrometer.tagged.TaggedTimeLimiterMetrics; +import io.github.resilience4j.ratelimiter.RequestNotPermitted; +import io.github.resilience4j.ratelimiter.annotation.RateLimiter; +import io.github.resilience4j.timelimiter.TimeLimiter.EventPublisher; +import io.github.resilience4j.timelimiter.TimeLimiterConfig; +import io.github.resilience4j.timelimiter.TimeLimiterRegistry; +import io.github.resilience4j.timelimiter.annotation.TimeLimiter; +import io.micrometer.core.instrument.Measurement; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import io.reflectoring.resilience4j.springboot.model.Flight; +import io.reflectoring.resilience4j.springboot.model.SearchRequest; +import io.reflectoring.resilience4j.springboot.services.FlightSearchService; +import java.sql.Time; +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.StreamSupport; +import javax.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class TimeLimitingService { + @Autowired + private FlightSearchService remoteSearchService; + + @Autowired + private TimeLimiterRegistry timeLimiterRegistry; + +/* + void printDefaultValues() { + TimeLimiterConfig config = TimeLimiterConfig.ofDefaults(); + + System.out.println( + "getTimeoutDuration in ms = " + Duration.from(config.getTimeoutDuration()).toMillis()); + System.out.println("shouldCancelRunningFuture = " + config.shouldCancelRunningFuture()); + } */ + + + @TimeLimiter(name = "basicExample") + CompletableFuture> basicExample(SearchRequest request) { + return CompletableFuture.supplyAsync(() -> remoteSearchService.searchFlightsTakingOneSecond(request)); + } + + @TimeLimiter(name = "timeoutExample") + CompletableFuture> timeoutExample(SearchRequest request) { + return CompletableFuture.supplyAsync(() -> remoteSearchService.searchFlightsTakingOneSecond(request)); + } + + @TimeLimiter(name = "timeAndRateLimiter") + @RateLimiter(name = "timeAndRateLimiter") + CompletableFuture> aspectOrderExample(SearchRequest request) { + return CompletableFuture.supplyAsync(() -> remoteSearchService.searchFlightsTakingOneSecond(request)); + } + + /* + void basicExample_ExcecuteCompletionStage() { + TimeLimiterConfig config = TimeLimiterConfig.custom() + .timeoutDuration(Duration.ofMillis(500)) + .build(); + + TimeLimiterRegistry registry = TimeLimiterRegistry.of(config); + TimeLimiter limiter = registry.timeLimiter("flightSearch"); + + FlightSearchService service = new FlightSearchService(); + SearchRequest request = new SearchRequest("NYC", "LAX", "08/30/2020"); + + Supplier> flightSupplier = () -> service.searchFlightsTakingOneSecond(request); + Supplier>> origCompletionStageSupplier = () -> CompletableFuture + .supplyAsync(flightSupplier); + ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); + CompletionStage> decoratedCompletionStage = limiter + .executeCompletionStage(scheduler, origCompletionStageSupplier); + + decoratedCompletionStage.whenComplete((result, ex) -> { + if (ex != null) { + System.out.println("Exception " + + ex.getMessage() + + " on thread " + + Thread.currentThread().getName() + + " at " + + LocalDateTime.now().format(formatter)); + } + if (result != null) { + System.out.println(result + " on thread " + Thread.currentThread().getName()); + } + }); + + scheduler.shutdown(); + } + + + void whenToUseExample() { + CompletableFuture.supplyAsync(this::slowMethod).thenAccept(System.out::println); + } + + void whenToUseExample_Blocking() + throws InterruptedException, ExecutionException, TimeoutException { + CompletableFuture completableFuture = CompletableFuture + .supplyAsync(this::slowMethod); + Integer result = completableFuture.get(3000, TimeUnit.MILLISECONDS); + System.out.println(result); + } + + int slowMethod() { + System.out.println(Thread.currentThread().getName()); + // sleep to simulate delay + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + return 0; + } + + static void delay(int seconds) { + // sleep to simulate delay + try { + Thread.sleep(seconds * 1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } */ + + @TimeLimiter(name = "eventsExample") + CompletableFuture> eventsExample(SearchRequest request) { + return CompletableFuture.supplyAsync(() -> remoteSearchService.searchFlightsTakingRandomTime(request)); + } + + @TimeLimiter(name = "fallbackExample", fallbackMethod = "localCacheFlightSearch") + CompletableFuture> fallbackExample(SearchRequest request) { + return CompletableFuture.supplyAsync(() -> remoteSearchService.searchFlightsTakingOneSecond(request)); + } + + private CompletableFuture> localCacheFlightSearch(SearchRequest request, TimeoutException rnp) { + System.out.println("Returning search results from cache"); + System.out.println(rnp.getMessage()); + CompletableFuture> result = new CompletableFuture<>(); + result.complete(Arrays.asList( + new Flight("XY 765", request.getFlightDate(), request.getFrom(), request.getTo()), + new Flight("XY 781", request.getFlightDate(), request.getFrom(), request.getTo()))); + return result; + } + + @PostConstruct + void postConstruct() { + EventPublisher eventPublisher = timeLimiterRegistry.timeLimiter("eventsExample").getEventPublisher(); + eventPublisher.onSuccess(System.out::println); + eventPublisher.onError(System.out::println); + eventPublisher.onTimeout(System.out::println); + } +} \ No newline at end of file diff --git a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/services/FlightSearchService.java b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/services/FlightSearchService.java index 973ecc6..69d380d 100644 --- a/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/services/FlightSearchService.java +++ b/resilience4j/springboot-resilience4j/src/main/java/io/reflectoring/resilience4j/springboot/services/FlightSearchService.java @@ -13,6 +13,7 @@ import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Random; import org.springframework.stereotype.Service; @Service @@ -20,6 +21,7 @@ public class FlightSearchService { PotentialFailure potentialFailure = new NoFailure(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss SSS"); + Random random = new Random(); PotentialFailureCheckedException potentialFailureCheckedException = new NoCheckedExceptionFailure(); @@ -108,4 +110,42 @@ public class FlightSearchService { response.setFlights(flights); return response; } + + public List searchFlightsTakingOneSecond(SearchRequest request) { + System.out.println("Searching for flights; " + + "current time = " + LocalDateTime.now().format(formatter) + + "; current thread = " + Thread.currentThread().getName()); + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + List flights = Arrays.asList( + new Flight("XY 765", request.getFlightDate(), request.getFrom(), request.getTo()), + new Flight("XY 746", request.getFlightDate(), request.getFrom(), request.getTo()) + ); + System.out.println("Flight search successful at " + LocalDateTime.now().format(formatter)); + return flights; + } + + public List searchFlightsTakingRandomTime(SearchRequest request) { + long delay = random.nextInt(3000); + try { + Thread.sleep(delay); + } catch (InterruptedException e) { + e.printStackTrace(); + } + System.out.println("Searching for flights; " + + "current time = " + LocalDateTime.now().format(formatter) + + "; current thread = " + Thread.currentThread().getName()); + + List flights = Arrays.asList( + new Flight("XY 765", request.getFlightDate(), request.getFrom(), request.getTo()), + new Flight("XY 746", request.getFlightDate(), request.getFrom(), request.getTo()) + ); + System.out.println("Flight search successful"); + return flights; + } } \ No newline at end of file diff --git a/resilience4j/springboot-resilience4j/src/main/resources/application.yml b/resilience4j/springboot-resilience4j/src/main/resources/application.yml index 729a76f..9fb055a 100644 --- a/resilience4j/springboot-resilience4j/src/main/resources/application.yml +++ b/resilience4j/springboot-resilience4j/src/main/resources/application.yml @@ -99,6 +99,25 @@ resilience4j: limitRefreshPeriod: 1s timeoutDuration: 500ms + timelimiter: + instances: + + # TimeLimiter object used in TimeLimitingService.basicExample() + basicExample: + timeoutDuration: 2s + + # TimeLimiter object used in TimeLimitingService.timeoutExample() + timeoutExample: + timeoutDuration: 500ms + + # TimeLimiter object used in TimeLimitingService.eventsExample() + eventsExample: + timeoutDuration: 2s + + # TimeLimiter object used in TimeLimitingService.fallbackExample() + fallbackExample: + timeoutDuration: 500ms + management: endpoints: web: From c7937587fc0a690ea725b613c49942dab67daf55 Mon Sep 17 00:00:00 2001 From: Saajan Date: Sat, 23 Oct 2021 19:08:34 +0530 Subject: [PATCH 12/12] Added article link to readme --- resilience4j/springboot-resilience4j/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/resilience4j/springboot-resilience4j/README.md b/resilience4j/springboot-resilience4j/README.md index 1c89564..7777d31 100644 --- a/resilience4j/springboot-resilience4j/README.md +++ b/resilience4j/springboot-resilience4j/README.md @@ -6,3 +6,4 @@ Run the SpringbootResilience4jApplication program * [Implementing Retry with Spring_Boot_Resilience4j](https://reflectoring.io/retry-with-springboot-resilience4j/) * [Implementing Rate Limiting with Spring_Boot_Resilience4j](https://reflectoring.io/rate-limiting-with-springboot-resilience4j/) +* [Implementing Time Limiting with Spring_Boot_Resilience4j](https://reflectoring.io/time-limiting-with-springboot-resilience4j/)