From 6fd4280d12a5186eb2a009eb018b8c0943baf85d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 16 Nov 2021 22:59:15 +0100 Subject: [PATCH] Removed deprecations --- .../project/gradlew | 269 +++++++++++------- .../java/contracts/ContractTestsBase.java | 2 +- .../java/contracts/MessagingAutoConfig.java | 2 +- .../cloud/contract/docs/Main.java | 3 +- .../fraud/FraudDetectionXmlController.java | 2 +- .../stubrunner/AetherStubDownloader.java | 4 +- .../stubrunner/FileStubDownloader.java | 4 +- .../cloud/contract/stubrunner/GitRepo.java | 7 +- .../contract/stubrunner/ProjectVersion.java | 10 +- .../stubrunner/ScmStubDownloaderBuilder.java | 4 +- .../camel/StubRunnerCamelConfiguration.java | 4 +- .../contract/stubrunner/AbstractGitTest.java | 8 +- .../plugin/PublishStubsToScmTask.java | 2 +- .../maven/verifier/PushStubsToScmMojo.java | 2 +- .../contract/maven/verifier/RunMojo.java | 2 +- .../stubrunner/PactStubDownloaderBuilder.java | 2 +- .../verifier/builder/BaseClassProvider.java | 2 +- .../verifier/file/ContractFileScanner.java | 4 +- .../amqp/SpringAmqpStubMessages.java | 2 +- .../util/ToFileContractsTransformer.java | 3 +- .../wiremock/restdocs/WireMockSnippet.java | 4 +- tests/pom.xml | 2 - tests/samples-messaging-stream/.springBeans | 16 -- tests/samples-messaging-stream/pom.xml | 53 ---- .../main/java/com/example/BookDeleted.java | 41 --- .../java/com/example/BookDeletedListener.java | 47 --- .../main/java/com/example/BookReturned.java | 41 --- .../com/example/BookReturnedListener.java | 45 --- .../main/java/com/example/BookService.java | 61 ---- .../example/StreamMessagingApplication.java | 38 --- .../src/main/resources/application.yml | 5 - .../StreamMessagingApplicationSpec.groovy | 165 ----------- 32 files changed, 197 insertions(+), 659 deletions(-) delete mode 100644 tests/samples-messaging-stream/.springBeans delete mode 100644 tests/samples-messaging-stream/pom.xml delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/BookDeletedListener.java delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/BookReturnedListener.java delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/BookService.java delete mode 100644 tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java delete mode 100644 tests/samples-messaging-stream/src/main/resources/application.yml delete mode 100644 tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy diff --git a/docker/spring-cloud-contract-docker/project/gradlew b/docker/spring-cloud-contract-docker/project/gradlew index 744e882ed5..1b6c787337 100755 --- a/docker/spring-cloud-contract-docker/project/gradlew +++ b/docker/spring-cloud-contract-docker/project/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ 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 or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" 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, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java index 4b9db23140..86980e5383 100644 --- a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java +++ b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java @@ -145,7 +145,7 @@ public abstract class ContractTestsBase { } private void setupConnection(String destination, YamlContract contract) { - if (StringUtils.isEmpty(destination)) { + if (!StringUtils.hasText(destination)) { return; } log.info("Setting up destination [{}]", destination); diff --git a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java index 276afda509..c3049a34ff 100644 --- a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java +++ b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java @@ -142,7 +142,7 @@ public class MessagingAutoConfig { } private String getRequiredProperty(String name, String value) { - if (StringUtils.isEmpty(value)) { + if (!StringUtils.hasText(value)) { throw new IllegalStateException("The property [" + name + "] must not be empty!"); } return value; diff --git a/docs/src/main/java/org/springframework/cloud/contract/docs/Main.java b/docs/src/main/java/org/springframework/cloud/contract/docs/Main.java index 7318d8cbee..262a4c335a 100644 --- a/docs/src/main/java/org/springframework/cloud/contract/docs/Main.java +++ b/docs/src/main/java/org/springframework/cloud/contract/docs/Main.java @@ -93,7 +93,8 @@ public class Main { mapper.disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER); StringBuilder sb = new StringBuilder(); for (Class metadatum : metadata) { - SpringCloudContractMetadata newInstance = (SpringCloudContractMetadata) metadatum.newInstance(); + SpringCloudContractMetadata newInstance = (SpringCloudContractMetadata) metadatum + .getDeclaredConstructors()[0].newInstance(); String description = newInstance.description(); String key = newInstance.key(); List additionalClasses = classesToLookAt(metadatum, newInstance); diff --git a/samples/standalone/restdocs/http-server/src/main/java/com/example/fraud/FraudDetectionXmlController.java b/samples/standalone/restdocs/http-server/src/main/java/com/example/fraud/FraudDetectionXmlController.java index e08587e0da..7db345a02f 100644 --- a/samples/standalone/restdocs/http-server/src/main/java/com/example/fraud/FraudDetectionXmlController.java +++ b/samples/standalone/restdocs/http-server/src/main/java/com/example/fraud/FraudDetectionXmlController.java @@ -31,7 +31,7 @@ public class FraudDetectionXmlController { @RequestMapping(value = "/xmlfraud", method = POST, consumes = MediaType.APPLICATION_XML_VALUE, produces = MediaType.APPLICATION_XML_VALUE) @ResponseBody public XmlResponseBody xmlResponseBody(@RequestBody XmlRequestBody xmlRequestBody) { - if (StringUtils.isEmpty(xmlRequestBody.name)) { + if (!StringUtils.hasText(xmlRequestBody.name)) { return new XmlResponseBody("EMPTY"); } return new XmlResponseBody("FULL"); diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java index f4733fab58..ab10485791 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java @@ -190,7 +190,7 @@ public class AetherStubDownloader implements StubDownloader { private File unpackedJar(String resolvedVersion, String stubsGroup, String stubsModule, String classifier) { try { log.info("Resolved version is [" + resolvedVersion + "]"); - if (StringUtils.isEmpty(resolvedVersion)) { + if (!StringUtils.hasText(resolvedVersion)) { log.warn("Stub for group [" + stubsGroup + "] module [" + stubsModule + "] and classifier [" + classifier + "] not found in " + this.remoteRepos); return null; @@ -219,7 +219,7 @@ public class AetherStubDownloader implements StubDownloader { } private String getVersion(String stubsGroup, String stubsModule, String version, String classifier) { - if (StringUtils.isEmpty(version) || LATEST_VERSION_IN_IVY.equals(version)) { + if (!StringUtils.hasText(version) || LATEST_VERSION_IN_IVY.equals(version)) { log.info("Desired version is [" + version + "] - will try to resolve the latest version"); return resolveHighestArtifactVersion(stubsGroup, stubsModule, classifier, LATEST_ARTIFACT_VERSION); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/FileStubDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/FileStubDownloader.java index dc093cca55..1d76538c84 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/FileStubDownloader.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/FileStubDownloader.java @@ -71,7 +71,7 @@ public class FileStubDownloader implements StubDownloaderBuilder { @Override public Resource resolve(String location, ResourceLoader resourceLoader) { - if (StringUtils.isEmpty(location) || !isProtocolAccepted(location)) { + if (!StringUtils.hasText(location) || !isProtocolAccepted(location)) { return null; } // Can be resolving a resource for Classpath as fallback @@ -227,7 +227,7 @@ class StubsStubDownloader implements StubDownloader { private String schemeSpecificPart() { try { String part = this.stubRunnerOptions.getStubRepositoryRoot().getURI().getSchemeSpecificPart(); - if (StringUtils.isEmpty(part)) { + if (!StringUtils.hasText(part)) { return part; } return part.startsWith("//") ? part.substring(2) : part; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java index 49e1749c92..295f4c24ce 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java @@ -43,6 +43,7 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ListBranchCommand; import org.eclipse.jgit.api.PullCommand; import org.eclipse.jgit.api.PushCommand; +import org.eclipse.jgit.api.RemoteSetUrlCommand; import org.eclipse.jgit.api.ResetCommand; import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.api.errors.EmptyCommitException; @@ -224,9 +225,9 @@ class GitRepo { Git git = command.call(); if (git.getRepository().getRemoteNames().isEmpty()) { log.info("No remote added. Will add remote of the cloned project"); - git.remoteSetUrl().setUri(new URIish(projectGitUrl)); - git.remoteSetUrl().setName("origin"); - git.remoteSetUrl().setPush(true); + git.remoteSetUrl().setRemoteUri(new URIish(projectGitUrl)); + git.remoteSetUrl().setRemoteName("origin"); + git.remoteSetUrl().setUriType(RemoteSetUrlCommand.UriType.PUSH); } return git; } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java index 07a3b2d8f0..180957de04 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java @@ -312,12 +312,12 @@ class ProjectVersion implements Comparable, Serializable { } private boolean noSuffix() { - return StringUtils.isEmpty(suffix); + return !StringUtils.hasText(suffix); } private String gav() { // Finchley - if (StringUtils.isEmpty(minor)) { + if (!StringUtils.hasText(minor)) { return String.format("%s", major); } // 1.0.1 @@ -338,13 +338,13 @@ class ProjectVersion implements Comparable, Serializable { // must have // either major and suffix (release train) // major, minor, patch and suffix - return isNumeric(major) && (StringUtils.isEmpty(minor) || StringUtils.isEmpty(patch) - || StringUtils.isEmpty(suffix) || StringUtils.isEmpty(delimiter)); + return isNumeric(major) && (!StringUtils.hasText(minor) || !StringUtils.hasText(patch) + || !StringUtils.hasText(suffix) || !StringUtils.hasText(delimiter)); } private boolean wrongReleaseTrainVersion() { // BAD: 1.EXAMPLE, GOOD: Hoxton.RELEASE - return isNumeric(major) && StringUtils.isEmpty(suffix); + return isNumeric(major) && !StringUtils.hasText(suffix); } } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java index c5e338ca62..7d9e37079f 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java @@ -80,7 +80,7 @@ public final class ScmStubDownloaderBuilder implements StubDownloaderBuilder { @Override public Resource resolve(String location, ResourceLoader resourceLoader) { - if (StringUtils.isEmpty(location) || !isProtocolAccepted(location)) { + if (!StringUtils.hasText(location) || !isProtocolAccepted(location)) { return null; } return new GitResource(location); @@ -263,7 +263,7 @@ class GitStubDownloaderProperties { private String schemeSpecificPart(URI uri) { String part = uri.getSchemeSpecificPart(); - if (StringUtils.isEmpty(part)) { + if (!StringUtils.hasText(part)) { return part; } return part.startsWith("//") ? part.substring(2) : part; diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java index b6ac1ffa07..1942a6228c 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RoutesBuilder; -import org.apache.camel.spring.SpringRouteBuilder; +import org.apache.camel.builder.RouteBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +53,7 @@ public class StubRunnerCamelConfiguration { @Bean public RoutesBuilder myRouter(final BatchStubRunner batchStubRunner) { - return new SpringRouteBuilder() { + return new RouteBuilder() { @Override public void configure() throws Exception { Map> contracts = batchStubRunner.getContracts(); diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/AbstractGitTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/AbstractGitTest.java index 25bbe6ac97..1229dd1afe 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/AbstractGitTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/AbstractGitTest.java @@ -65,12 +65,12 @@ public abstract class AbstractGitTest { throws GitAPIException, IOException, URISyntaxException { try (Git git = openGitProject(project)) { RemoteRemoveCommand remove = git.remoteRemove(); - remove.setName("origin"); + remove.setRemoteName("origin"); remove.call(); RemoteSetUrlCommand command = git.remoteSetUrl(); - command.setUri(new URIish(origin.toURI().toURL())); - command.setName("origin"); - command.setPush(push); + command.setRemoteUri(new URIish(origin.toURI().toURL())); + command.setRemoteName("origin"); + command.setUriType(RemoteSetUrlCommand.UriType.PUSH); command.call(); StoredConfig config = git.getRepository().getConfig(); RemoteConfig originConfig = new RemoteConfig(config, "origin"); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.java index 698b9d8c21..df423dd70f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.java @@ -84,7 +84,7 @@ class PublishStubsToScmTask extends DefaultTask { this.onlyIf(task -> { String contractRepoUrl = contractRepository.repositoryUrl.getOrElse(""); - if (StringUtils.isEmpty(contractRepoUrl) || !ScmStubDownloaderBuilder.isProtocolAccepted(contractRepoUrl)) { + if (!StringUtils.hasText(contractRepoUrl) || !ScmStubDownloaderBuilder.isProtocolAccepted(contractRepoUrl)) { getLogger().warn( "Skipping pushing stubs to scm since your contracts repository URL [{}] doesn't match any of the accepted protocols for SCM stub downloader", contractRepoUrl); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java index b44206d8ff..95037a097b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.java @@ -108,7 +108,7 @@ public class PushStubsToScmMojo extends AbstractMojo { + this.skip + ", spring.cloud.contract.verifier.publish-stubs-to-scm.skip=" + this.taskSkip); return; } - if (StringUtils.isEmpty(this.contractsRepositoryUrl) + if (!StringUtils.hasText(this.contractsRepositoryUrl) || !ScmStubDownloaderBuilder.isProtocolAccepted(this.contractsRepositoryUrl)) { getLog().info("Skipping pushing stubs to scm since your " + "[contractsRepositoryUrl] property doesn't match any of the accepted protocols"); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java index 1903c23628..879ff584af 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java @@ -133,7 +133,7 @@ public class RunMojo extends AbstractMojo { BatchStubRunner batchStubRunner = null; StubRunnerOptionsBuilder optionsBuilder = new StubRunnerOptionsBuilder() .withStubsClassifier(this.stubsClassifier); - if (StringUtils.isEmpty(this.stubs)) { + if (!StringUtils.hasText(this.stubs)) { StubRunnerOptions options = optionsBuilder.withMinMaxPort(this.httpPort, this.httpPort).build(); StubRunner stubRunner = this.localStubRunner.run(resolveStubsDirectory().getAbsolutePath(), options); batchStubRunner = new BatchStubRunner(Collections.singleton(stubRunner)); diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java index 5a1b760af6..09c8269616 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java @@ -89,7 +89,7 @@ public final class PactStubDownloaderBuilder implements StubDownloaderBuilder { @Override public Resource resolve(String location, ResourceLoader resourceLoader) { - if (StringUtils.isEmpty(location) || !isProtocolAccepted(location)) { + if (!StringUtils.hasText(location) || !isProtocolAccepted(location)) { return null; } return new PactResource(location); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/BaseClassProvider.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/BaseClassProvider.java index fc8a421e52..7b64ade095 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/BaseClassProvider.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/BaseClassProvider.java @@ -49,7 +49,7 @@ class BaseClassProvider { return mapping.get().getValue(); } } - if (StringUtils.isEmpty(packageWithBaseClasses)) { + if (!StringUtils.hasText(packageWithBaseClasses)) { return baseClassForTests; } String generatedClassName = generateDefaultBaseClassName(contractPackage, packageWithBaseClasses); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/ContractFileScanner.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/ContractFileScanner.java index df27fc22f0..d3a2bdff15 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/ContractFileScanner.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/ContractFileScanner.java @@ -37,7 +37,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import wiremock.com.google.common.collect.HashMultiset; @@ -52,6 +51,7 @@ import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConve import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; /** * Scans the provided file path for the DSLs. There's a possibility to provide inclusion @@ -257,7 +257,7 @@ public class ContractFileScanner { boolean excluded = matchesPattern(file, excludeMatchers); if (!excluded) { boolean contractFile = isContractFile(file); - boolean included = StringUtils.isEmpty(includeMatcher) + boolean included = !StringUtils.hasText(includeMatcher) || file.getAbsolutePath().matches(includeMatcher); included = !CollectionUtils.isEmpty(includeMatchers) ? matchesPattern(file, includeMatchers) : included; if (contractFile && included) { diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java index 96cbdeffd9..fc57ec19fb 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java @@ -44,7 +44,7 @@ import org.springframework.cloud.contract.verifier.util.MetadataUtil; import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mockingDetails; import static org.mockito.Mockito.verify; diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ToFileContractsTransformer.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ToFileContractsTransformer.java index 3c09b5638d..a89743340d 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ToFileContractsTransformer.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/ToFileContractsTransformer.java @@ -82,7 +82,8 @@ public final class ToFileContractsTransformer { Collection contracts = collectContractDescriptors(new File(path)); log.info("Found [{}] contract definition", contracts.size()); Class name = Class.forName(fqn); - ContractConverter contractConverter = (ContractConverter) name.newInstance(); + ContractConverter contractConverter = (ContractConverter) name.getDeclaredConstructors()[0] + .newInstance(); Collection converted = contractConverter.convertTo(contracts); log.info("Successfully converted contracts definitions"); Map stored = contractConverter.store(converted); diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java index 85c80492af..c614648fa9 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippet.java @@ -153,7 +153,7 @@ public class WireMockSnippet implements Snippet { private MappingBuilder queryParams(MappingBuilder request, Operation operation) { String rawQuery = operation.getRequest().getUri().getRawQuery(); - if (StringUtils.isEmpty(rawQuery)) { + if (!StringUtils.hasText(rawQuery)) { return request; } for (String queryPair : rawQuery.split("&")) { @@ -210,7 +210,7 @@ public class WireMockSnippet implements Snippet { builder.withRequestBody(matchingJsonPath(jsonPath)); } } - else if (!StringUtils.isEmpty(content)) { + else if (!!StringUtils.hasText(content)) { if (this.hasJsonBodyRequestToMatch) { builder.withRequestBody(equalToJson(content)); } diff --git a/tests/pom.xml b/tests/pom.xml index ea4d907c7c..ff22943efe 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -46,7 +46,6 @@ samples-messaging-camel - samples-messaging-stream samples-messaging-integration samples-messaging-amqp samples-messaging-jms @@ -70,7 +69,6 @@ samples-messaging-camel - samples-messaging-stream samples-messaging-integration samples-messaging-amqp samples-messaging-jms diff --git a/tests/samples-messaging-stream/.springBeans b/tests/samples-messaging-stream/.springBeans deleted file mode 100644 index 09593a31a7..0000000000 --- a/tests/samples-messaging-stream/.springBeans +++ /dev/null @@ -1,16 +0,0 @@ - - - 1 - - - - - - - java:com.example.fraud.StreamMessagingApplication - - - - - - diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml deleted file mode 100644 index 604b4cd0fc..0000000000 --- a/tests/samples-messaging-stream/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-contract-tests - 3.1.0-SNAPSHOT - .. - - spring-cloud-contract-sample-stream - jar - Spring Cloud Contract Sample Stream - Spring Cloud Contract Sample Spring Cloud Stream - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - org.springframework.cloud - spring-cloud-stream - ${spring-cloud-stream.version} - test-jar - test - test-binder - - - org.springframework.cloud - spring-cloud-contract-verifier - test - - - org.spockframework - spock-spring - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - diff --git a/tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java b/tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java deleted file mode 100644 index 14f363e9ea..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/BookDeleted.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class BookDeleted implements Serializable { - - public String bookName; - - public BookDeleted(String bookName) { - this.bookName = bookName; - } - - public BookDeleted() { - } - - public String getBookName() { - return this.bookName; - } - - void setBookName(String bookName) { - this.bookName = bookName; - } - -} diff --git a/tests/samples-messaging-stream/src/main/java/com/example/BookDeletedListener.java b/tests/samples-messaging-stream/src/main/java/com/example/BookDeletedListener.java deleted file mode 100644 index c97561db6a..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/BookDeletedListener.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.stereotype.Component; - -@Component("bookDeleted") -public class BookDeletedListener implements Consumer { - - private static final Logger log = LoggerFactory.getLogger(BookDeletedListener.class); - - public AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false); - - /** - * Scenario for "should generate tests triggered by a message": client side: if sends - * a message to input.messageFrom then message will be sent to output.messageFrom - * server side: will send a message to input, verify the message contents and await - * upon receiving message on the output messageFrom - */ - @Override - public void accept(BookDeleted bookDeleted) { - log.info("Deleting book " + bookDeleted); - // ... doing some work - this.bookSuccessfulyDeleted.set(true); - } - -} diff --git a/tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java b/tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java deleted file mode 100644 index d0bc9acf65..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/BookReturned.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class BookReturned implements Serializable { - - public String bookName; - - public BookReturned(String bookName) { - this.bookName = bookName; - } - - public BookReturned() { - } - - public String getBookName() { - return this.bookName; - } - - void setBookName(String bookName) { - this.bookName = bookName; - } - -} diff --git a/tests/samples-messaging-stream/src/main/java/com/example/BookReturnedListener.java b/tests/samples-messaging-stream/src/main/java/com/example/BookReturnedListener.java deleted file mode 100644 index 7a57d5495e..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/BookReturnedListener.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import java.util.function.Function; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.springframework.messaging.Message; -import org.springframework.messaging.support.MessageBuilder; -import org.springframework.stereotype.Component; - -@Component("bookReturned") -public class BookReturnedListener implements Function> { - - private static final Logger log = LoggerFactory.getLogger(BookReturnedListener.class); - - /** - * Scenario for "should generate tests triggered by a message": client side: if sends - * a message to input.messageFrom then message will be sent to output.messageFrom - * server side: will send a message to input, verify the message contents and await - * upon receiving message on the output messageFrom - */ - @Override - public Message apply(BookReturned bookReturned) { - log.info("Got the book " + bookReturned); - return MessageBuilder.withPayload(bookReturned).setHeader("BOOK-NAME", bookReturned.bookName).build(); - } - -} diff --git a/tests/samples-messaging-stream/src/main/java/com/example/BookService.java b/tests/samples-messaging-stream/src/main/java/com/example/BookService.java deleted file mode 100644 index be3962fbe7..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/BookService.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import java.util.function.Supplier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import reactor.core.publisher.EmitterProcessor; -import reactor.core.publisher.Flux; - -import org.springframework.integration.support.MessageBuilder; -import org.springframework.messaging.Message; -import org.springframework.stereotype.Service; - -@Service("bookSender") -public class BookService implements Supplier>> { - - private static final Logger log = LoggerFactory.getLogger(BookService.class); - - private final EmitterProcessor> bookReturnedEmitterProcessor; - - public BookService(EmitterProcessor> bookReturnedEmitterProcessor) { - this.bookReturnedEmitterProcessor = bookReturnedEmitterProcessor; - } - - /** - * Scenario for "should generate tests triggered by a method": client side: must have - * a possibility to "trigger" sending of a message to the given messageFrom server - * side: will run the method and await upon receiving message on the output - * messageFrom - * - * Method triggers sending a message to a source. - * @param bookReturned - payload of the message - */ - public void returnBook(BookReturned bookReturned) { - log.info("Returning book " + bookReturned); - this.bookReturnedEmitterProcessor - .onNext(MessageBuilder.withPayload(bookReturned).setHeader("BOOK-NAME", bookReturned.bookName).build()); - } - - @Override - public Flux> get() { - return this.bookReturnedEmitterProcessor; - } - -} diff --git a/tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java b/tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java deleted file mode 100644 index 1f2bf8e759..0000000000 --- a/tests/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example; - -import reactor.core.publisher.EmitterProcessor; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.messaging.Message; - -@SpringBootApplication -class StreamMessagingApplication { - - public static void main(String[] args) { - SpringApplication.run(StreamMessagingApplication.class, args); - } - - @Bean - EmitterProcessor> bookReturnedEmitterProcessor() { - return EmitterProcessor.create(); - } - -} diff --git a/tests/samples-messaging-stream/src/main/resources/application.yml b/tests/samples-messaging-stream/src/main/resources/application.yml deleted file mode 100644 index 2c171186c9..0000000000 --- a/tests/samples-messaging-stream/src/main/resources/application.yml +++ /dev/null @@ -1,5 +0,0 @@ -spring.cloud.function.definition: bookReturned;bookSender;bookDeleted -spring.cloud.stream.bindings.bookSender-out-0.destination: inputDestination -spring.cloud.stream.bindings.bookReturned-in-0.destination: inputDestination -spring.cloud.stream.bindings.bookReturned-out-0.destination: bookReturned -spring.cloud.stream.bindings.bookDeleted-in-0.destination: bookDeleted diff --git a/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy deleted file mode 100644 index 20c28c77f9..0000000000 --- a/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2013-2020 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 - * - * 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. - */ - -package com.example - -import javax.inject.Inject - -import com.jayway.jsonpath.DocumentContext -import com.jayway.jsonpath.JsonPath -import com.toomuchcoding.jsonassert.JsonAssertion -import spock.lang.Specification - -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.autoconfigure.ImportAutoConfiguration -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.cloud.contract.spec.Contract -import org.springframework.cloud.contract.verifier.messaging.MessageVerifier -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier -import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper -import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration -import org.springframework.context.annotation.Configuration -import org.springframework.messaging.Message - -/** - * SPIKE ON TESTS FROM NOTES IN MessagingSpec - */ -// Context configuration would end up in base class -@SpringBootTest(classes = [Config, StreamMessagingApplication], properties = "debug=true") -@AutoConfigureMessageVerifier -class StreamMessagingApplicationSpec extends Specification { - - // ALL CASES - @Inject - MessageVerifier> contractVerifierMessaging - ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() - - def "should work for triggered based messaging"() { - given: - def dsl = Contract.make { - label 'some_label' - input { - triggeredBy('bookReturnedTriggered()') - } - outputMessage { - sentTo('bookReturned') - body('''{ "bookName" : "foo" }''') - headers { - header('BOOK-NAME', 'foo') - } - } - } - // generated test should look like this: - when: - bookReturnedTriggered() - then: - def response = contractVerifierMessaging.receive('bookReturned') - response.headers.get('BOOK-NAME') == 'foo' - and: - DocumentContext parsedJson = JsonPath. - parse(contractVerifierObjectMapper.writeValueAsString(response.payload)) - JsonAssertion.assertThat(parsedJson).field('bookName').isEqualTo('foo') - } - - def "should generate tests triggered by a message"() { - given: - def dsl = Contract.make { - label 'some_label' - input { - messageFrom('inputDestination') - messageBody([ - bookName: 'foo' - ]) - messageHeaders { - header('sample', 'header') - } - } - outputMessage { - sentTo('bookReturned') - body([ - bookName: 'foo' - ]) - headers { - header('BOOK-NAME', 'foo') - } - } - } - - // generated test should look like this: - - when: - contractVerifierMessaging.send( - contractVerifierObjectMapper.writeValueAsString([bookName: 'foo']), - [sample: 'header'], 'inputDestination') - then: - def response = contractVerifierMessaging.receive('bookReturned') - response.headers.get('BOOK-NAME') == 'foo' - and: - DocumentContext parsedJson = JsonPath. - parse(contractVerifierObjectMapper.writeValueAsString(response.payload)) - JsonAssertion.assertThat(parsedJson).field('bookName').isEqualTo('foo') - } - - def "should generate tests without destination, triggered by a message"() { - given: - def dsl = Contract.make { - label 'some_label' - input { - messageFrom("bookDeleted") - messageBody([ - bookName: 'foo' - ]) - messageHeaders { - header('sample', 'header') - } - assertThat('bookWasDeleted()') - } - } - - // generated test should look like this: - - when: - contractVerifierMessaging. - send(contractVerifierObjectMapper.writeValueAsString([bookName: 'foo']), - [sample: 'header'], "bookDeleted") - then: - noExceptionThrown() - bookWasDeleted() - } - - // BASE CLASS WOULD HAVE THIS: - - @Autowired - BookService bookService - @Autowired - BookDeletedListener bookDeletedListener - - void bookReturnedTriggered() { - bookService.returnBook(new BookReturned("foo")) - } - - void bookWasDeleted() { - assert bookDeletedListener.bookSuccessfulyDeleted.get() - } - - @Configuration - @EnableAutoConfiguration - @ImportAutoConfiguration(TestChannelBinderConfiguration) - static class Config { - - } -}