Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,804 Commits 25 Branches 0 Tags
3d66ea00d9d1dd18bee3c861feab64aa277bbcc0
Commit Graph

11804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Van keer
3d66ea00d9 GH-9230 fix error in code snippet 
Fixes: #9230

Some code was present in the code snippet that shouldn't be there.


**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-12 10:48:41 -04:00
Artem Bilan
5da6d7bfc7 Fix HTTP module for latest Spring Framework 2024-06-12 10:47:36 -04:00
dependabot[bot]
afb87d45e8 Bump protobufVersion from 4.27.0 to 4.27.1 
Bumps `protobufVersion` from 4.27.0 to 4.27.1.

Updates `com.google.protobuf:protobuf-java` from 4.27.0 to 4.27.1
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)

Updates `com.google.protobuf:protobuf-java-util` from 4.27.0 to 4.27.1

Updates `com.google.protobuf:protoc` from 4.27.0 to 4.27.1
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.protobuf:protobuf-java-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.protobuf:protoc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-10 11:16:21 -04:00
Alessio Matricardi
80c8a61f33 GH-9197: Optional ZeroMQ topic wrapping 
Fixes: #9197

* Update `ZeroMqMessageHandler` for `wrapTopic` option
* Add author, fix code style, add same logic also for `ZeroMqMessageProducer`
* Add `wrapTopic` function also in DSL specs
* Fix wrap topic test: duplicate socket address caused binding exception
* Rewrite the `MessageProducer.wrapTopic()` test
* Call `stop()` instead of `destroy()` method

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-10 10:56:07 -04:00
Artem Bilan
b29ff9a710 GH-9191: Support byte[] for headers in the MessageReceiverContext 
Fixes: #9191

Not all inbound protocol handlers convert header from native representation.
Sometimes they just come in as `byte[]`.

* Fix `MessageReceiverContext` to support `byte[]` for headers used in the observation,
e.g. `B3-*`, `traceparent` etc.

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-07 09:59:49 -04:00
Artem Bilan
3dcbdef330 GH-9214: Fix subscription identifier logic in Mqttv5PahoMessageDrivenChannelAdapter 
Fixes: #9214

The `MqttAsyncClient` can set `subscriptionIdentifier` from session if it is enabled
and available from connection

* Remove manual `subscriptionIdentifierCounter` from the `Mqttv5PahoMessageDrivenChannelAdapter`.
Instead, use `subscriptionProperties.setSubscriptionIdentifiers(List.of(0));`
to make the `this.mqttSession.getNextSubscriptionIdentifier();` to work
when `if (connOpts.useSubscriptionIdentifiers() && this.mqttConnection.isSubscriptionIdentifiersAvailable()) {` is `true`

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-06 11:54:26 -04:00
Artem Bilan
e9561b41f1 GH-9215: Honor back-pressure in FluxMessageChannel 
Fixes: #9215

* Instead of `share()` use `publish(1).refCount()` to prefetch only item from upstream.
* Also remove `publishOn(this.scheduler)` for upstream publishers in favor of opt-in on the consumer side.

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-06 11:38:45 -04:00
Artem Bilan
91de12c786 GH-9211: Fix SmbSession.get() 
Fixes: #9211

The `AbstractRemoteFileOutboundGateway.get()` uses `Session.list()` for the provided remote file name.
The `SmbSession` does not support listing for a single file.

* Add logic into `SmbSession.list()` similar to `SftpSession.list()` to list a single remote file
on the provided path

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-05 11:03:32 -04:00
Artem Bilan
27b194f537 Remove unused import from JdbcChannelMessageStore 2024-06-04 17:36:11 -04:00
Artem Bilan
d76174edb1 GH-9192: Deprecate LobHandler usage 
Fixes: #9192

With modern drivers we don't need BLOB-specific handling anymore.
The regular `PreparedStatement.setBytes()` and `ResultSet.getBytes()`
are enough for our serialized messages
 2024-06-04 17:28:17 -04:00
Karol Kosiacki
753916ca24 GH-8898: Add AbstractRemoteFileStreamingMessageSource.clearFetchedCache 
Fixes: #8898

In some cases not all retched remote files are processed, and after changing the `SessionFactory` (e.g. `RotatingServerAdvice`)
thy might not be processed on the next polling cycle
 2024-06-04 16:35:22 -04:00
Artem Bilan
66ca557a54 Remove extra empty line in the IntegrationObservabilityZipkinTests 
**Auto-cherry-pick to `6.3.x`**
 2024-06-03 15:25:29 -04:00
Artem Bilan
b0cbacfafb GH-9198: Fix MessageChannel observation for ErrorMessage 
Fixes: #9198

When observation is enabled on the `MessageChannel`, the message to send is converted to a `MutableMessage`.
In case of `ErrorMessage` this causes a loss of `originalMessage` and may lead to `ClassCastException`
in the target error handler.

* Check for `ErrorMessage` in the `AbstractMessageChannel.sendWithObservation()` and create a new one
as a copy of original request, but including observation headers before performing `sendInternal()`
* Modify `IntegrationObservabilityZipkinTests` to verify an observation with an `ErrorMessage` and its handler.

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-03 14:49:33 -04:00
dependabot[bot]
1358718268 Bump org.hsqldb:hsqldb in the development-dependencies group 
Bumps the development-dependencies group with 1 update: org.hsqldb:hsqldb.


Updates `org.hsqldb:hsqldb` from 2.7.2 to 2.7.3

---
updated-dependencies:
- dependency-name: org.hsqldb:hsqldb
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-03 12:10:14 -04:00
dependabot[bot]
ec06315369 Bump debeziumVersion from 2.6.1.Final to 2.6.2.Final 
Bumps `debeziumVersion` from 2.6.1.Final to 2.6.2.Final.

Updates `io.debezium:debezium-embedded` from 2.6.1.Final to 2.6.2.Final

Updates `io.debezium:debezium-connector-mysql` from 2.6.1.Final to 2.6.2.Final

---
updated-dependencies:
- dependency-name: io.debezium:debezium-embedded
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.debezium:debezium-connector-mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-03 11:42:55 -04:00
Artem Bilan
2983147588 Upgrade to com.icegreen:greenmail:2.1.0-rc-1 
Fixes: #9200

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
 2024-06-03 11:34:05 -04:00
Artem Bilan
221951e3bd Use debeziumVersion = '2.6.1.Final' 2024-05-29 07:51:05 -04:00
Artem Bilan
8b2da4f996 Start version 6.4 
* Move `whats-new` to `changes-6.2-6.3.adoc`
* Upgrade dependency to the latest (including Gradle)
* Move Spring dependencies to based on SF-6.2
* Fix some deprecations and incompatibility
 2024-05-28 20:07:35 -04:00
Spring Builds
dc96ff6a2d [artifactory-release] Next development version 2024-05-21 19:45:14 +00:00
Spring Builds
b6561b200d [artifactory-release] Release version 6.3.0 2024-05-21 19:45:11 +00:00
Artem Bilan
541fbb29eb Use proper GA versions for Spring dependencies 2024-05-21 13:45:49 -04:00
dependabot[bot]
e729a2126b --- (#9183) 
updated-dependencies:
- dependency-name: org.springframework.kafka:spring-kafka-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-21 17:37:56 +00:00
dependabot[bot]
038d18db18 --- (#9184) 
updated-dependencies:
- dependency-name: org.springframework.amqp:spring-amqp-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-21 17:34:40 +00:00
dependabot[bot]
4593456469 --- (#9182) 
updated-dependencies:
- dependency-name: org.springframework.graphql:spring-graphql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-21 17:34:00 +00:00
dependabot[bot]
4b4dc49e42 --- (#9181) 
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-21 17:32:57 +00:00
Artem Bilan
937da13bcf GH-9112: Workaround for Paho stopReconnectCycle 
Fixes: #9112

`Mqttv5ClientManager` hangs in `stop()` if never was connected.
The scheduled reconnect timer in the client is never cancelled.

* Call `stopReconnectCycle()` on the client via reflection when we disconnect
from the client in Spring Integration MQTT components

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-21 13:14:56 -04:00
Johannes Edmeier
da29e2da6a PostgresChannelMessageTableSubscriber: Renew connection only if invalid 
Fixes: #9111

An evolution of the #9061: renew the connection only when we need to.

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-21 10:20:29 -04:00
Artem Bilan
899598a342 Fix Micrometer deps for GA versions 2024-05-20 11:17:37 -04:00
dependabot[bot]
492a3950ae Bump org.springframework.retry:spring-retry from 2.0.5 to 2.0.6 (#9153) 
Bumps [org.springframework.retry:spring-retry](https://github.com/spring-projects/spring-retry) from 2.0.5 to 2.0.6.
- [Release notes](https://github.com/spring-projects/spring-retry/releases)
- [Commits](https://github.com/spring-projects/spring-retry/compare/v2.0.5...v2.0.6)

---
updated-dependencies:
- dependency-name: org.springframework.retry:spring-retry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 12:56:46 +00:00
dependabot[bot]
6d4cb63a6e Bump the development-dependencies group across 1 directory with 2 updates (#9150) 
Bumps the development-dependencies group with 2 updates in the / directory: [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) and org.apache.tomcat.embed:tomcat-embed-websocket.


Updates `org.testcontainers:testcontainers-bom` from 1.19.7 to 1.19.8
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.7...1.19.8)

Updates `org.apache.tomcat.embed:tomcat-embed-websocket` from 10.1.23 to 10.1.24

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: org.apache.tomcat.embed:tomcat-embed-websocket
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 12:53:25 +00:00
dependabot[bot]
14c220ccba Bump com.gradle.develocity from 3.17.3 to 3.17.4 (#9155) 
Bumps com.gradle.develocity from 3.17.3 to 3.17.4.

---
updated-dependencies:
- dependency-name: com.gradle.develocity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 01:12:58 +00:00
dependabot[bot]
ac1a78c62d Bump org.springframework:spring-framework-bom from 6.1.6 to 6.1.7 (#9152) 
Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.6 to 6.1.7.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.6...v6.1.7)

---
updated-dependencies:
- dependency-name: org.springframework:spring-framework-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:22:21 +00:00
dependabot[bot]
c2ffd92b6e Bump io.projectreactor:reactor-bom from 2023.0.5 to 2023.0.6 (#9148) 
Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2023.0.5 to 2023.0.6.
- [Release notes](https://github.com/reactor/reactor/releases)
- [Commits](https://github.com/reactor/reactor/compare/2023.0.5...2023.0.6)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:20:24 +00:00
dependabot[bot]
6577224b0d Bump io.micrometer:micrometer-tracing-bom (#9149) 
Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.0-RC1 to 1.3.1-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/commits)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:19:47 +00:00
dependabot[bot]
f3da7c3054 Bump org.springframework.data:spring-data-bom (#9154) 
Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2024.0.0-RC1 to 2024.0.0.
- [Release notes](https://github.com/spring-projects/spring-data-bom/releases)
- [Commits](https://github.com/spring-projects/spring-data-bom/compare/2024.0.0-RC1...2024.0.0)

---
updated-dependencies:
- dependency-name: org.springframework.data:spring-data-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:10:36 +00:00
dependabot[bot]
c416f044c5 Bump org.springframework.ws:spring-ws-bom from 4.0.10 to 4.0.11 (#9151) 
Bumps [org.springframework.ws:spring-ws-bom](https://github.com/spring-projects/spring-ws) from 4.0.10 to 4.0.11.
- [Release notes](https://github.com/spring-projects/spring-ws/releases)
- [Commits](https://github.com/spring-projects/spring-ws/compare/v4.0.10...v4.0.11)

---
updated-dependencies:
- dependency-name: org.springframework.ws:spring-ws-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:08:07 +00:00
dependabot[bot]
ebc8ca7f92 Bump io.micrometer:micrometer-bom from 1.13.0-RC1 to 1.13.1-SNAPSHOT (#9147) 
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.0-RC1 to 1.13.1-SNAPSHOT.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/commits)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-19 00:07:15 +00:00
dependabot[bot]
4d33ea093c Bump kotlinVersion from 1.9.23 to 1.9.24 (#9141) 
Bumps `kotlinVersion` from 1.9.23 to 1.9.24.

Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.9.23 to 1.9.24
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24)

Updates `org.jetbrains.kotlin:kotlin-allopen` from 1.9.23 to 1.9.24
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-allopen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-12 02:33:42 +00:00
dependabot[bot]
67bf75cec4 Bump com.fasterxml.jackson:jackson-bom from 2.17.0 to 2.17.1 (#9142) 
Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.0 to 2.17.1.
- [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.0...jackson-bom-2.17.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson:jackson-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-12 00:33:42 +00:00
dependabot[bot]
8fedc84e87 Bump com.gradle.develocity from 3.17.2 to 3.17.3 (#9139) 
Bumps com.gradle.develocity from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: com.gradle.develocity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-12 00:29:24 +00:00
dependabot[bot]
17b713a398 Bump org.jetbrains.kotlinx:kotlinx-coroutines-bom from 1.8.0 to 1.8.1 (#9140) 
Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-bom](https://github.com/Kotlin/kotlinx.coroutines) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-12 00:23:53 +00:00
dependabot[bot]
3e36ae8d2f Bump org.aspectj:aspectjweaver from 1.9.22 to 1.9.22.1 (#9138) 
Bumps [org.aspectj:aspectjweaver](https://github.com/eclipse/org.aspectj) from 1.9.22 to 1.9.22.1.
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

---
updated-dependencies:
- dependency-name: org.aspectj:aspectjweaver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-12 00:23:33 +00:00
Artem Bilan
503c1f4d89 GH-9124: Mention FileListFilter in the max-fetch.adoc 
Fixes to: #9124
 2024-05-09 15:31:38 -04:00
Emmanuel Ferdman
2b01a39a42 Update contribution file reference 
The `samples.adoc` uses out-dated link to contributing guidelines.
 2024-05-09 11:21:35 -04:00
Artem Bilan
467c96171e Fix NPE in the AbstractInboundFileSynchronizer for remote dir 
Related to: #9129

The `remoteDirectoryPath` might be `null`, so it is not correct to attempt `remoteDirectoryPath.charAt(0)`.
Plus `/null` is not correct path.

* Use `/` for empty remote dir.
* Check for `remoteDirectoryPath != null`

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-08 16:11:53 -04:00
Artem Bilan
d87a7098ca GH-9129: SFTP: Remove extra / for the file_remoteDirectory header 
Fixes: #9129

If `.remoteDirectory("/sftpSource")`, then `FileHeaders.REMOTE_DIRECTORY` is `//sftpSource`

* Fix `AbstractInboundFileSynchronizer` to not add `/` if one is already present in the beginning of the `remoteDirectoryPath`

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-08 15:48:08 -04:00
Artem Bilan
8b88668fbe GH-9114: SFTP: Use canonicalPath exists operation 
Fixes: #9114

If path is not in normalized presentation, the SFTP operation might fail like:
```
Caused by: SFTP error (SSH_FX_NO_SUCH_PATH): The file path does not exist or is invalid.
at org.apache.sshd.sftp.client.impl.AbstractSftpClient.throwStatusException(AbstractSftpClient.java:277)
at org.apache.sshd.sftp.client.impl.AbstractSftpClient.checkAttributesResponse(AbstractSftpClient.java:333)
at org.apache.sshd.sftp.client.impl.AbstractSftpClient.checkAttributes(AbstractSftpClient.java:325)
at org.apache.sshd.sftp.client.impl.AbstractSftpClient.lstat(AbstractSftpClient.java:1010)
at org.springframework.integration.sftp.session.SftpSession.exists(SftpSession.java:191)
```

* Use it now like this `this.sftpClient.lstat(normalizePath(path))`

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-07 14:23:17 -04:00
Artem Bilan
a2215afdf7 GH-9123: SFTP: Use canonicalPath for read operation 
Fixes: #9123

The `/` at the beginning of the remote dir path is not necessary when listing files, although it is necessary to download them
The `SftpTemplate.get()` should work also with `remote-dir/MyFile.csv` as input.

* Fix `SftpSession.readRaw()` to call `sftpClient.canonicalPath(source)` if the path does not start with a `/`.
Something similar what is does
* Delegate to `SftpSession.readRaw()` from the `SftpSession.read()`
* Reuse `normalizePath()` for `doList()`

**Auto-cherry-pick to `6.2.x` & `6.1.x`**
 2024-05-07 13:46:27 -04:00
dependabot[bot]
243141e19a Bump the development-dependencies group across 1 directory with 2 updates (#9122) 
Bumps the development-dependencies group with 2 updates in the / directory: io.spring.dependency-management and com.github.spotbugs.


Updates `io.spring.dependency-management` from 1.1.4 to 1.1.5

Updates `com.github.spotbugs` from 6.0.12 to 6.0.14

---
updated-dependencies:
- dependency-name: io.spring.dependency-management
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-06 14:00:26 +00:00
dependabot[bot]
6e9097fcbc Bump org.jruby:jruby-complete from 9.4.6.0 to 9.4.7.0 (#9120) 
Bumps org.jruby:jruby-complete from 9.4.6.0 to 9.4.7.0.

---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-05-06 13:58:19 +00:00