spring-integration

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

INT-3635: TCP GW: Add remoteTimeoutExpression

JIRA: https://jira.spring.io/browse/INT-3635

Add an expression as an alternative to `remote-timeout`.

INT-3635: Tcp GW Docs

Also removed the relationship between reply-timeout and

remote-timeout (introduced in 2.2 to provide backward compatibility

after the incorrect use of the reply-timeout attribute).

    • -0
    • +15
    /src/reference/docbook/whats-new.xml

INT-3577: Remove flush() from TCP Serializers

JIRA: https://jira.spring.io/browse/INT-3577

It is no longer necessary to `flush()` the `BufferedOutputStream`.

Since INT-3575, the `TcpNetConnection` has flushed the stream.

The `TcpNioConnection` now does so too.

  • Add `id` for the `<section>`s in the `whats-new.xml`
    • -2
    • +11
    /src/reference/docbook/whats-new.xml

INT-3657: Default MaxMessPerPoll=1 for @InboundCA

JIRA: https://jira.spring.io/browse/INT-3657

With XML/DSL, the MMPP defaults to 1 (via the SPCAFB) but

@InboundChannelAdapter defaulted to -1 (infinity).

Change the annotation to be consistent with the XML/DSL.

Add missing schema docs for the `basePollerType`.

  • Fix `AbstractMethodAnnotationPostProcessor` for `maxMessagesPerPollValue` override
  • Change `EnableIntegrationTests#foo()` `@InboundChannelAdapter` to use `maxMessagesPerPoll = "2"`

    and modify appropriate test-case to be sure that `maxMessagesPerPoll` isn't overriden as it has been done in the original commit.

INT-3628: Use SchedulingAwareRunner for Long Tasks

JIRA: https://jira.spring.io/browse/INT-3628

Certain tasks in Spring Integration are long running. Indicate

so for the benefit of platforms such as WebLogic that can log warnings

for long running tasks otherwise.

Also fix conflicting versions of commons-io.

Add JDBC SP JavaConfig Test

Polishing according Java 6 target style

INT-3641: JMX: Lazy Stats

JIRA: https://jira.spring.io/browse/INT-3641

Instead of maintaining a moving average on each event, store the events

for offline analysis.

Retain 5*window samples - this means that the earlies retained sample

contributes just 0.5% to the sum. E.g. with a window of 10, the earliest

sample is 0.9**50 (0.005).

Also, defer the conversion from nanoseconds to milliseconds to the

retrieval side.

Experimentation shows this increases perfomance by approximately 2x.

Sending 1B messages to nullChannel.

With Proxy: 1.2M/sec

Afer proxy removed: 2.4M/sec

With this change: 5.3M/sec

INT-3641: Polishing - PR Comments

JavaDocs polishing

`EnableIntegrationTests`: add more `logger.debug`

INT-3653: JMX: Use System.nanoTime()

JIRA: https://jira.spring.io/browse/INT-3653

Simplify the conversion to System.nanoTime()

Revert Exponential* classes.

INT-3653: Fix Mean Calculations

JIRA: https://jira.spring.io/browse/INT-3653

After moving to nanosecond precision, the mean calculations were incorrect.

Add test cases to verify correctness.

INT-3653: JMX: Add Pluggable Metrics Factory

JIRA: https://jira.spring.io/browse/INT-3653

Also switch to using `System.nanoTime()` for deltas.

INT-3653: Polishing; PR Comments

INT-3653: Polishing

  • Fix `NullChannel` for the generic type
  • Add `Assert.notNull` for metrics setters and for the result of `MetricsFactory`
  • Fix compile and JavaDocs warnings
  1. … 11 more files in changeset.

INT-2230: Fix for Double Global Wire-Taps

JIRA: https://jira.spring.io/browse/INT-2230

Previously two global `<wire-tap>`s with the same `id` registered

two `GlobalChannelInterceptorWrapper` wrappers with generated names

for the same (last) `WireTap`. Hence the same `Message` has been sent to the the `wire-tap channel` twice (or more).

Fix the issue with overriding `GlobalChannelInterceptorParser#resolveId` with the `.globalChannelInterceptor` suffix.

Therefore the last `GlobalChannelInterceptorWrapper` wins overriding all others, if all our `<wire-tap>`s has the same `id`.

INT-2230: Add `id` to the global `channel-interceptor`

Polishing

INT-3648: Fix `AMAPProcessor` and `DefICAParser`

JIRA: https://jira.spring.io/browse/INT-3648

INT-3637: JMX Improvements Msg Sources/Handlers

JIRA: https://jira.spring.io/browse/INT-3637

  • Message Sources
  • Message Handlers

Polishing; Final Review and PR Comments

  • avoid second call to System.currentTimeMillis()
  • fix elapsed time in handler metrics
  • expose TrackableComponent when available

INT-3637: Add @IntergrationManagedResource

Prevents beans (channels, etc), which were previously picked

up via a proxy, from being exported by a standard context

MBeanExporter.

I looked at completely eliminating the MBeanExporterHelper,

which suppresses o.s.integration beans from being exported by

a standard MBeanExporter when there is an IMBE present, but I feel

this is too much of a breaking change. There are a number of

standard beans (such as WireTap) that are @ManagedResources and

these would disappear for users that don't have an IMBE.

That said, such beans previously disappear completely when there

is an IMBE so now they are now annotated with both so that

they are exported by at most one of the exporters.

Polishing; Use MBE.addExludedBean instead of DFA

INT-3639: JMX (AMQP/JMS) Channel Stats

JIRA: https://jira.spring.io/browse/INT-3639

Module channels inherit `ChannelSendMetrics`; add

`PollableChannelManagement` for polled channels.

INT-3638: JMX Initial Stats/Counts Settings

JIRA: https://jira.spring.io/browse/INT-3638

Add the ability to specify the initial settings for

'enableStats' and 'enableCounts' for MBeans that

support those statistics.

Polishing; PR Comments; Add Handler Metrics Test

Also found a problem using an inner MessageSource bean in an

inbound-channel-adapter - a BeanComponentDefinition was returned

instead of a BeanDefinition.

Add @DirtiesContext to JMX Tests

The new MonitorTests failed with InstanceAlreadyExistsException for the

errorChannel.

Add @DirtiesContext to all tests using the Spring test runner to avoid caching any

contexts after the test class completes.

INT-3637: JMX Support Negated Name Match Patterns

Note: with negated matches, order matters.

Polishing for `MonitorTests`

Fix `EnableIntegrationMBeanExport` JavaDocs

  1. … 72 more files in changeset.

INT-3652: Fix NPE: TCP Caching Connection Factory

JIRA: https://jira.spring.io/browse/INT-3652

Conflicts:

spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java

INT-3652: Fix NPE: TCP Caching Connection Factory

JIRA: https://jira.spring.io/browse/INT-3652

INT-3652: Fix NPE: TCP Caching Connection Factory

JIRA: https://jira.spring.io/browse/INT-3652

INT-3646: Add TCP Server Exception Events

JIRA: https://jira.spring.io/browse/INT-3646

Publish `TcpConnectionServerExceptionEvent`s when unexpected

exceptions occur on server sockets.

INT-3646: Polishing

Fix Reactor tests

INT-3646: Add TCP Server Exception Events

JIRA: https://jira.spring.io/browse/INT-3646

Publish `TcpConnectionServerExceptionEvent`s when unexpected

exceptions occur on server sockets.

INT-3646: Polishing

Fix Reactor tests

Conflicts:

spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java

src/reference/docbook/whats-new.xml

INT-3646: Add TCP Server Exception Events

JIRA: https://jira.spring.io/browse/INT-3646

Publish `TcpConnectionServerExceptionEvent`s when unexpected

exceptions occur on server sockets.

INT-3646: Polishing

Fix Reactor tests

Conflicts:

spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java

src/reference/docbook/whats-new.xml

INT-3650: Fix TCP Caching Factory Configuration

JIRA: https://jira.spring.io/browse/INT-3650

Don't propagate `setSingleUse` to the target factory.

  • Polishing for code style
  • Fix `CachingClientConnectionFactory#equals`

INT-3650: Fix TCP Caching Factory Configuration

JIRA: https://jira.spring.io/browse/INT-3650

Don't propagate `setSingleUse` to the target factory.

  • Polishing for code style
  • Fix `CachingClientConnectionFactory#equals`

Conflicts:

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java

INT-3636: JMX Eliminate Channel Metric Proxies

JIRA: https://jira.spring.io/browse/INT-3636

  • Add `enableStats()` managed operation
  • Delegate to a channel metrics object instead of using a proxy

INT-3636: Polishing; PR Comments

Change field name in `MBeanExporterHelper`.

INT-3636: Polishing

  1. … 23 more files in changeset.

INT-3589: Upgrade Dependencies

JIRA: https://jira.spring.io/browse/INT-3589, https://jira.spring.io/browse/INT-3624

  • SF - 4.2. Fix Breaking changes for the `ApplicationEventPublisher`
  • AMQP 1.5. Without issues
  • Reactor - 2.0. Fix for the new `Stream` foundation
  • jsonPath - 1.2.0. Fix for new `Predicate` abstraction. Add 'fail-fast error' to the `IntegrationRegistrar`
  • Sshd - 0.13.0. Fix for new `VirtualFileSystemFactory` usage
  • Spring Data - Fowler
  • And others without issues
  • Get rid of `reactor.util.StringUtils` usage

INT-3589: Address PR comments

Polishing

  1. … 22 more files in changeset.

INT-3629: Upgrade to Gradle `2.3`

JIRA: https://jira.spring.io/browse/INT-3629

Fix Sonar Build

`build.gradle` polishing

    • -2
    • +2
    /gradle/wrapper/gradle-wrapper.properties

Fix Redis Delayer Test

https://build.spring.io/browse/INT-MJATS41-JOB1-238/test/case/155714247

Perhaps a race in Redis; add delay.

Also add a delay between sends so the delays are scheduled in order.

Fix Redis Delayer Test

https://build.spring.io/browse/INT-MJATS41-JOB1-238/test/case/155714247

Perhaps a race in Redis; add delay.

Also add a delay between sends so the delays are scheduled in order.

Fix Redis Delayer Test

https://build.spring.io/browse/INT-MJATS41-JOB1-238/test/case/155714247

Perhaps a race in Redis; add delay.

Also add a delay between sends so the delays are scheduled in order.

INT-3623: Fix Mail Test File Name

JIRA: https://jira.spring.io/browse/INT-3623

Tests don't run with case-sensitive file system.

INT-3623: Fix Mail Test File Name

JIRA: https://jira.spring.io/browse/INT-3623

Tests don't run with case-sensitive file system.

INT-3513: MutableMessage: Removes the use of DFA

JIRA: https://jira.spring.io/browse/INT-3513

Removing the `rawHeader` access by the `DFA` improves performance.

Tests are added to verify that `MutableMessageBuilderFactory` does

what it purports to, and that the `MutableMessageHeaders` is now

applied, permitting updates to individual headers.

change `@since` to correct/probable release version

INT-3513: Polishing