Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@ public B gateway(MessageChannel requestChannel, @Nullable Consumer<GatewayEndpoi
* .gateway(f -> f.transform("From Gateway SubFlow: "::concat))
* }
* </pre>
* @param flow the {@link IntegrationFlow} to to send a request message and wait for reply.
* @param flow the {@link IntegrationFlow} to send a request message and wait for reply.
* @return the current {@link BaseIntegrationFlowDefinition}.
*/
public B gateway(IntegrationFlow flow) {
Expand All @@ -2032,7 +2032,7 @@ public B gateway(IntegrationFlow flow) {
* .gateway(f -> f.transform("From Gateway SubFlow: "::concat), e -> e.replyTimeout(100L))
* }
* </pre>
* @param flow the {@link IntegrationFlow} to to send a request message and wait for reply.
* @param flow the {@link IntegrationFlow} to send a request message and wait for reply.
* @param endpointConfigurer the {@link Consumer} to provide integration endpoint options.
* @return the current {@link BaseIntegrationFlowDefinition}.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void afterSingletonsInstantiated() {
String scope = this.beanFactory.getBeanDefinition(beanName).getScope();
if (StringUtils.hasText(scope) && !BeanDefinition.SCOPE_SINGLETON.equals(scope)) {
throw new BeanCreationNotAllowedException(beanName, "IntegrationFlows can not be scoped beans. " +
"Any dependant beans are registered as singletons, meanwhile IntegrationFlow is just a " +
"Any dependent beans are registered as singletons, meanwhile IntegrationFlow is just a " +
"logical container for them. \n" +
"Consider using [IntegrationFlowContext] for manual registration of IntegrationFlows.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public interface IntegrationFlowContext {
IntegrationFlowRegistration getRegistrationById(String flowId);

/**
* Destroy an {@link IntegrationFlow} bean (as well as all its dependant beans)
* Destroy an {@link IntegrationFlow} bean (as well as all its dependent beans)
* for provided {@code flowId} and clean up all the local cache for it.
* @param flowId the bean name to destroy from
*/
Expand Down Expand Up @@ -187,7 +187,7 @@ interface IntegrationFlowRegistrationBuilder {
IntegrationFlowRegistrationBuilder autoStartup(boolean autoStartup);

/**
* Add an object which will be registered as an {@link IntegrationFlow} dependant bean in the
* Add an object which will be registered as an {@link IntegrationFlow} dependent bean in the
* application context. Usually it is some support component, which needs an application context.
* For example dynamically created connection factories or header mappers for AMQP, JMS, TCP etc.
* @param bean an additional arbitrary bean to register into the application context.
Expand All @@ -196,7 +196,7 @@ interface IntegrationFlowRegistrationBuilder {
IntegrationFlowRegistrationBuilder addBean(Object bean);

/**
* Add an object which will be registered as an {@link IntegrationFlow} dependant bean in the
* Add an object which will be registered as an {@link IntegrationFlow} dependent bean in the
* application context. Usually it is some support component, which needs an application context.
* For example dynamically created connection factories or header mappers for AMQP, JMS, TCP etc.
* @param name the name for the bean to register.
Expand Down Expand Up @@ -237,7 +237,7 @@ default IntegrationFlowRegistrationBuilder useFlowIdAsPrefix() {
}

/**
* Register an {@link IntegrationFlow} and all the dependant and support components
* Register an {@link IntegrationFlow} and all the dependent and support components
* in the application context and return an associated {@link IntegrationFlowRegistration}
* control object.
* @return the {@link IntegrationFlowRegistration} instance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public IntegrationFlowRegistration getRegistrationById(String flowId) {
}

/**
* Destroy an {@link IntegrationFlow} bean (as well as all its dependant beans)
* Destroy an {@link IntegrationFlow} bean (as well as all its dependent beans)
* for provided {@code flowId} and clean up all the local cache for it.
* @param flowId the bean name to destroy from
*/
Expand Down Expand Up @@ -308,7 +308,7 @@ public StandardIntegrationFlowRegistrationBuilder autoStartup(boolean autoStartu
}

/**
* Add an object which will be registered as an {@link IntegrationFlow} dependant bean in the
* Add an object which will be registered as an {@link IntegrationFlow} dependent bean in the
* application context. Usually it is some support component, which needs an application context.
* For example dynamically created connection factories or header mappers for AMQP, JMS, TCP etc.
* @param bean an additional arbitrary bean to register into the application context.
Expand All @@ -320,7 +320,7 @@ public StandardIntegrationFlowRegistrationBuilder addBean(Object bean) {
}

/**
* Add an object which will be registered as an {@link IntegrationFlow} dependant bean in the
* Add an object which will be registered as an {@link IntegrationFlow} dependent bean in the
* application context. Usually it is some support component, which needs an application context.
* For example dynamically created connection factories or header mappers for AMQP, JMS, TCP etc.
* @param name the name for the bean to register.
Expand Down Expand Up @@ -352,7 +352,7 @@ public IntegrationFlowRegistrationBuilder useFlowIdAsPrefix() {
}

/**
* Register an {@link IntegrationFlow} and all the dependant and support components
* Register an {@link IntegrationFlow} and all the dependent and support components
* in the application context and return an associated {@link IntegrationFlowRegistration}
* control object.
* @return the {@link IntegrationFlowRegistration} instance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void stop() {
}

/**
* Destroy the {@link IntegrationFlow} bean (as well as all its dependant beans)
* Destroy the {@link IntegrationFlow} bean (as well as all its dependent beans)
* and clean up all the local cache for it.
*/
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public B removeHeader(String headerName) {
this.headerAccessor.removeHeader(headerName);
}
else if (LOGGER.isInfoEnabled()) {
LOGGER.info("The header [" + headerName + "] is ignored for removal because it is is readOnly.");
LOGGER.info("The header [" + headerName + "] is ignored for removal because it is readOnly.");
}
return _this();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void test() throws InterruptedException {

boolean result = this.latch.await(2L, TimeUnit.SECONDS);

assertThat(result).as("A failure means that that MMBF wasn't used").isTrue();
assertThat(result).as("A failure means that MMBF wasn't used").isTrue();
}

@Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static BeanDefinitionBuilder getJpaExecutorBuilder(final Element element,

if (attributeCount > 0) {
parserContext.getReaderContext().error("Exactly only one of the attributes 'entity-manager' or " +
"'entity-manager-factory' or 'jpa-operations' must be be set.", source);
"'entity-manager-factory' or 'jpa-operations' must be set.", source);
}

attributeCount++;
Expand All @@ -91,7 +91,7 @@ public static BeanDefinitionBuilder getJpaExecutorBuilder(final Element element,

if (attributeCount > 0) {
parserContext.getReaderContext().error("Exactly only one of the attributes 'entity-manager' or " +
"'entity-manager-factory' or 'jpa-operations' must be be set.", source);
"'entity-manager-factory' or 'jpa-operations' must be set.", source);
}

attributeCount++;
Expand All @@ -100,7 +100,7 @@ public static BeanDefinitionBuilder getJpaExecutorBuilder(final Element element,

if (attributeCount == 0) {
parserContext.getReaderContext().error("Exactly one of the attributes 'entity-manager' or " +
"'entity-manager-factory' or 'jpa-operations' must be be set.", source);
"'entity-manager-factory' or 'jpa-operations' must be set.", source);
}

final ManagedList<BeanDefinition> jpaParameterList = getJpaParameterBeanDefinitions(element, parserContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void setHeaderMapper(HeaderMapper<StompHeaders> headerMapper) {
}

/**
* Specify the the timeout in milliseconds to wait for the STOMP session establishment.
* Specify the timeout in milliseconds to wait for the STOMP session establishment.
* Must be greater than
* {@link org.springframework.integration.stomp.AbstractStompSessionManager#setRecoveryInterval(int)}.
* @param connectTimeout the timeout to use.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void testHttpUriVariables() {
assertThat(uri.get()).isEqualTo("http://localhost/spring-integration?param=test1%20%26%20test2");
}

@Disabled("Until SF for for URL parser")
@Disabled("Until SF for URL parser")
@Test
public void testInt2720JmsUriVariables() throws JMSException, IOException {
final String destinationName = "SPRING.INTEGRATION.QUEUE";
Expand Down
2 changes: 1 addition & 1 deletion src/reference/antora/modules/ROOT/pages/debezium.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Later can be handy for some common use-cases with opinionated configuration and
Additionally, the `DebeziumMessageProducer` can be tuned with the following configuration properties:

- `contentType` - allows handling for `JSON` (default), `AVRO` and `PROTOBUF` message contents.
The contentType `must` be be aligned with the `SerializationFormat` configured for the provided `DebeziumEngine.Builder`.
The contentType `must` be aligned with the `SerializationFormat` configured for the provided `DebeziumEngine.Builder`.
- `enableBatch` - when set to `false` (default), the debezium adapter would send new `Message` for every `ChangeEvent` data change event received from the source database.
If set to `true` then the adapter sends downstream a single `Message` for each batch of `ChangeEvent` received from the Debezium engine.
Such a payload is not serializable and would require a custom serialization/deserialization implementation.
Expand Down
2 changes: 1 addition & 1 deletion src/reference/antora/modules/ROOT/pages/message.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ The `MessageBuilderFactory` bean with `IntegrationUtils.INTEGRATION_MESSAGE_BUIL
By default, it is an instance of `DefaultMessageBuilderFactory`.
Out of the box, the framework also provides a `MutableMessageBuilderFactory` to create `MutableMessage` instances in the framework components instead.
To customize `Message` instances creation, a `MessageBuilderFactory` bean with `IntegrationUtils.INTEGRATION_MESSAGE_BUILDER_FACTORY_BEAN_NAME` has to be provided in the target application context to override a default one.
For example, a custom `MessageBuilderFactory` could be registered for an implementation of the `BaseMessageBuilder` where we would like to provide a `GenericMessage` extension with overridden `toString()` to to hide sensitive information from payload and headers when such a message is logged.
For example, a custom `MessageBuilderFactory` could be registered for an implementation of the `BaseMessageBuilder` where we would like to provide a `GenericMessage` extension with overridden `toString()` to hide sensitive information from payload and headers when such a message is logged.

Some quick implementation of these classes to demonstrate personal identifiable information mitigation can be like this:
[source,java]
Expand Down
2 changes: 1 addition & 1 deletion src/reference/antora/modules/ROOT/pages/whats-new.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The `JdbcLock` now supports the feature of customized time-to-live for the lock
See xref:jdbc/lock-registry.adoc[] for more information.

The message stores now use a `MESSAGE_CONTENT` column name for serialized messages instead of `MESSAGE_BYTES` since the content might not always be stored as a byte array.
All the out-of-the-box SQL schemas have beed changed, too, to rely on the `MESSAGE_CONTENT` name for the respective column in the `INT_MESSAGE` and `INT_CHANNEL_MESSAGE` tables.
All the out-of-the-box SQL schemas have been changed, too, to rely on the `MESSAGE_CONTENT` name for the respective column in the `INT_MESSAGE` and `INT_CHANNEL_MESSAGE` tables.
See xref:jdbc/message-store.adoc[] for more information.

[[x7.0-redis-changes]]
Expand Down