From 091e94efea0f88426de07dff51067ac5dbdd4c55 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 1 May 2018 10:24:45 -0400 Subject: [PATCH] Fix import in JmsDslKotlinTests.kt https://build.spring.io/browse/INT-SI50X-43 Expire message groups for the `JdbcMessageStoreTests` https://build.spring.io/browse/INT-FATS5IC-494 --- .../integration/jdbc/store/JdbcMessageStoreTests.java | 5 +++-- .../springframework/integration/jms/dsl/JmsDslKotlinTests.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java index abdc156cb8..68ebee496d 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,7 +78,8 @@ public class JdbcMessageStoreTests { @Before public void init() { - messageStore = new JdbcMessageStore(dataSource); + this.messageStore = new JdbcMessageStore(dataSource); + this.messageStore.expireMessageGroups(-1); } @Test diff --git a/spring-integration-jms/src/test/kotlin/org/springframework/integration/jms/dsl/JmsDslKotlinTests.kt b/spring-integration-jms/src/test/kotlin/org/springframework/integration/jms/dsl/JmsDslKotlinTests.kt index e6c099e61d..418e1fc1c1 100644 --- a/spring-integration-jms/src/test/kotlin/org/springframework/integration/jms/dsl/JmsDslKotlinTests.kt +++ b/spring-integration-jms/src/test/kotlin/org/springframework/integration/jms/dsl/JmsDslKotlinTests.kt @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration import org.springframework.integration.config.EnableIntegration import org.springframework.integration.dsl.IntegrationFlow import org.springframework.integration.dsl.IntegrationFlows -import org.springframework.integration.dsl.MessageChannels +import org.springframework.integration.dsl.channel.MessageChannels import org.springframework.integration.support.MessageBuilder import org.springframework.messaging.MessageChannel import org.springframework.messaging.PollableChannel