diff --git a/.settings.xml b/.settings.xml index 2e1e52b4..152672e2 100644 --- a/.settings.xml +++ b/.settings.xml @@ -19,7 +19,7 @@ Maven Central https://repo.maven.apache.org/maven2 - false + true @@ -48,6 +48,14 @@ + + maven-central + Maven Central + https://repo.maven.apache.org/maven2 + + true + + spring-snapshots Spring Snapshots diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/HeadersMappedLastTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/HeadersMappedLastTests.java index a86fab86..4b3114d3 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/HeadersMappedLastTests.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/HeadersMappedLastTests.java @@ -59,7 +59,7 @@ public class HeadersMappedLastTests { Message received = this.rabbitTemplate.receive("scsapp-testq"); assertThat(new String(received.getBody())).isEqualTo("{}"); //TODO: What should be the actual content type? - // assertThat(received.getMessageProperties().getContentType()).isEqualTo("application/octet-stream"); + assertThat(received.getMessageProperties().getContentType()).isEqualTo("application/octet-stream"); } } } diff --git a/applications/source/mail-source/src/test/java/org/springframework/cloud/stream/app/source/file/MailSourceTests.java b/applications/source/mail-source/src/test/java/org/springframework/cloud/stream/app/source/file/MailSourceTests.java index 9866007c..589c7113 100644 --- a/applications/source/mail-source/src/test/java/org/springframework/cloud/stream/app/source/file/MailSourceTests.java +++ b/applications/source/mail-source/src/test/java/org/springframework/cloud/stream/app/source/file/MailSourceTests.java @@ -77,7 +77,7 @@ class MailSourceTests { assertThat(n < 100).isTrue(); } */ - @Disabled + @Disabled // TODO find TestContainer solution for testing email. @Test void mailMessagesAreSuppliedToOutputDestination(@Autowired OutputDestination target) { Message sourceMessage = target.receive(10000, "mailSupplier-out-0"); diff --git a/functions/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java b/functions/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java index cea3c7d0..3bd96288 100644 --- a/functions/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java +++ b/functions/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java @@ -28,11 +28,10 @@ import co.elastic.clients.elasticsearch.core.GetRequest; import co.elastic.clients.elasticsearch.core.GetResponse; import co.elastic.clients.json.JsonData; import org.awaitility.Awaitility; -import org.elasticsearch.xcontent.XContentBuilder; -import org.elasticsearch.xcontent.XContentFactory; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -61,6 +60,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @Tag("integration") @Testcontainers(disabledWithoutDocker = true) public class ElasticsearchConsumerApplicationTests { + private static final Logger log = LoggerFactory.getLogger(ElasticsearchConsumerApplicationTests.class); @Container static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( @@ -107,7 +107,7 @@ public class ElasticsearchConsumerApplicationTests { + "\"fullName\":\"John Doe\"}"; final Message message = MessageBuilder.withPayload(jsonObject) .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2").build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); @@ -133,7 +133,7 @@ public class ElasticsearchConsumerApplicationTests { jsonMap.put("dateOfBirth", 1471466076564L); jsonMap.put("fullName", "John Doe"); final Message> message = MessageBuilder.withPayload(jsonMap).build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); final GetRequest getRequest = new GetRequest.Builder().index("foo").id("3").build(); @@ -151,35 +151,6 @@ public class ElasticsearchConsumerApplicationTests { }); } - @Test - @Disabled - public void testXContentBuilder() { - this.contextRunner - .withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.id=4", - "spring.elasticsearch.rest.uris=http://" + elasticsearch.getHttpHostAddress()) - .run(context -> { - Consumer> elasticsearchConsumer = context.getBean("elasticsearchConsumer", Consumer.class); - - XContentBuilder builder = XContentFactory.jsonBuilder(); - builder.startObject(); - builder.field("user", "kimchy"); - builder.timeField("postDate", 1471466076564L); - builder.field("message", "trying out Elasticsearch"); - builder.endObject(); - - final Message message = MessageBuilder.withPayload(builder).build(); - - elasticsearchConsumer.accept(message); - - final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); - final GetRequest getRequest = new GetRequest.Builder().index("foo").id("4").build(); - - final GetResponse response = elasticsearchClient.get(getRequest, String.class); - assertThat(response.found()).isTrue(); - - assertThat(response.source()).isEqualTo(builder.toString()); - }); - } @Test public void testAsyncIndexing() { this.contextRunner @@ -192,7 +163,7 @@ public class ElasticsearchConsumerApplicationTests { final String jsonObject = "{\"age\":10,\"dateOfBirth\":1471466076564," + "\"fullName\":\"John Doe\"}"; final Message message = MessageBuilder.withPayload(jsonObject).build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); @@ -228,7 +199,7 @@ public class ElasticsearchConsumerApplicationTests { + "\"fullName\":\"John Doe\"}") .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, Integer.toString(i)) .build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); } @@ -275,9 +246,9 @@ public class ElasticsearchConsumerApplicationTests { final Message message = builder.build(); if (i < properties.getBatchSize() - 1) { + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); - } - else { + } else { // last invocation assertThatIllegalStateException() .isThrownBy(() -> elasticsearchConsumer.accept(message)) @@ -304,7 +275,7 @@ public class ElasticsearchConsumerApplicationTests { .setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2") .setHeader(ElasticsearchConsumerConfiguration.INDEX_NAME_HEADER, dynamicIndex) .build(); - + log.info("elasticsearchConsumer.accept:{}", message); elasticsearchConsumer.accept(message); final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class); diff --git a/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java b/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java index c53f671a..8091aaee 100644 --- a/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java +++ b/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Artem Bilan */ @TestPropertySource(properties = "aggregator.message-store-type=redis") -@Disabled("Needs real Redis Server to be run") +@Disabled("Needs real Redis Server to be run") // TODO add redis test container public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests { @Test diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java index 24c48f4e..617dfced 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java @@ -34,7 +34,7 @@ import org.springframework.test.annotation.DirtiesContext; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container solution @SpringIntegrationTest(noAutoStartup = "*") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = { "mail.supplier.mark-as-read=true", diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java index b5d9154a..0a27c049 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX", "mail.supplier.charset=cp1251"}) diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java index f901c82f..144300f9 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.idle-imap=true", "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"}) diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java index 34dbad71..dd25e4da 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = { "mail.supplier.idle-imap=true", "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"}) diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java index 6e3c268d..bacc200a 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java @@ -31,7 +31,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX") public class ImapPassTests extends AbstractMailSupplierTests { diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java index c8c022fa..8ec32fdd 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX") public class Pop3FailTests extends AbstractMailSupplierTests { diff --git a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java index 943b1348..0b465d38 100644 --- a/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java +++ b/functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; -@Disabled +@Disabled // TODO add test container based solution @TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX") public class Pop3PassTests extends AbstractMailSupplierTests { diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index e5fe9245..7e4e47c9 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -26,6 +26,7 @@ true true 10.3.4 + ${maven.multiModuleProjectDirectory}/etc/checkstyle ${checkstyle.location}/checkstyle-suppressions.xml ${checkstyle.location}/nohttp-checkstyle.xml @@ -34,23 +35,21 @@ 0.0.10 true 0.0.35 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 3.0.0 - 6.0.2 + 6.0.1 - 2022.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 1.17.5 + 2022.0.0 + 4.0.0 + 4.0.0 + 4.0.0 + 4.0.0 + 1.17.6 5.13.2 4.0.5 3.1.0 - 5.16.5 - 3.4.8 @@ -227,14 +226,14 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Copyright 2014-2020 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. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,