diff --git a/consumer/jdbc-consumer/src/main/resources/application.properties b/consumer/jdbc-consumer/src/main/resources/application.properties new file mode 100644 index 00000000..532da3b2 --- /dev/null +++ b/consumer/jdbc-consumer/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.integration.jdbc.initialize-schema=NEVER diff --git a/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java b/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java index 7f074e44..f550434e 100644 --- a/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java +++ b/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java @@ -23,7 +23,6 @@ import java.util.function.Function; import reactor.core.publisher.Flux; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.web.reactive.function.client.WebClientCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; diff --git a/supplier/jdbc-supplier/src/main/resources/application.properties b/supplier/jdbc-supplier/src/main/resources/application.properties new file mode 100644 index 00000000..532da3b2 --- /dev/null +++ b/supplier/jdbc-supplier/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.integration.jdbc.initialize-schema=NEVER diff --git a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java index a5f5cd01..5a4684a4 100644 --- a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java +++ b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2020 the original author or authors. + * Copyright 2020-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. @@ -26,10 +26,13 @@ import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.BadSqlGrammarException; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = "jdbc.supplier.query=select id, name from test order by id") @@ -39,6 +42,9 @@ public class DefaultJdbcSupplierTests { @Autowired Supplier>> jdbcSupplier; + @Autowired + JdbcTemplate jdbcTemplate; + @Test void testExtraction() { final Flux> messageFlux = jdbcSupplier.get(); @@ -76,6 +82,18 @@ public class DefaultJdbcSupplierTests { stepVerifier.verify(); } + /* + The test to verify that DB is not initialized with Spring Integration DDL + (spring.integration.jdbc.initialize-schema=NEVER) what happens by default via IntegrationAutoConfiguration.IntegrationJdbcConfiguration. + This is not a functionality of this JDBC Supplier. + */ + @Test + void verifyNoIntMessageGroupTable() { + assertThatExceptionOfType(BadSqlGrammarException.class) + .isThrownBy(() -> this.jdbcTemplate.queryForList("SELECT * FROM INT_MESSAGE_GROUP")) + .withMessageContaining("Table \"INT_MESSAGE_GROUP\" not found;"); + } + @SpringBootApplication static class JdbcSupplierTestApplication { } diff --git a/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java b/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java index 877a44ce..4a71c3b9 100644 --- a/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java +++ b/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java @@ -24,7 +24,6 @@ import java.util.function.Supplier; import javax.mail.URLName; import org.reactivestreams.Publisher; - import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired;