Bump tmpl from 1.0.4 to 1.0.5 in /spring-boot/thymeleaf-vue/client

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

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"

spring-boot/thymeleaf-vue/client/package-lock.json

@@ -16466,9 +16466,9 @@
       }
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-arraybuffer": {

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();
+    }
+
+}

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

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/)
+

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.

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 "$@"

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%

testing/assertJ/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.5.4</version>
+    <relativePath/> <!-- lookup parent from repository -->
+  </parent>
+  <groupId>com.reflectoring</groupId>
+  <artifactId>GymBuddy</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>GymBuddy</name>
+  <description>Demo project for Spring Boot</description>
+  <properties>
+    <java.version>11</java.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-jpa</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
+      <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.13.2</version>
+          <scope>test</scope>
+      </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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);
+  }
+
+}

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<Person> friends;
+
+  @OneToMany(mappedBy = "person",fetch = FetchType.EAGER)
+  private List<Session> sessions;
+
+  public Person(){}
+
+  public Person(long id, String name, String lastname, String email, String password, Set<Person> friends, List<Session> 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<Person> getFriends() {
+    return friends;
+  }
+
+  public List<Session> 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<Person> friends;
+    private List<Session> 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<Person> friends){
+      this.friends = friends;
+      return this;
+    }
+
+    public PersonBuilder sessions(List<Session> sessions){
+      this.sessions = sessions;
+      return this;
+    }
+
+    public Person build(){
+      return new Person(this);
+    }
+  }
+
+}

testing/assertJ/src/main/java/com/reflectoring/gymbuddy/domain/Session.java

@@ -0,0 +1,126 @@
+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;
+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<Workout> workouts;
+
+  @ManyToOne
+  @JoinColumn(name = "person_id")
+  private Person person;
+
+  public Session(){}
+  public Session(long id, LocalDateTime start, LocalDateTime end, List<Workout> 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<Workout> getWorkouts() {
+    return workouts;
+  }
+
+  public Person getPerson() {
+    return person;
+  }
+
+  public long getDurationInMinutes(){
+    return Duration.between(start, end).toMinutes();
+  }
+
+  public static class SessionBuilder{
+    private long id;
+    private LocalDateTime start;
+    private LocalDateTime end;
+    private List<Workout> 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<Workout> workouts){
+      this.workouts = workouts;
+      return this;
+    }
+
+    public SessionBuilder person(Person person){
+      this.person = person;
+      return this;
+    }
+
+    public Session build(){
+      return new Session(this);
+    }
+  }
+}

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);
+    }
+
+  }
+}

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<Set> sets;
+
+  @ManyToOne
+  @JoinColumn(name = "session_id")
+  private Session session;
+
+  public Workout(){}
+
+  public Workout(long id, List<Set> 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<Set> 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<Set> sets;
+    private Session session;
+
+    public WorkoutBuilder(){}
+
+    public WorkoutBuilder id(long id){
+      this.id = id;
+      return this;
+    }
+
+    public WorkoutBuilder sets(List<Set> sets){
+      this.sets = sets;
+      return this;
+    }
+
+    public WorkoutBuilder session(Session session){
+      this.session = session;
+      return this;
+    }
+
+    public Workout build(){
+      return new Workout(this);
+    }
+  }
+}

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);
+    }
+  }
+}

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);
+    }
+  }
+}

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<WorkoutAddRequest> workouts;
+
+  public SessionAddRequest(LocalDateTime start, LocalDateTime end, List<WorkoutAddRequest> 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<WorkoutAddRequest> getWorkouts() {
+    return workouts;
+  }
+
+  public static class SessionAddRequestBuilder{
+    private LocalDateTime start;
+    private LocalDateTime end;
+    private List<WorkoutAddRequest> 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<WorkoutAddRequest> workouts){
+      this.workouts = workouts;
+      return this;
+    }
+
+    public SessionAddRequest build(){
+      return new SessionAddRequest(this);
+    }
+  }
+}

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);
+    }
+  }
+}

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);
+      }
+    }
+}

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);
+      }
+    }
+}

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<SetAddRequest> sets;
+
+  public List<SetAddRequest> getSets(){
+    return this.sets;
+  }
+
+  public WorkoutAddRequest(List<SetAddRequest> sets){
+    this.sets = sets;
+  }
+
+  public WorkoutAddRequest(WorkoutAddRequestBuilder builder){
+    this.sets = builder.sets;
+  }
+
+  public static class WorkoutAddRequestBuilder{
+      private List<SetAddRequest> sets;
+
+      public WorkoutAddRequestBuilder(){}
+
+      public WorkoutAddRequestBuilder sets(List<SetAddRequest> sets){
+        this.sets = sets;
+        return this;
+      }
+
+      public WorkoutAddRequest build(){
+        return new WorkoutAddRequest(this);
+      }
+  }
+
+}

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<Person, Long> {
+
+  Optional<Person> findByEmail(String email);
+
+  void deleteByEmail(String email);
+
+}

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<Session,Long> {
+
+  List<Session> getAllByPersonEmail(String email);
+
+}

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<Set,Long> {
+
+  List<Set> findAllByWorkout(@Param("workout") long id);
+}

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<Workout,Long> {
+  List<Workout> findAllBySession(@Param("session") long id);
+}

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<Person> getAll();
+
+    void delete(String email);
+
+    List<Person> getFriends(String email);
+
+    Person addFriend(String email, String friendEmail);
+
+    Person deleteFriend(String email, String friendEmail);
+
+    Person getFriend(String email, String friendEmail);
+}

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<Session> getAll();
+
+  List<Session> getForPerson(String email);
+
+}

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<Set> getSetsOfWorkout(long workoutId);
+
+  void delete(long id);
+
+}

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<Workout> getAll(long sessionId);
+
+  Workout get(long id);
+
+  void delete(long id);
+
+}

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> 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> person = personRepository.findByEmail(email);
+    if(person.isPresent()){
+      return personRepository.findByEmail(email).get();
+    }else{
+      throw new RuntimeException();
+    }
+  }
+
+  @Override
+  public List<Person> getAll() {
+    return personRepository.findAll();
+  }
+
+  @Override
+  public void delete(String email) {
+    personRepository.deleteByEmail(email);
+  }
+
+  @Override
+  public List<Person> getFriends(String email) {
+    Optional<Person> 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> person = personRepository.findByEmail(email);
+    Optional<Person> 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> 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> person = personRepository.findByEmail(email);
+    if (person.isPresent() ) {
+      Optional<Person> 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();
+    }
+  }
+}

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> 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<Session> getAll() {
+    return sessionRepository.findAll();
+  }
+
+  @Override
+  public List<Session> getForPerson(String email) {
+    return sessionRepository.getAllByPersonEmail(email);
+  }
+}

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> 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<Set> getSetsOfWorkout(long workoutId) {
+
+    return setRepository.findAllByWorkout(workoutId);
+
+  }
+
+  @Override
+  public void delete(long id) {
+    setRepository.deleteById(id);
+  }
+}

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<Workout> 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);
+  }
+}

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

testing/assertJ/src/test/java/com/reflectoring/gymbuddy/ExtractedPropertiesTests.java

@@ -0,0 +1,314 @@
+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 org.springframework.test.annotation.DirtiesContext;
+
+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)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_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_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<Session> 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");
+    }
+
+    // ----------- Method call extracting --------
+    @Test
+    void filterOnAllSesionThatAreFomToday_methodCallExtractingMethod(){
+        assertThat(sessionService.getAll())
+                .extractingResultOf("getDurationInMinutes", Long.class)
+                .filteredOn(duration -> duration < 120l)
+                .hasSize(1);
+    }
+
+}

testing/assertJ/src/test/java/com/reflectoring/gymbuddy/FilteringTests.java

@@ -0,0 +1,353 @@
+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;
+import org.springframework.test.annotation.DirtiesContext;
+
+@SpringBootTest
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_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
+  @Disabled
+  void checkIfTonyIsInList_NullValue_basicFiltering(){
+    List<Session> 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("name", "Tony").isNotEmpty();
+  }
+
+  @Test
+  void checkIfTonyIsInList_NullValue_basicFieldFiltering(){
+    List<Session> 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<Person> sessionStartedToday = new SessionStartedTodayCondition();
+    assertThat(personService.getAll())
+            .filteredOn(sessionStartedToday)
+            .hasSize(4);
+  }
+
+  //Filtering on complex conditions
+  @Test
+  void filterOnNameContainsOAndNumberOfFriends_customConditionFiltering(){
+    Condition<Person> 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);
+  }
+
+}

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<Person> {
+
+    @Override
+    public boolean matches(Person person){
+        return person.getSessions().stream()
+                .anyMatch(session -> session.getStart().isAfter(LocalDateTime.now().minusHours(1)));
+    }
+}

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<Person, List<Session>> sessions(){
+        return new PersonSessionExtractor();
+    }
+
+    private static class PersonSessionExtractor implements Function<Person, List<Session>> {
+        @Override
+        public List<Session> apply(Person person) {
+            return person.getSessions();
+        }
+    }
+}