Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,375 Commits 25 Branches 0 Tags
dfd914254b355b29157623a0e0ae51d04bcffc2a
Commit Graph

10375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fnu, rohan
dfd914254b INT-4566: R2DBC Outbound Channel Adapter 
JIRA: https://jira.spring.io/browse/INT-4566

* Fixed review comments
* added `DELETE` and `Criteria` implementation for outbound channel adapter
* Clean up code style
* Add initial docs
 2020-06-25 12:45:24 -04:00
Gary Russell
b860a2e818 Merge Spring Integration Kafka into Main Repo 
- merge master branch from old repo (`git-filter-repo`) for src branch
- update build.gradle
- copy docs from Spring for Apache Kafka Chapter

Doc polishing.

Fix http: references in tests.

* Add `What's New` note and fix `polling-consumer.adoc`
not linking to external project any more
 2020-06-25 11:46:38 -04:00
Gary Russell
3ec74f380f KMSource - fix RebalanceListener (incremental) 
Support cooperative rebalancing
 - incremental assignment/revocation
 - re-pause if a rebalance occurs while paused

**cheerry-pick to 3.2.x**
 2020-06-25 11:29:09 -04:00
Artem Bilan
a28647259c Upgrade dependencies; prepare for release 2020-06-25 11:29:09 -04:00
Gary Russell
8771f8e18c Fix tests for latest SK snapshot 2020-06-25 11:29:08 -04:00
Artem Bilan
04019dbb96 Fix checkstyle.xml for Windows new line 2020-06-25 11:29:08 -04:00
Artem Bilan
bfef5a49cf Fix Kotlin tests according upstream changes 
* Upgrade dependencies
 2020-06-25 11:29:08 -04:00
Gary Russell
213772dcaf Fix S-K Deprecations 2020-06-25 11:29:08 -04:00
Gary Russell
1e484d0fad Support flush after send 
* Add `flushExpression`.

* Add DSL, XML configuration.
 2020-06-25 11:29:08 -04:00
Artem Bilan
e0be544a40 Add more XSD version into spring.schemas 
* Fix some deprecation in `build.gradle`
 2020-06-25 11:29:07 -04:00
Gary Russell
a58169f4e1 Fix Gradle Deprecations 
* Rename schema

* Upgrade to Gradle 6.3-rc-3 for transitive dependency fix.

* Remove version from schema; polish `build.gradle` to remove unneeded features.
 2020-06-25 11:29:07 -04:00
Gary Russell
81b9ae4a7a Use core Kotlin DSL 2020-06-25 11:29:07 -04:00
Gary Russell
0b7ea6d3c2 Remove deprecated methods 2020-06-25 11:29:07 -04:00
Gary Russell
bdd236052b Upgrade to SK 2.5.0 
- add deliveryAttempt header when retry is not configured
- temporary work around for gradle bug, jar with test classifier missing from CP
 2020-06-25 11:29:07 -04:00
Gary Russell
aaaaf86c07 GH-296: DSL: Support inline pub/sub subscriptions 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/296

* * Add generic type to specsto avoid cast to `BroadcastCapableChannel`.

* * Remove unneeded fields in the abstract spec

* Restore log4j config
 2020-06-25 11:29:06 -04:00
Gary Russell
2331eee642 GH-296: Add Kafka-backed MessageChannels 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/296

* * Add DSL support

* * Polishing and XML support
 2020-06-25 11:29:06 -04:00
Gary Russell
905a5155bc Master to 3.3; support non-Tx if template allows 
* SI to 5.3.0.B-S
 2020-06-25 11:29:06 -04:00
Artem Bilan
f596e49242 Upgrade to latest releases 
* Upgrade to Gradle 6.1.1
* Fix for latest Checkstyle
* Fix for latest SI-Kotlin-DSL
 2020-06-25 11:29:06 -04:00
Artem Bilan
27f0775fb8 Apply SI-Kotlin-DSL in tests (#292) 
* Apply SI-Kotlin-DSL in tests

* Upgrade dependencies

* Upgrade to latest releases
 2020-06-25 11:29:05 -04:00
Gary Russell
386c64c617 Support ProducerRecord outbound payloads 2020-06-25 11:29:05 -04:00
Gary Russell
cf3aa29a23 GH-290: Add ProducerRecordCreator 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/290
 2020-06-25 11:29:05 -04:00
Gary Russell
6cddb2c169 Revert "Apply SI-Kotlin-DSL in tests" 
This reverts commit b03ddcb953c18469564994921efb84a072a0e358.
 2020-06-25 11:29:05 -04:00
Artem Bilan
9b0b87d37e Apply SI-Kotlin-DSL in tests 2020-06-25 11:29:05 -04:00
Artem Bilan
bf0134cb52 Upgrade to latest GAs 
* Move all the test to JUnit 5; remove redundant JUnit 4 dependencies
 2020-06-25 11:29:04 -04:00
tomvandenberge
0e74cd1cee Add XML attribute for header-mapper 
* Added support for header-mapper to outbound-channel-adapter and
outbound-gateway XML

* Follow up on review

* Corrected mistake

* Corrected indentation
 2020-06-25 11:29:04 -04:00
Gary Russell
8cc2b2cc00 KMessageSource getter for consumer properties 
- allow customization after creation - e.g. SCSt `MessageSourceCustomizer`
- also fix deprecation in `ReplyingKafkaTemplate`
 2020-06-25 11:29:04 -04:00
Gary Russell
adf91edf05 KMSource: Consumer Property Overrides 
- support property overrides in the message source
 2020-06-25 11:29:04 -04:00
Artem Bilan
f6d858c7aa Polishing JavaDocs and possible NPEs 
https://build.spring.io/browse/INTEXT-KAFKA-310/
 2020-06-25 11:29:04 -04:00
Gary Russell
3831919cbc GH-282: KMSource - support async commits etc 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/282

Use sync-related properties from `ConsumerProperties`.
 2020-06-25 11:29:03 -04:00
Anshul Mehra
c20ef85168 GH-280: Add topicPattern support to KafkaMessageSource 
Fixes https://github.com/spring-projects/spring-integration-kafka/issues/280

* Refactored to topics/topicPattern to be a property to
prevent constructor telescoping

* Add support for manual partition assignment

- Cleanup after rebasing from #283
- Add additional tests

* Fix checkstyle

* Remove redundant factory methods

* Add better test for static assignment

* Use ConsumerProperties 

Fix typo where ContainerProperties was used 
instead of ConsumerProperties

* Simplify construction

* Remove unused import

* Use ObjectUtils

* Use component name for clientId

* Collapse static assignment for loop

* Fix lint warning
 2020-06-25 11:29:03 -04:00
Anshul Mehra
e52c535f7c Use ConsumerProperties in KafkaMessageSource 
* Preserve existing constructors

* Add @deprecated in java docs
 2020-06-25 11:29:03 -04:00
Gary Russell
e6cdb8818f GH-279: Fix tests for latest SK Snapshots 
- add tests for tx.id overrides
 2020-06-25 11:29:03 -04:00
Urs Keller
4cd81fda78 Fix NPE for retryTemp!=null but recoveryCall==null 
Starting with version `3.0.x`, the `KafkaInboundGateway` and
`KafkaMessageDrivenChannelAdapter` rely on the
`RetryContext.getRetryCount()` for the
`IntegrationMessageHeaderAccessor.DELIVERY_ATTEMPT` message header, but
the `RetryContext` is obtained from the `TheadLocal` `attributesHolder`,
which is populated from the `RetryListener.open()` only if
`recoveryCallback != null`

* Fix `KafkaInboundGateway` and `KafkaMessageDrivenChannelAdapter` to
populate `TheadLocal` `attributesHolder` with the `RetryContext`
from the `RetryListener.open()` when only `retryTemplate != null`

**Cherry-pick to `master` & 3.0.x**

# Conflicts:
#	src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java
 2020-06-25 11:29:02 -04:00
Artem Bilan
d96a2d930c Add HTTPS entries for XSD into spring.schemas 
Related to spring-projects/spring-integration#2987

**Cherry-pick to 3.1.x, 3.0.x & 2.3.x**
 2020-06-25 11:29:02 -04:00
Gary Russell
41de7495e6 Resolve deprecations and other compiler warnings 2020-06-25 11:29:02 -04:00
Cameron Mayfield
600e88ec56 GH-272: Add KafkaMDrivenChAdapterSpec.payloadType 
Fixes https://github.com/spring-projects/spring-integration-kafka/issues/272

Add `payloadType` option into `KafkaMessageDrivenChannelAdapterSpec`
 2020-06-25 11:29:02 -04:00
Gary Russell
a1b51c9f47 Fix tests for SK 2.3.0.M3 2020-06-25 11:29:02 -04:00
Gary Russell
bc443474cb Pausable package change 2020-06-25 11:29:01 -04:00
Gary Russell
14302088c5 SIGH-2958: Add source record to common SI Header 
Resolves https://github.com/spring-projects/spring-integration/issues/2958

Enables applications to be agnostic regarding the source of
a message. e.g Kafka Vs. AMQP.
 2020-06-25 11:29:01 -04:00
Gary Russell
c25b3b45f4 Allow fetching multiple records 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/267

- add an option to allow fetching multiple records per poll

* DSL for new constructor arg
 2020-06-25 11:29:01 -04:00
Anshul Mehra
cd6d17e4b0 GH-265: Ensure assignTimeout is used when no partitions are assigned 
* Refactored to rely on assignedPartitions for determining whether to
use pollTimeout or assignTimeout
* Removed redundant assigned flag

fixes #265
 2020-06-25 11:29:01 -04:00
Gary Russell
28fc819fe9 Change MessageSource.payloadType to Class<?> 
- consistency with other endpoints
- avoid the need for SpEL in XML config
 2020-06-25 11:29:01 -04:00
Gary Russell
22b1e70e13 GH-195: Add XML Schema support for new components 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/195

- gateways
- message source

Polishing

Don't start adapters in parser tests

Fix XML filename for test
 2020-06-25 11:29:00 -04:00
Gary Russell
f59a3687a9 Fix race in KafkaProducerMessageHandlerTests. 2020-06-25 11:29:00 -04:00
Gary Russell
e9833af732 Fix javadoFix javadoc 2020-06-25 11:29:00 -04:00
Gary Russell
e76fd2bea2 Remove Lifecyle since it's the super of Pausable 2020-06-25 11:29:00 -04:00
Gary Russell
ca125a8a6f Polishing - PR comments. 2020-06-25 11:29:00 -04:00
Gary Russell
087247d96f GH-259: Add pause/resume to KafkaMessageSource 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/259

Enable pause/resume on the polled consumer.

**cherry-pick to 3.1.x**
 2020-06-25 11:28:59 -04:00
Gary Russell
ceb68b40ef GH-260: Fix outbound tx synchronization 
Resolves https://github.com/spring-projects/spring-integration-kafka/issues/260

The outbound endpoint used
`TransactionSynchronizationManager.isActualTransactionActive()`
to detect a global transaction instead of
`TransactionSynchronizationManager.getResource(this.kafkaTemplate.getProducerFactory()) == null`.

The KTM uses `SYNCHRONIZATION_NEVER` by default so the first will
return false unless the synchronization is explicitly set. This
causes a new transaction to be started.

Use the presence of the resource holder instead.

**cherry-pick to 3.1.x**
 2020-06-25 11:28:59 -04:00
Artem Bilan
cc3895f40d Fix XSD for the current version 2020-06-25 11:28:59 -04:00