diff --git a/pact/pact-feign-consumer/src/test/java/io/reflectoring/UserServiceConsumerTest.java b/pact/pact-feign-consumer/src/test/java/io/reflectoring/UserServiceConsumerTest.java index fa8b113..40ab661 100644 --- a/pact/pact-feign-consumer/src/test/java/io/reflectoring/UserServiceConsumerTest.java +++ b/pact/pact-feign-consumer/src/test/java/io/reflectoring/UserServiceConsumerTest.java @@ -11,6 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.web.client.RestTemplate; + import static org.assertj.core.api.Assertions.*; @ExtendWith(PactConsumerTestExt.class) @@ -25,8 +27,13 @@ class UserServiceConsumerTest { @Autowired private UserClient userClient; + @Autowired + private RestTemplate restTemplate; + @Pact(state = "provider accepts a new person", provider = "userservice", consumer = "userclient") RequestResponsePact createPersonPact(PactDslWithProvider builder) { + + restTemplate.postForEntity("http://...", ); // @formatter:off return builder .given("provider accepts a new person") diff --git a/settings.gradle b/settings.gradle index 0f1ffc5..9892ea9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ include 'spring-data:spring-data-rest-associations' include 'spring-data:spring-data-rest-springfox' +include 'spring-data:spring-data-jdbc' include 'spring-cloud:feign-with-spring-data-rest' include 'spring-cloud:sleuth-downstream-service' diff --git a/spring-boot/pagination/.gitignore b/spring-boot/pagination/.gitignore new file mode 100644 index 0000000..63177e3 --- /dev/null +++ b/spring-boot/pagination/.gitignore @@ -0,0 +1,30 @@ +HELP.md +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/spring-boot/pagination/build.gradle b/spring-boot/pagination/build.gradle new file mode 100644 index 0000000..7795592 --- /dev/null +++ b/spring-boot/pagination/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'org.springframework.boot' version '2.1.3.RELEASE' + id 'java' +} + +apply plugin: 'io.spring.dependency-management' + +group = 'io.reflectoring' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + testImplementation('org.junit.jupiter:junit-jupiter:5.4.0') + testImplementation('org.springframework.boot:spring-boot-starter-test'){ + exclude group: 'org.junit', module: 'junit' + } +} + +test { + useJUnitPlatform() +} diff --git a/spring-boot/pagination/gradlew b/spring-boot/pagination/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/spring-boot/pagination/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/spring-boot/pagination/gradlew.bat b/spring-boot/pagination/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/spring-boot/pagination/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/spring-boot/pagination/settings.gradle b/spring-boot/pagination/settings.gradle new file mode 100644 index 0000000..ede7473 --- /dev/null +++ b/spring-boot/pagination/settings.gradle @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} +rootProject.name = 'pagination' diff --git a/spring-boot/pagination/src/main/java/io/reflectoring/pagination/Character.java b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/Character.java new file mode 100644 index 0000000..8b70654 --- /dev/null +++ b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/Character.java @@ -0,0 +1,19 @@ +package io.reflectoring.pagination; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +@Data +class Character { + + @Id + @GeneratedValue + private Long id; + private String name; + private String movie; + +} diff --git a/spring-boot/pagination/src/main/java/io/reflectoring/pagination/CharacterRepository.java b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/CharacterRepository.java new file mode 100644 index 0000000..40f29e6 --- /dev/null +++ b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/CharacterRepository.java @@ -0,0 +1,12 @@ +package io.reflectoring.pagination; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +interface CharacterRepository extends CrudRepository { + + List findAll(Pageable pageable); + +} diff --git a/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginatedController.java b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginatedController.java new file mode 100644 index 0000000..355b867 --- /dev/null +++ b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginatedController.java @@ -0,0 +1,20 @@ +package io.reflectoring.pagination; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +class PaginatedController { + + private final CharacterRepository characterRepository; + + @GetMapping(path = "/characters") + List loadCharacters(Pageable pageable) { + return characterRepository.findAll(pageable); + } +} diff --git a/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginationApplication.java b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginationApplication.java new file mode 100644 index 0000000..ced2210 --- /dev/null +++ b/spring-boot/pagination/src/main/java/io/reflectoring/pagination/PaginationApplication.java @@ -0,0 +1,13 @@ +package io.reflectoring.pagination; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PaginationApplication { + + public static void main(String[] args) { + SpringApplication.run(PaginationApplication.class, args); + } + +} diff --git a/spring-boot/pagination/src/main/resources/application.properties b/spring-boot/pagination/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/spring-boot/pagination/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginatedControllerTest.java b/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginatedControllerTest.java new file mode 100644 index 0000000..bb62440 --- /dev/null +++ b/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginatedControllerTest.java @@ -0,0 +1,47 @@ +package io.reflectoring.pagination; + +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.test.web.servlet.MockMvc; + +import static org.assertj.core.api.AssertionsForInterfaceTypes.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@WebMvcTest(controllers = PaginatedController.class) +class PaginatedControllerTest { + + @MockBean + private CharacterRepository characterRepository; + + @Autowired + private MockMvc mockMvc; + + @Test + void paginationParametersAreEvaluated() throws Exception { + + mockMvc.perform(get("/characters") + .param("page", "5") + .param("size", "10") + .param("sort", "id,desc") // <-- no space after comma!!! + .param("sort", "name,asc")) // <-- no space after comma!!! + .andExpect(status().isOk()); + + ArgumentCaptor pageableCaptor = ArgumentCaptor.forClass(Pageable.class); + verify(characterRepository).findAll(pageableCaptor.capture()); + PageRequest pageable = (PageRequest) pageableCaptor.getValue(); + assertThat(pageable.getPageNumber()).isEqualTo(5); + assertThat(pageable.getPageSize()).isEqualTo(10); + assertThat(pageable.getSort().getOrderFor("name").getDirection()).isEqualTo(Sort.Direction.ASC); + assertThat(pageable.getSort().getOrderFor("id").getDirection()).isEqualTo(Sort.Direction.DESC); + + } + +} diff --git a/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginationApplicationTests.java b/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginationApplicationTests.java new file mode 100644 index 0000000..286366b --- /dev/null +++ b/spring-boot/pagination/src/test/java/io/reflectoring/pagination/PaginationApplicationTests.java @@ -0,0 +1,16 @@ +package io.reflectoring.pagination; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PaginationApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-boot/spring-boot-testing/application.yml b/spring-boot/spring-boot-testing/application.yml index 440216a..fba3306 100644 --- a/spring-boot/spring-boot-testing/application.yml +++ b/spring-boot/spring-boot-testing/application.yml @@ -2,4 +2,5 @@ spring.main.allow-bean-definition-overriding: true spring.jpa.hibernate.ddl-auto: create-drop spring.liquibase.enabled: false spring.flyway.enabled: false -io.reflectoring.scheduling.enabled: false \ No newline at end of file +io.reflectoring.scheduling.enabled: false +logging.level.org.hibernate.SQL: DEBUG \ No newline at end of file diff --git a/spring-boot/spring-boot-testing/src/main/java/io/reflectoring/customer/data/Customer.java b/spring-boot/spring-boot-testing/src/main/java/io/reflectoring/customer/data/Customer.java index aaab026..3261ab1 100644 --- a/spring-boot/spring-boot-testing/src/main/java/io/reflectoring/customer/data/Customer.java +++ b/spring-boot/spring-boot-testing/src/main/java/io/reflectoring/customer/data/Customer.java @@ -3,6 +3,7 @@ package io.reflectoring.customer.data; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.Version; import lombok.*; @@ -13,9 +14,12 @@ import lombok.*; @AllArgsConstructor public class Customer { - @Id - @GeneratedValue - private Long id; + @Id + @GeneratedValue + private Long id; - private String name; + @Version + private Long version; + + private String name; } diff --git a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/customer/data/CustomerModuleDataLayerTests.java b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/customer/data/CustomerModuleDataLayerTests.java index 2024157..bd6a27e 100644 --- a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/customer/data/CustomerModuleDataLayerTests.java +++ b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/customer/data/CustomerModuleDataLayerTests.java @@ -21,4 +21,11 @@ class CustomerModuleDataLayerTests { assertThat(bookingRepository).isNull(); } + @Test + void versionTest(){ + Customer hans = new Customer(); + hans.setName("Hans"); + customerRepository.save(hans); + } + } \ No newline at end of file