Skip to content

Commit 0e17fd4

Browse files
committed
GH-361: Add timeout and scheduling.pool.size for Cafe DSL demo
Fixes: #361 The default request timeout in Spring Integration is `30 seconds` to not block the thread forever. However, the logic in the Cafe Demo is longer even that one minute to wait for all the drinks to be ready to free an order queue. * Add `spring.integration.endpoint.default-timeout=-1` to wait on the customer request forever for the logic of the application * Add `spring.task.scheduling.pool.size=10` to avoid deadlock when all the scheduled tasks compete for the same thread by default * Upgrade to latest Gradle * Upgrade to the latest Spring Boot Related to: spring-projects/spring-boot#41477
1 parent 4f664ec commit 0e17fd4

File tree

6 files changed

+36
-23
lines changed

6 files changed

+36
-23
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
spring.task.scheduling.pool.size=10
2+
spring.integration.endpoint.default-timeout=-1

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version=6.4.0
2-
springBootVersion=3.3.0
2+
springBootVersion=3.4.0-SNAPSHOT
33
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
44
org.gradle.caching=true
55
org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

-18.1 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
47
zipStoreBase=GRADLE_USER_HOME
58
zipStorePath=wrapper/dists
6-
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f

gradlew

+17-10
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8791

8892
# Use the maximum available, or set MAX_FD != -1 to use that value.
8993
MAX_FD=maximum
@@ -130,26 +134,29 @@ location of your Java installation."
130134
fi
131135
else
132136
JAVACMD=java
133-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134140
135141
Please set the JAVA_HOME variable in your environment to match the
136142
location of your Java installation."
143+
fi
137144
fi
138145

139146
# Increase the maximum file descriptors if we can.
140147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141148
case $MAX_FD in #(
142149
max*)
143150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
145152
MAX_FD=$( ulimit -H -n ) ||
146153
warn "Could not query maximum file descriptor limit"
147154
esac
148155
case $MAX_FD in #(
149156
'' | soft) :;; #(
150157
*)
151158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
153160
ulimit -n "$MAX_FD" ||
154161
warn "Could not set maximum file descriptor limit to $MAX_FD"
155162
esac
@@ -198,11 +205,11 @@ fi
198205
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199206
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200207

201-
# Collect all arguments for the java command;
202-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203-
# shell script including quotes and variable substitutions, so put them in
204-
# double quotes to make sure that they get re-expanded; and
205-
# * put everything else in single quotes, so that it's not re-expanded.
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
206213

207214
set -- \
208215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

0 commit comments

Comments
 (0)