Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes according latest upgrades

Browse Source 
* Add `--add-opens` to `asciidoctor` Gradle task to avoid compilation warning
* Upgrade to Kotlin `1.6.10` and modify its Gradle task respective
* Add empty impl for new `AnnotationMetadataAdapter.getDeclaredMethods()`
* Parse HTTP methods to new `String methodNames` property of the `RequestMapping`
since `HttpMethod` is not an `enum` anymore.
* Ignore JDBC tests which rely on a map property resolution: the `[]` placeholder
is not handled in the latest SF anymore.
* Fix `WebFluxInboundEndpoint` for deprecations
This commit is contained in:
Artem Bilan
2022-01-06 17:24:11 -05:00
parent a80b22638d
commit b3ae24eac6
17 changed files with 205 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2021 the original author or authors.
* Copyright 2016-2022 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.
@@ -82,7 +82,8 @@ public class JdbcLockRegistry implements ExpirableLockRegistry, RenewableLockReg
/**
* Construct an instance based on the provided {@link LockRepository}.
* @param client the {@link LockRepository} to rely on.
*/ public JdbcLockRegistry(LockRepository client) {
*/
public JdbcLockRegistry(LockRepository client) {
this.client = client;
}

21
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -23,10 +23,11 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -46,7 +47,7 @@ public class JdbcMessageHandlerIntegrationTests {
private static JdbcTemplate jdbcTemplate;
@BeforeClass
@BeforeAll
public static void setUp() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
builder.setType(EmbeddedDatabaseType.HSQL).addScript(
@@ -55,12 +56,12 @@ public class JdbcMessageHandlerIntegrationTests {
jdbcTemplate = new JdbcTemplate(embeddedDatabase);
}
@AfterClass
@AfterAll
public static void tearDown() {
embeddedDatabase.shutdown();
}
@After
@AfterEach
public void cleanup() {
jdbcTemplate.execute("DELETE FROM FOOS");
}
@@ -147,9 +148,10 @@ public class JdbcMessageHandlerIntegrationTests {
}
@Test
@Disabled("SF doesn't handle [] in query params any more")
public void testIdHeaderDynamicInsert() {
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate,
"insert into foos (id, status, name) values (:headers[idAsString], 0, :payload)");
"insert into foos (id, status, name) values (headers[idAsString], 0, :payload)");
handler.afterPropertiesSet();
Message<String> message = new GenericMessage<>("foo");
String id = message.getHeaders().getId().toString();
@@ -163,6 +165,7 @@ public class JdbcMessageHandlerIntegrationTests {
}
@Test
@Disabled("SF doesn't handle [] in query params any more")
public void testDottedHeaderDynamicInsert() {
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate,
"insert into foos (id, status, name) values (:headers[business.id], 0, :payload)");

10
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -24,8 +24,9 @@ import java.util.Map;
import javax.sql.DataSource;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -48,6 +49,7 @@ import org.springframework.messaging.MessageChannel;
* @since 2.0
*
*/
@Disabled("SF doesn't handle [] in query params any more")
public class JdbcMessageHandlerParserTests {
private JdbcTemplate jdbcTemplate;
@@ -144,7 +146,7 @@ public class JdbcMessageHandlerParserTests {
assertThat(map.get("name")).as("Wrong id").isEqualTo("foo");
}
@After
@AfterEach
public void tearDown() {
if (context != null) {
context.close();

10
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -30,8 +30,9 @@ import java.util.Map;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ConfigurableApplicationContext;
@@ -59,6 +60,7 @@ import org.springframework.messaging.support.GenericMessage;
* @since 2.0
*
*/
@Disabled("SF doesn't handle [] in query params any more")
public class JdbcOutboundGatewayParserTests {
private JdbcTemplate jdbcTemplate;
@@ -291,7 +293,7 @@ public class JdbcOutboundGatewayParserTests {
}
@After
@AfterEach
public void tearDown() {
if (this.context != null) {
this.context.close();