Skip to content

Commit f4844c1

Browse files
committed
Fix deprecation warnings
* Make `ci-snapshot.yml` as scheduled for the night build * Remove the `mkdirs()` in the `file-split-ftp` test as the respective fix is coming in Spring Integration: spring-projects/spring-integration#10525
1 parent 1340556 commit f4844c1

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

.github/workflows/ci-snapshot.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ on:
66
branches:
77
- main
88

9+
schedule:
10+
- cron: '0 5 * * *'
11+
12+
concurrency:
13+
group: group-snapshot-for-${{ github.ref }}
14+
cancel-in-progress: true
15+
916
env:
1017
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1118

@@ -15,14 +22,14 @@ jobs:
1522
name: CI Build SNAPSHOT for ${{ github.ref_name }}
1623
steps:
1724

18-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
1926
with:
2027
show-progress: false
2128

2229
- name: Set up Gradle
2330
uses: spring-io/spring-gradle-build-action@v2
2431
with:
25-
java-version: 24
32+
java-version: 25
2633

2734
- name: Build
2835
run: ./gradlew check

advanced/dynamic-tcp-client/src/main/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.springframework.integration.config.EnableMessageHistory;
3232
import org.springframework.integration.dsl.IntegrationFlow;
3333
import org.springframework.integration.dsl.context.IntegrationFlowContext;
34-
import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter;
35-
import org.springframework.integration.ip.tcp.TcpSendingMessageHandler;
3634
import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory;
3735
import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory;
36+
import org.springframework.integration.ip.tcp.inbound.TcpReceivingChannelAdapter;
37+
import org.springframework.integration.ip.tcp.outbound.TcpSendingMessageHandler;
3838
import org.springframework.integration.router.AbstractMessageRouter;
3939
import org.springframework.messaging.Message;
4040
import org.springframework.messaging.MessageChannel;

applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ public void testFailure() throws Exception {
131131
* Verify the email was sent.
132132
*/
133133
private MimeMessage runTest(boolean fail) throws Exception {
134-
File inDir = new File("/tmp/in/");
135-
inDir.mkdirs();
136-
File in = new File(inDir, "foo");
134+
File in = new File("/tmp/in/", "foo");
137135
FileOutputStream fos = new FileOutputStream(in);
138136
fos.write("*002,foo,bar\n*006,baz,qux\n*009,fiz,buz\n".getBytes());
139137
fos.close();

basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
3434
import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
3535
import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
36-
import org.springframework.integration.stream.CharacterStreamReadingMessageSource;
36+
import org.springframework.integration.stream.inbound.CharacterStreamReadingMessageSource;
3737
import org.springframework.messaging.MessageHandler;
3838

3939
/**

dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.integration.samples.cafe.Order;
3737
import org.springframework.integration.samples.cafe.OrderItem;
3838
import org.springframework.integration.scheduling.PollerMetadata;
39-
import org.springframework.integration.stream.CharacterStreamWritingMessageHandler;
39+
import org.springframework.integration.stream.outbound.CharacterStreamWritingMessageHandler;
4040

4141
/**
4242
* @author Artem Bilan

dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.springframework.integration.channel.DirectChannel;
3131
import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway;
3232
import org.springframework.integration.http.inbound.RequestMapping;
33-
import org.springframework.integration.ip.tcp.TcpInboundGateway;
3433
import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory;
34+
import org.springframework.integration.ip.tcp.inbound.TcpInboundGateway;
3535
import org.springframework.integration.json.ObjectToJsonTransformer;
3636
import org.springframework.integration.transformer.ObjectToStringTransformer;
3737
import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway;

dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.springframework.integration.dsl.IntegrationFlow;
3535
import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway;
3636
import org.springframework.integration.http.inbound.RequestMapping;
37-
import org.springframework.integration.ip.tcp.TcpInboundGateway;
3837
import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory;
38+
import org.springframework.integration.ip.tcp.inbound.TcpInboundGateway;
3939
import org.springframework.integration.json.ObjectToJsonTransformer;
4040
import org.springframework.integration.transformer.ObjectToStringTransformer;
4141
import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway;

0 commit comments

Comments
 (0)