From df1f260a59213bee37d6abd4042e28a2dd1af4ee Mon Sep 17 00:00:00 2001 From: Jay Bryant Date: Mon, 13 Jul 2020 15:02:42 -0500 Subject: [PATCH] Wording changes Replacing some terms --- src/reference/asciidoc/chain.adoc | 2 +- src/reference/asciidoc/ip.adoc | 2 +- src/reference/asciidoc/jmx.adoc | 3 ++- src/reference/asciidoc/jpa.adoc | 2 +- src/reference/asciidoc/stream.adoc | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/reference/asciidoc/chain.adoc b/src/reference/asciidoc/chain.adoc index 90afd00434..3a605c2dff 100644 --- a/src/reference/asciidoc/chain.adoc +++ b/src/reference/asciidoc/chain.adoc @@ -54,7 +54,7 @@ The `` element used in the preceding example sets a message hea A header enricher is a specialization of `Transformer` that touches only header values. You could obtain the same result by implementing a `MessageHandler` that did the header modifications and wiring that as a bean, but the header-enricher is a simpler option. -The `` can be configured as the last 'black-box' consumer of the message flow. +The `` can be configured as the last "`closed-box`" consumer of the message flow. For this solution, you can to put it at the end of the some , as the following example shows: ==== diff --git a/src/reference/asciidoc/ip.adoc b/src/reference/asciidoc/ip.adoc index 392b4aa6f7..672972ab34 100644 --- a/src/reference/asciidoc/ip.adoc +++ b/src/reference/asciidoc/ip.adoc @@ -1259,7 +1259,7 @@ By default, the files are located on the classpath, but you can override this by Starting with version 4.3.6, when you use NIO, you can specify an `ssl-handshake-timeout` (in seconds) on the connection factory. This timeout (the default is 30 seconds) is used during SSL handshake when waiting for data. -If the timeout is exceeded, the process is aborted and the socket is closed. +If the timeout is exceeded, the process is stopped and the socket is closed. [[tcp-ssl-host-verification]] ==== Host Verification diff --git a/src/reference/asciidoc/jmx.adoc b/src/reference/asciidoc/jmx.adoc index cfa0cc7281..b41ad7b6a9 100644 --- a/src/reference/asciidoc/jmx.adoc +++ b/src/reference/asciidoc/jmx.adoc @@ -449,7 +449,8 @@ The MBeans are now registered during context initialization and unregistered whe [[jmx-mbean-shutdown]] ===== Orderly Shutdown Managed Operation -The MBean exporter provides a JMX operation to shut down the application in an orderly manner, intended for use before terminating the JVM. +The MBean exporter lets a JMX operation shut down the application in an orderly manner. +It is intended for use before stopping the JVM. The following example shows how to use it: ==== diff --git a/src/reference/asciidoc/jpa.adoc b/src/reference/asciidoc/jpa.adoc index a03a5165bd..8b786a1520 100644 --- a/src/reference/asciidoc/jpa.adoc +++ b/src/reference/asciidoc/jpa.adoc @@ -830,7 +830,7 @@ public class JpaJavaApplication { The JPA inbound channel adapter lets you poll a database to retrieve one or more JPA entities. The retrieved data is consequently used to start a Spring Integration flow that uses the retrieved data as message payload. -Additionally, you can use JPA outbound channel adapters at the end of your flow in order to persist data, essentially terminating the flow at the end of the persistence operation. +Additionally, you can use JPA outbound channel adapters at the end of your flow in order to persist data, essentially stopping the flow at the end of the persistence operation. However, how can you execute JPA persistence operations in the middle of a flow? For example, you may have business data that you are processing in your Spring Integration message flow and that you would like to persist, yet you still need to use other components further downstream. Alternatively, instead of polling the database using a poller, you need to execute JPQL queries and actively retrieve data, which is then processed in subsequent components within your flow. diff --git a/src/reference/asciidoc/stream.adoc b/src/reference/asciidoc/stream.adoc index fcb0d5fadc..65d536d806 100644 --- a/src/reference/asciidoc/stream.adoc +++ b/src/reference/asciidoc/stream.adoc @@ -82,7 +82,7 @@ java -jar my.jar < foo.txt ---- ==== -This approach lets the application terminate when the pipe is closed. +This approach lets the application stop when the pipe is closed. Four convenient factory methods are available: