diff --git a/sportsnet-reactive-producer/src/test/resources/contracts/shouldReturnAllTeams.groovy b/sportsnet-reactive-producer/src/test/resources/contracts/shouldReturnAllTeams.groovy index 4e422be..228fc99 100644 --- a/sportsnet-reactive-producer/src/test/resources/contracts/shouldReturnAllTeams.groovy +++ b/sportsnet-reactive-producer/src/test/resources/contracts/shouldReturnAllTeams.groovy @@ -12,7 +12,7 @@ Contract.make { """ [ { "id": "1883", "name" : "Dodgers" }, - { "id": "1912", "name" : "OldSox" } + { "id": "1912", "name" : "RedSox" } ] """ ) diff --git a/users-kotlin-consumer/.gitignore b/users-kotlin-consumer/.gitignore new file mode 100644 index 0000000..82eca33 --- /dev/null +++ b/users-kotlin-consumer/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.jar b/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..01e6799 Binary files /dev/null and b/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.jar differ diff --git a/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.properties b/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..7179346 --- /dev/null +++ b/users-kotlin-consumer/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip diff --git a/users-kotlin-consumer/mvnw b/users-kotlin-consumer/mvnw new file mode 100755 index 0000000..5551fde --- /dev/null +++ b/users-kotlin-consumer/mvnw @@ -0,0 +1,286 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 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)`" + # TODO classpath? +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 + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + 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 command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + 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 + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/users-kotlin-consumer/mvnw.cmd b/users-kotlin-consumer/mvnw.cmd new file mode 100644 index 0000000..e5cfb0a --- /dev/null +++ b/users-kotlin-consumer/mvnw.cmd @@ -0,0 +1,161 @@ +@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 http://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 Maven2 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 key stroke 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 my 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.4.2/maven-wrapper-0.4.2.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% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/users-kotlin-consumer/pom.xml b/users-kotlin-consumer/pom.xml new file mode 100644 index 0000000..5487939 --- /dev/null +++ b/users-kotlin-consumer/pom.xml @@ -0,0 +1,137 @@ + + + 4.0.0 + + com.example + users-kotlin-consumer + 0.0.1-SNAPSHOT + jar + + users-kotlin-consumer + Kotlin pring Junit5 CDC Reactive Consumer Demo + + + org.springframework.boot + spring-boot-starter-parent + 2.1.1.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 1.2.71 + Greenwich.M3 + + + + + org.springframework.boot + spring-boot-starter-webflux + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-reflect + + + io.projectreactor + reactor-test + test + + + org.springframework.cloud + spring-cloud-starter-contract-stub-runner + test + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + joda-time + joda-time + + + + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.springframework.boot + spring-boot-maven-plugin + + + kotlin-maven-plugin + org.jetbrains.kotlin + + + -Xjsr305=strict + + + spring + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/User.kt b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/User.kt new file mode 100644 index 0000000..14e7cd5 --- /dev/null +++ b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/User.kt @@ -0,0 +1,3 @@ +package com.example.userconsumerdemo + +data class User(var id: String?, val name: String) diff --git a/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserClient.kt b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserClient.kt new file mode 100644 index 0000000..20778ca --- /dev/null +++ b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserClient.kt @@ -0,0 +1,18 @@ +package com.example.userconsumerdemo + +import org.springframework.http.MediaType +import org.springframework.stereotype.Component +import org.springframework.web.reactive.function.client.WebClient +import reactor.core.publisher.Flux + +@Component +class UserClient(val webClient: WebClient) { + fun getAll(): Flux { + return webClient + .get() + .uri("http://localhost:8090/all") + .accept(MediaType.APPLICATION_JSON_UTF8) + .exchange() + .flatMapMany { r -> r.bodyToFlux(User::class.java) } + } +} diff --git a/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserConsumerApp.kt b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserConsumerApp.kt new file mode 100644 index 0000000..6605a7c --- /dev/null +++ b/users-kotlin-consumer/src/main/kotlin/com/example/userconsumerdemo/UserConsumerApp.kt @@ -0,0 +1,17 @@ +package com.example.userconsumerdemo + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import org.springframework.context.annotation.Bean +import org.springframework.web.reactive.function.client.WebClient + +@SpringBootApplication +class UserConsumerApp { + + @Bean + fun webClient(): WebClient = WebClient.builder().build() + + fun main(args: Array) { + runApplication(*args) + } +} \ No newline at end of file diff --git a/users-kotlin-consumer/src/main/resources/application.properties b/users-kotlin-consumer/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/users-kotlin-consumer/src/test/kotlin/com/example/userconsumerdemo/UserConsumerClientTest.kt b/users-kotlin-consumer/src/test/kotlin/com/example/userconsumerdemo/UserConsumerClientTest.kt new file mode 100644 index 0000000..4637812 --- /dev/null +++ b/users-kotlin-consumer/src/test/kotlin/com/example/userconsumerdemo/UserConsumerClientTest.kt @@ -0,0 +1,45 @@ +package com.example.userconsumerdemo + +import org.hamcrest.Matchers +import org.junit.Assert +import org.junit.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner +import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties +import org.springframework.context.annotation.Import +import org.springframework.test.context.junit.jupiter.SpringExtension +import org.springframework.test.context.junit4.SpringRunner +import reactor.test.StepVerifier + + +//@ExtendWith(SpringExtension::class) // DOESNGT WORK FOR ME +@RunWith(SpringRunner::class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@AutoConfigureStubRunner(ids = ["com.example:users-kotlin-producer:+:8090"], + stubsMode = StubRunnerProperties.StubsMode.LOCAL) +@Import(UserClient::class, UserConsumerApp::class) +class UserConsumerClientTest { + @Autowired + private lateinit var userClient: UserClient + + private val generalUserMatcher = Matchers.allOf( + Matchers.notNullValue(), + Matchers.hasProperty("name", Matchers.notNullValue()), + Matchers.hasProperty("id", Matchers.notNullValue()) + )!! + + @Test + fun `should consume service all endpoint`() { + //val users: Supplier> = Supplier { userClient.getAll() } + StepVerifier + .create(userClient.getAll()) + .expectSubscription() + .assertNext { Assert.assertThat(it, generalUserMatcher) } + .assertNext { Assert.assertThat(it, generalUserMatcher) } + .verifyComplete() + } + +} diff --git a/users-kotlin-producer/.gitignore b/users-kotlin-producer/.gitignore new file mode 100644 index 0000000..82eca33 --- /dev/null +++ b/users-kotlin-producer/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/users-kotlin-producer/.mvn/wrapper/maven-wrapper.jar b/users-kotlin-producer/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..01e6799 Binary files /dev/null and b/users-kotlin-producer/.mvn/wrapper/maven-wrapper.jar differ diff --git a/users-kotlin-producer/.mvn/wrapper/maven-wrapper.properties b/users-kotlin-producer/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..7179346 --- /dev/null +++ b/users-kotlin-producer/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip diff --git a/users-kotlin-producer/pom.xml b/users-kotlin-producer/pom.xml new file mode 100644 index 0000000..c3872d3 --- /dev/null +++ b/users-kotlin-producer/pom.xml @@ -0,0 +1,155 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.1.RELEASE + + + com.example + users-kotlin-producer + 0.0.1-SNAPSHOT + jar + producer + Kotlin Junit5 Reactive CDC Demo + + + 1.8 + 1.2.71 + Greenwich.M3 + 2.0.1.RELEASE + + + + + org.springframework.boot + spring-boot-starter-data-mongodb-reactive + + + org.springframework.boot + spring-boot-starter-webflux + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-reflect + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + test + + + + io.projectreactor + reactor-test + test + + + org.springframework.cloud + spring-cloud-starter-contract-verifier + test + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + joda-time + joda-time + + + junit + junit + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.springframework.boot + spring-boot-maven-plugin + + + kotlin-maven-plugin + org.jetbrains.kotlin + + + -Xjsr305=strict + + + spring + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + org.springframework.cloud + spring-cloud-contract-maven-plugin + ${spring-cloud-contract.version} + true + + + com.example.demoproducer.BaseClass + + EXPLICIT + + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerApplication.kt b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerApplication.kt new file mode 100644 index 0000000..390eb7c --- /dev/null +++ b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerApplication.kt @@ -0,0 +1,11 @@ +package com.example.demoproducer + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class DemoProducerApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerEndpoint.kt b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerEndpoint.kt new file mode 100644 index 0000000..e02dec9 --- /dev/null +++ b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/DemoProducerEndpoint.kt @@ -0,0 +1,20 @@ +package com.example.demoproducer + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.web.reactive.function.server.RouterFunction +import org.springframework.web.reactive.function.server.ServerResponse +import org.springframework.web.reactive.function.server.* + +@Configuration +class DemoProducerEndpoint { + + @Bean + fun routes(repo: UserRepository): RouterFunction = router { + GET("/all") { + ServerResponse + .ok() + .body(repo.findAll()) + } + } +} diff --git a/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/User.kt b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/User.kt new file mode 100644 index 0000000..0cbb4b4 --- /dev/null +++ b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/User.kt @@ -0,0 +1,3 @@ +package com.example.demoproducer + +data class User(val id: String, val name: String) \ No newline at end of file diff --git a/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/UserRepository.kt b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/UserRepository.kt new file mode 100644 index 0000000..b703f35 --- /dev/null +++ b/users-kotlin-producer/src/main/kotlin/com/example/demoproducer/UserRepository.kt @@ -0,0 +1,7 @@ +package com.example.demoproducer + +import org.springframework.data.mongodb.repository.ReactiveMongoRepository + +interface UserRepository : ReactiveMongoRepository{ + +} diff --git a/users-kotlin-producer/src/main/resources/application.properties b/users-kotlin-producer/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/BaseClass.java b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/BaseClass.java new file mode 100644 index 0000000..f6bbfe6 --- /dev/null +++ b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/BaseClass.java @@ -0,0 +1,34 @@ +package com.example.demoproducer; + +import io.restassured.RestAssured; +import org.junit.Before; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import reactor.core.publisher.Flux; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ExtendWith(SpringExtension.class) +public class BaseClass { + + @LocalServerPort + private Long port; + + @MockBean + UserRepository repo; + + private User user1 = new User("1234", "Mario"); + private User user2 = new User("2345", "Dave"); + + @BeforeAll + public void setUp() { + Mockito.when(repo.findAll()) + .thenReturn(Flux.just(user1, user2)); + + RestAssured.baseURI = "http://localhost:" + port; + } +} diff --git a/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerPersistenceTests.kt b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerPersistenceTests.kt new file mode 100644 index 0000000..4521500 --- /dev/null +++ b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerPersistenceTests.kt @@ -0,0 +1,48 @@ +package com.example.demoproducer + +import org.hamcrest.MatcherAssert +import org.hamcrest.Matchers +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest +import org.springframework.test.context.junit.jupiter.SpringExtension +import reactor.core.publisher.Flux +import reactor.test.StepVerifier + +@DataMongoTest +@ExtendWith(SpringExtension::class) +class DemoProducerPersistenceTests { + + @Autowired + private lateinit var repo: UserRepository + + private val consistencyMatcher = Matchers.allOf( + Matchers.hasProperty("id", Matchers.notNullValue()), + Matchers.hasProperty("name", Matchers.notNullValue()) + )!! + + @Test + fun `shouldtestThatDataPersistenceWorks`() { + val user = User("1234", "Mario") + + val setupPublisher = repo + .deleteAll() + .then(repo.save(user)) + + val composite = Flux + .from(setupPublisher) + .thenMany(repo.findAll()) + + StepVerifier + .create(composite) + .expectSubscription() + .assertNext { + MatcherAssert.assertThat("State should be consistent", + it, + consistencyMatcher) + } + .`as`("Consistence Check") + .verifyComplete() + } +} \ No newline at end of file diff --git a/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerStateTests.kt b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerStateTests.kt new file mode 100644 index 0000000..e64f351 --- /dev/null +++ b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerStateTests.kt @@ -0,0 +1,59 @@ +package com.example.demoproducer + +import org.hamcrest.MatcherAssert +import org.hamcrest.Matchers +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.jupiter.api.function.Executable +import org.springframework.test.context.junit.jupiter.SpringExtension +import reactor.core.publisher.Flux +import reactor.test.StepVerifier +import org.assertj.core.api.Assertions as Assertj + +@ExtendWith(SpringExtension::class) +class DemoProducerStateTests { + + @Test + fun `testShouldNeverTestTrivialCode`() { + val user = User("1234", "Mario") + + Assertions.assertNotSame(user, User("1234", "Mario")) + Assertions.assertAll("Should have constructed state", + Executable { Assertions.assertEquals("Mario", user.name) }, + Executable { Assertions.assertEquals("1234", user.id) } + ) + + val matcher = Matchers.allOf( + Matchers.hasProperty("id", Matchers.equalTo("1234")), + Matchers.hasProperty("name", Matchers.equalTo("Mario")) + ) + + MatcherAssert.assertThat("Hamcrest Matchers validate Object state", + user, matcher) + + Assertj.assertThat(user).`as`("Object state is consistent") + .isNotNull + .hasNoNullFieldsOrProperties() + .hasFieldOrPropertyWithValue("id", "1234") + .hasFieldOrPropertyWithValue("name", "Mario") + .isNotSameAs(User("1234", "Mario")) + } + + @Test + fun `shouldNeverTestTrivialCodeEvenReactively`() { + val user = User("1234", "Mario") + + val matcher = Matchers.allOf( + Matchers.hasProperty("id", Matchers.equalTo("1234")), + Matchers.hasProperty("name", Matchers.equalTo("Mario")) + ) + + StepVerifier + .create(Flux.just(user)) + .expectSubscription() + .assertNext { MatcherAssert.assertThat("Consistend object state", + it, matcher) } + .verifyComplete() + } +} \ No newline at end of file diff --git a/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerWebTests.kt b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerWebTests.kt new file mode 100644 index 0000000..1871163 --- /dev/null +++ b/users-kotlin-producer/src/test/kotlin/com/example/demoproducer/DemoProducerWebTests.kt @@ -0,0 +1,49 @@ +package com.example.demoproducer + +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.mockito.Mockito +import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest +import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.http.MediaType +import org.springframework.test.context.junit.jupiter.SpringExtension +import org.springframework.test.web.reactive.server.WebTestClient +import reactor.core.publisher.Flux + +@ExtendWith(SpringExtension::class) +@WebFluxTest // test filters at some point :) +class DemoProducerWebTests { + + @MockBean + private lateinit var repo: UserRepository + + @BeforeEach + fun `setupAndConfigureMockBeans`() { + Mockito + .`when`(repo.findAll()) + .thenReturn(Flux.just( + User("1234", "Mario"), + User("2345", "Rob") + )) + } + + @Test + fun `shouldTestRESTFindAllEndpoint`() { + WebTestClient + .bindToRouterFunction(DemoProducerEndpoint().routes(repo)) + .build() + .get() + .uri("/all") + .accept(MediaType.APPLICATION_JSON_UTF8) + .exchange() + .expectStatus().isOk + .expectHeader().contentType(MediaType.APPLICATION_JSON_UTF8) + .expectBody() + .jsonPath("\$.[0].id").isEqualTo("1234") + .jsonPath("\$.[1].id").isEqualTo("2345") + .jsonPath("\$.[0].name").isEqualTo("Mario") + .jsonPath("\$.[1].name").isEqualTo("Rob") + + } +} \ No newline at end of file diff --git a/users-kotlin-producer/src/test/resources/contracts/AllUsers.json b/users-kotlin-producer/src/test/resources/contracts/AllUsers.json new file mode 100644 index 0000000..e6f75d2 --- /dev/null +++ b/users-kotlin-producer/src/test/resources/contracts/AllUsers.json @@ -0,0 +1 @@ +[{"id":"1234", "name":"Mario"},{"id":"2345", "name":"Dave"}] diff --git a/users-kotlin-producer/src/test/resources/contracts/shouldReturnAllUsers.yaml b/users-kotlin-producer/src/test/resources/contracts/shouldReturnAllUsers.yaml new file mode 100644 index 0000000..4894678 --- /dev/null +++ b/users-kotlin-producer/src/test/resources/contracts/shouldReturnAllUsers.yaml @@ -0,0 +1,10 @@ +description: Tests should verify /all endpoint +name: all endpoint test +request: + url: /all + method: GET +response: + status: 200 + headers: + content-type: application/json;charset=UTF-8 + bodyFromFile: AllUsers.json \ No newline at end of file