Commit Graph

9887 Commits

Author SHA1 Message Date
Artem Bilan
911cdc86b5 Refinement for gateway Mono processing (#3075)
* Refinement for gateway Mono processing

* Introduce a `MessagingGatewaySupport.MonoReplyChannel` instead of
`FutureReplyChannel` for better on demand handling and reusing a
`Mono` returned from the target handler
* Refactor `GatewayProxyFactoryBean` to identify a target return type
(including generics for `Function`) during initialization
* Handle a `Mono` return type via
`MessagingGatewaySupport.sendAndReceiveMessageReactive()`
* Some `@Nullable` in the `GatewayProxyFactoryBean` and `ExpressionUtils`
* Add `MonoFunction` test-case into the `FunctionsTests.kt`

* * Deprecate `GatewayProxyFactoryBean.setServiceInterface()` in favor of
ctor initialization
* Fix `GatewayProxyFactoryBean.setServiceInterface()` usage in tests
2019-10-14 15:31:04 -04:00
Gary Russell
7733da651f GH-3072: Allow JDBC inbound query changes
Resolves https://github.com/spring-projects/spring-integration/issues/3072

* Assert for selectQuery setter
2019-10-04 15:39:22 -04:00
Artem Bilan
2a8615539f Deprecate IntFlows.from(service, methodName)
The method reference together with a `IntegrationFlows.frm(Supplier<?>)`
do the trick to avoid a method name resolution and also gives us a code
navigation in the IDE
2019-10-02 10:58:03 -04:00
Spring Buildmaster
07b44aec18 [artifactory-release] Next development version 2019-10-01 17:15:56 +00:00
Spring Buildmaster
c9d68c5c55 [artifactory-release] Release version 5.2.0.RELEASE 2019-10-01 17:15:52 +00:00
Artem Bilan
d3d82db374 Upgrade to Spring AMQP 2.2 GA; prepare for release 2019-10-01 12:53:57 -04:00
Artem Bilan
9720c82f15 Fix Checkstyle for JPA test; typos
* Rework `try..catch` structures in the JPA test into an
`assertThatIllegalArgumentException()` and
`assertThatIllegalStateException()`
2019-10-01 11:08:34 -04:00
Artem Bilan
8a4864e03f GH-3061: Add @DirtiesContext to JPA tests
Fixes https://github.com/spring-projects/spring-integration/issues/3061

Without a `@DirtiesContext` we keep not only a ctx in the cache, but
also an embedded DB instance, which is shared between contexts.
When ctx cache clean up happens, several ctxes would like to destroy
their associated embedded DB which, essentially, is the same in-memory
instance

* The `@DirtiesContext` give us a chance to destroy embedded DB for
the particular ctx in isolation
2019-10-01 10:49:17 -04:00
Gary Russell
0926186f60 Upgrade Micrometer, Spring Security versions 2019-10-01 09:14:42 -04:00
Artem Bilan
37cc201aee Upgrade dependencies; fix deprecations 2019-09-30 21:48:50 -04:00
Artem Bilan
229676b12c Fix links in reactive-streams.adoc doc
Mention this new docs in the `whats-new.adoc`
2019-09-30 16:38:38 -04:00
Artem Bilan
007e1a0924 Improve in generics for some Publisher API 2019-09-30 15:17:36 -04:00
Artem Bilan
ad96ca49f1 Add Reactive Stream chapter into docs
* Improve `channel.adoc`: polishing, new channels, java config
* Make `LoadBalancingStrategy` in the `DirectChannel` ctor as
`@Nullable` to reflect the real logic behind

* More Dos and polishing according PR comments
* Mention WebFlux and RSocket endpoints in the `endpoint-summary.adoc`
table

* More reactive streams docs
* `SourcePollingChannelAdapter` polishing
* Wrap multi-value publisher into `Mono.just()` in the `AbstractMessageProducingHandler`
instead of emitting just only a first item for the standard reply

Doc polishing
2019-09-30 14:36:33 -04:00
Artem Bilan
eeb951b0da Fix new Sonar Smells
* Change `whats-new.adoc#x5.2-behavior` to point for the whole
`5.1-to-5.2-Migration-Guide`
2019-09-29 10:28:09 -04:00
Gary Russell
9994997917 GH-3067: Use default NullChannel instance if poss.
Resolves https://github.com/spring-projects/spring-integration/issues/3067

Also add missing receive counter.

* Late binding of null discard channel; checkstyle

* Fix test; fall back to new NullChannel(); always evaluate tx expressions
2019-09-27 17:14:51 -04:00
Gary Russell
0c7cae15da Upgrade to Jackson 2.10
* Remove extraneous code

* Realign white listing with similar implementation in Spring Security: c0b48338f4

* 2.10 GA
2019-09-27 12:25:41 -04:00
Gary Russell
f3850b7520 RSocket Doc Polishing 2019-09-27 11:31:06 -04:00
Artem Bilan
c4aceb6bb5 Hide toReactivePublisher() from lambdas (#3065)
* Hide `toReactivePublisher()` from lambdas

When an `IntegrationFlow` is declared via lambda, it is impossible
to materialize it as a `Publisher` since we lose a Lambda context and
finish with a `NoSuchBeanException` when we would like to inject that
`Publisher`

* Make `IntegrationFlowDefinition.toReactivePublisher()` as `protected`
and expose it on the `IntegrationFlowBuilder` level
* Use `Channels` as a singleton: no reason in overhead for its instances
* Some code style polishing for `IntegrationFlowDefinition`

* Restore `Channels.super()` call
2019-09-26 15:08:58 -04:00
Gary Russell
582574c413 Upgrade Reactor Version 2019-09-26 10:53:05 -04:00
Artem Bilan
3ca291c7c4 Fix new Sonar smell 2019-09-25 08:26:52 -04:00
Gary Russell
12e5a306f8 GH-3062: Polishing
- avoid log noise when test server stopped
2019-09-24 18:11:30 -04:00
Gary Russell
8ad802cdfe GH-3062: Fix Mail Tests Hang
Resolves https://github.com/spring-projects/spring-integration/issues/3062

Reliably stop the test mail servers before the test context is destroyed.
2019-09-24 16:55:32 -04:00
Artem Bilan
b12657c599 Document RSocket support
* Fix some typos in `webflux.adoc` and `dsl.adoc`
* Make `FunctionsTests.kt` more Kotlin friendly
* Improve RSocket components and tests for them,
especially rely on the default `RSocketStrategies` in the
target SF RSocket components
* Rework `ServerRSocketConnector.setClientRSocketKeyStrategy` to use the whole `MessageHeaders` for consultation.
It turns out that just destination is not enough since it can be used from different clients
* Make the key based on the provided `setupData` by default
* Include all the `MessageHeaders` into the `RSocketConnectedEvent`

* Improve Docs according review feedback and Docs in SF

Doc polishing
2019-09-24 14:55:04 -04:00
Artem Bilan
21335812a3 Remove IntegrationNode.Stats.deprecated const 2019-09-22 09:34:48 -04:00
Gary Russell
a550ebfaad Fix test after previous commit
- the deprecated field is now last instead of first
2019-09-21 11:34:47 -04:00
Gary Russell
7d949f7f8a Fix Sonar issues 2019-09-21 09:40:25 -04:00
Gary Russell
58c0b9885b Add failure counter to AbstractMessageSource
* Clear timers in AMH.destroy()
2019-09-20 10:53:18 -04:00
Artem Bilan
aa29bb15e3 Guard Micrometer stats for NPE: no Micrometer
If there is no Micrometer in classpath, the `timers` and `counters`
are not populated into Graph

* Check for `null` before calling `Supplier`
2019-09-20 09:45:04 -04:00
Artem Bilan
c4ec73f9a0 Fix Checkstyle violation 2019-09-20 09:30:22 -04:00
Gary Russell
87840bcfe4 GH-3056: Add Micrometer Metrics to Runtime Graph
Resolves https://github.com/spring-projects/spring-integration/issues/3056

* Retrieve meters each time the graph is rendered, not just when it is built.
2019-09-20 09:15:55 -04:00
Artem Bilan
528203e606 Upgrade dependencies
* Use a `dependencyManagement` for those projects which bring BOMs
* Fix `RSocketOutboundGateway` for the latest SF
2019-09-18 17:31:27 -04:00
Artem Bilan
50c6f3a30c GH-3054: Resolve deprecation for WebFlux module
Fixes https://github.com/spring-projects/spring-integration/issues/3054
2019-09-13 18:36:10 -04:00
Gary Russell
3e30625ac9 Fix FtpServerOutboundTests.allEvents test
Spurious events captured from other tests.
Only capture events for the test's session.
2019-09-13 16:59:06 -04:00
Gary Russell
185d370415 Back to Spring Snapshots and other upgrades 2019-09-13 16:42:02 -04:00
Artem Bilan
9272782a48 GH-3052: Fix custom converters for lambdas
Fixes https://github.com/spring-projects/spring-integration/issues/3052

Starting with version `5.1`, a `LambdaMessageProcessor` is based on the
`MessageConverter` instead of plain `ConversionService`.
(A `ConfigurableCompositeMessageConverter` is used from the application
context.)
However a type conversion based on the `@IntegrationConverter` is lost
in the `GenericMessageConverter`  because it doesn't use an
`integrationConversionService` from the application context

* Change `ConfigurableCompositeMessageConverter` to configure a
 `GenericMessageConverter`  with an  `integrationConversionService`
 if any
* Fix `MessagingMethodInvokerHelper` to populate a `BeanFactory` into
its internal `ConfigurableCompositeMessageConverter`
* Ensure in the `LambdaMessageProcessorTests` that
`@IntegrationConverter` is applied for ``LambdaMessageProcessor` as well

**Cherry-pick to 5.1.x**
2019-09-13 18:37:33 +01:00
Artem Bilan
1e93d51697 (S)FTP tests: Add missed @DirtiesContext
Related to: https://build.spring.io/browse/INT-MASTERSPRING40-826/

If we don't close application context on the embedded (S)FTP server,
we my still have some session opened in other tests, which would cause
some unexpected behavior like extra `SessionClosedEvent` in the
test for FTP events
2019-09-11 13:36:56 -04:00
Artem Bilan
87f5409677 Fix more Sonar smells for GatewayProxyFactoryBean 2019-09-09 08:54:20 -04:00
Artem Bilan
6da8112f6e Polishing What's New
* Move FTP `chmod` support into the (S)FTP changes: it is not a new
component
2019-09-08 12:49:07 -04:00
Artem Bilan
f68cf28de7 Fix new Sonar smells for GatewayProxyFactoryBean 2019-09-07 10:58:21 -04:00
Spring Buildmaster
a041546e67 [artifactory-release] Next development version 2019-09-06 18:28:24 +00:00
Spring Buildmaster
9e82481f34 [artifactory-release] Release version 5.2.0.RC1 2019-09-06 18:28:18 +00:00
Artem Bilan
29bebdba97 GH-3047: Add GatewayProxySpec for Java DSL
Fixes https://github.com/spring-projects/spring-integration/issues/3047

* Improve `GatewayProxyFactoryBean` to determine the return type of the
method call from the interface generic types, when the `serviceInterface`
is a `java.util.function.Function`
* Propagate `MethodArgsHolder` as a `rootObject` for SpEL evaluations
* Deprecate `#gatewayMethod` and `#args` evaluation context variables
in favor of `MethodArgsHolder` as root object.
They will be removed in the future release and a single
`EvaluationContext` will be used for all the gateway expressions
* Introduce an
`IntegrationFlows.from(Class<?> serviceInterface, Consumer<GatewayProxySpec> endpointConfigurer)`
to allow to configure any valid gateway proxy options similar to what
we have with the `<gateway>` and `@MessagingGateway`.
This way we are very close to consistency between different approaches

* * Remove `default` prefix from `GatewayProxySpec` options
* Document the change
2019-09-06 13:46:16 -04:00
Artem Bilan
c668a046e1 Upgrade dependencies to the stable Milestones
* Prepare for release
2019-09-06 09:49:55 -04:00
Artem Bilan
b9478ace95 Upgrade dependencies; fix some typos in docs 2019-09-05 15:30:57 -04:00
Artem Bilan
9a43726ca7 Fix new Sonar smell 2019-09-05 10:22:32 -04:00
Artem Bilan
e2d891a32d Fix new Sonar smells 2019-09-04 11:40:23 -04:00
Artem Bilan
a95c76e4d7 RSocket requests: Add per message metadata support
* Use convenient `Consumer` API to avoid external iteration for
`setupMetadata` in the `ClientRSocketConnector`
* Add `routeVars` and `metadata` support into the `RSocketOutboundGateway`
* Cover new options in the XML and Java DSL configurations
2019-09-03 15:56:39 -04:00
Artem Bilan
444c1f9913 RSocket: Add support for RoutingMetadata
Related to https://github.com/spring-projects/spring-framework/issues/23137

The metadata in Spring Messaging for RSockets now supports any
arbitrary objects for setup payload, including composition.

* Switch the `ClientRSocketConnector` to fully delegate to the
`RSocketRequester.Builder` inheriting possible metadata encoding/decoding
in the target `RSocketRequester` implementation
* Turn off a default `dataMimeType` from the `MimeTypeUtils.TEXT_PLAIN`
to the `null` by default relying on the encoder/decoder logic in the
target RSocket wrappers
* Expose more delegating options in the `ClientRSocketConnector`, like
`setupRouteVars`,  `setupMetadata`
2019-09-03 14:22:36 -04:00
Artem Bilan
fd7e7dbaf3 Fix Sonar smells in JpaExecutor 2019-08-31 18:18:20 -04:00
Artem Bilan
3dc0fb5980 GH-3041: Deprecate RedisUtils.isUnlinkAvailable()
Fixes https://github.com/spring-projects/spring-integration/issues/3041

Some Redis clients/servers don't allow to perform an `INFO` command,
therefore we are not able to determine if we can perform `UNLINK` or
not.

* Deprecate `RedisUtils.isUnlinkAvailable()` as not reliable source of
through; use trial with fallback algorithm in the target logic around
`UNLINK` command calls.

**Cherry-pick to 5.1.x**
2019-08-30 13:02:59 -04:00