Skip to content

Commit 189341b

Browse files
author
Corneil du Plessis
committed
Added TODOs update versions.
1 parent 5d365f9 commit 189341b

File tree

13 files changed

+41
-63
lines changed

13 files changed

+41
-63
lines changed

Diff for: ‎.settings.xml

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<name>Maven Central</name>
2020
<url>https://repo.maven.apache.org/maven2</url>
2121
<snapshots>
22-
<enabled>false</enabled>
22+
<enabled>true</enabled>
2323
</snapshots>
2424
</repository>
2525
<repository>
@@ -48,6 +48,14 @@
4848
</repository>
4949
</repositories>
5050
<pluginRepositories>
51+
<pluginRepository>
52+
<id>maven-central</id>
53+
<name>Maven Central</name>
54+
<url>https://repo.maven.apache.org/maven2</url>
55+
<snapshots>
56+
<enabled>true</enabled>
57+
</snapshots>
58+
</pluginRepository>
5159
<pluginRepository>
5260
<id>spring-snapshots</id>
5361
<name>Spring Snapshots</name>

Diff for: ‎applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/HeadersMappedLastTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void test() {
5959
Message received = this.rabbitTemplate.receive("scsapp-testq");
6060
assertThat(new String(received.getBody())).isEqualTo("{}");
6161
//TODO: What should be the actual content type?
62-
// assertThat(received.getMessageProperties().getContentType()).isEqualTo("application/octet-stream");
62+
assertThat(received.getMessageProperties().getContentType()).isEqualTo("application/octet-stream");
6363
}
6464
}
6565
}

Diff for: ‎applications/source/mail-source/src/test/java/org/springframework/cloud/stream/app/source/file/MailSourceTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private static void startMailServer(TestMailServer.MailServer mailServer)
7777
assertThat(n < 100).isTrue();
7878
}
7979
*/
80-
@Disabled
80+
@Disabled // TODO find TestContainer solution for testing email.
8181
@Test
8282
void mailMessagesAreSuppliedToOutputDestination(@Autowired OutputDestination target) {
8383
Message<byte[]> sourceMessage = target.receive(10000, "mailSupplier-out-0");

Diff for: ‎functions/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java

+10-39
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
import co.elastic.clients.elasticsearch.core.GetResponse;
2929
import co.elastic.clients.json.JsonData;
3030
import org.awaitility.Awaitility;
31-
import org.elasticsearch.xcontent.XContentBuilder;
32-
import org.elasticsearch.xcontent.XContentFactory;
33-
import org.junit.jupiter.api.Disabled;
3431
import org.junit.jupiter.api.Tag;
3532
import org.junit.jupiter.api.Test;
33+
import org.slf4j.Logger;
34+
import org.slf4j.LoggerFactory;
3635
import org.testcontainers.elasticsearch.ElasticsearchContainer;
3736
import org.testcontainers.junit.jupiter.Container;
3837
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -61,6 +60,7 @@
6160
@Tag("integration")
6261
@Testcontainers(disabledWithoutDocker = true)
6362
public class ElasticsearchConsumerApplicationTests {
63+
private static final Logger log = LoggerFactory.getLogger(ElasticsearchConsumerApplicationTests.class);
6464

6565
@Container
6666
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
@@ -107,7 +107,7 @@ public void testIdPassedAsMessageHeader() {
107107
+ "\"fullName\":\"John Doe\"}";
108108
final Message<String> message = MessageBuilder.withPayload(jsonObject)
109109
.setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2").build();
110-
110+
log.info("elasticsearchConsumer.accept:{}", message);
111111
elasticsearchConsumer.accept(message);
112112

113113
final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class);
@@ -133,7 +133,7 @@ public void testJsonAsMap() {
133133
jsonMap.put("dateOfBirth", 1471466076564L);
134134
jsonMap.put("fullName", "John Doe");
135135
final Message<Map<String, Object>> message = MessageBuilder.withPayload(jsonMap).build();
136-
136+
log.info("elasticsearchConsumer.accept:{}", message);
137137
elasticsearchConsumer.accept(message);
138138
final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class);
139139
final GetRequest getRequest = new GetRequest.Builder().index("foo").id("3").build();
@@ -151,35 +151,6 @@ public void testJsonAsMap() {
151151
});
152152
}
153153

154-
@Test
155-
@Disabled
156-
public void testXContentBuilder() {
157-
this.contextRunner
158-
.withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.id=4",
159-
"spring.elasticsearch.rest.uris=http://" + elasticsearch.getHttpHostAddress())
160-
.run(context -> {
161-
Consumer<Message<?>> elasticsearchConsumer = context.getBean("elasticsearchConsumer", Consumer.class);
162-
163-
XContentBuilder builder = XContentFactory.jsonBuilder();
164-
builder.startObject();
165-
builder.field("user", "kimchy");
166-
builder.timeField("postDate", 1471466076564L);
167-
builder.field("message", "trying out Elasticsearch");
168-
builder.endObject();
169-
170-
final Message<XContentBuilder> message = MessageBuilder.withPayload(builder).build();
171-
172-
elasticsearchConsumer.accept(message);
173-
174-
final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class);
175-
final GetRequest getRequest = new GetRequest.Builder().index("foo").id("4").build();
176-
177-
final GetResponse<String> response = elasticsearchClient.get(getRequest, String.class);
178-
assertThat(response.found()).isTrue();
179-
180-
assertThat(response.source()).isEqualTo(builder.toString());
181-
});
182-
}
183154
@Test
184155
public void testAsyncIndexing() {
185156
this.contextRunner
@@ -192,7 +163,7 @@ public void testAsyncIndexing() {
192163
final String jsonObject = "{\"age\":10,\"dateOfBirth\":1471466076564,"
193164
+ "\"fullName\":\"John Doe\"}";
194165
final Message<String> message = MessageBuilder.withPayload(jsonObject).build();
195-
166+
log.info("elasticsearchConsumer.accept:{}", message);
196167
elasticsearchConsumer.accept(message);
197168

198169
final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class);
@@ -228,7 +199,7 @@ public void testBulkIndexingWithIdFromHeader() {
228199
+ "\"fullName\":\"John Doe\"}")
229200
.setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, Integer.toString(i))
230201
.build();
231-
202+
log.info("elasticsearchConsumer.accept:{}", message);
232203
elasticsearchConsumer.accept(message);
233204
}
234205

@@ -275,9 +246,9 @@ public void testBulkIndexingItemFailure() {
275246
final Message<String> message = builder.build();
276247

277248
if (i < properties.getBatchSize() - 1) {
249+
log.info("elasticsearchConsumer.accept:{}", message);
278250
elasticsearchConsumer.accept(message);
279-
}
280-
else {
251+
} else {
281252
// last invocation
282253
assertThatIllegalStateException()
283254
.isThrownBy(() -> elasticsearchConsumer.accept(message))
@@ -304,7 +275,7 @@ public void testIndexFromMessageHeader() {
304275
.setHeader(ElasticsearchConsumerConfiguration.INDEX_ID_HEADER, "2")
305276
.setHeader(ElasticsearchConsumerConfiguration.INDEX_NAME_HEADER, dynamicIndex)
306277
.build();
307-
278+
log.info("elasticsearchConsumer.accept:{}", message);
308279
elasticsearchConsumer.accept(message);
309280
final ElasticsearchClient elasticsearchClient = context.getBean(ElasticsearchClient.class);
310281

Diff for: ‎functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @author Artem Bilan
3737
*/
3838
@TestPropertySource(properties = "aggregator.message-store-type=redis")
39-
@Disabled("Needs real Redis Server to be run")
39+
@Disabled("Needs real Redis Server to be run") // TODO add redis test container
4040
public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests {
4141

4242
@Test

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import static org.assertj.core.api.Assertions.assertThat;
3636

37-
@Disabled
37+
@Disabled // TODO add test container solution
3838
@SpringIntegrationTest(noAutoStartup = "*")
3939
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
4040
"mail.supplier.mark-as-read=true",

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232

33-
@Disabled
33+
@Disabled // TODO add test container based solution
3434
@TestPropertySource(properties = {
3535
"mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX",
3636
"mail.supplier.charset=cp1251"})

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdleFailTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
@Disabled
30+
@Disabled // TODO add test container based solution
3131
@TestPropertySource(properties = {
3232
"mail.supplier.idle-imap=true",
3333
"mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"})

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
@Disabled
30+
@Disabled // TODO add test container based solution
3131
@TestPropertySource(properties = {
3232
"mail.supplier.idle-imap=true",
3333
"mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX"})

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import static org.assertj.core.api.Assertions.assertThat;
3333

34-
@Disabled
34+
@Disabled // TODO add test container based solution
3535
@TestPropertySource(properties = "mail.supplier.url=imap://user:pw@localhost:${test.mail.server.port}/INBOX")
3636
public class ImapPassTests extends AbstractMailSupplierTests {
3737

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
@Disabled
30+
@Disabled // TODO add test container based solution
3131
@TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX")
3232
public class Pop3FailTests extends AbstractMailSupplierTests {
3333

Diff for: ‎functions/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
@Disabled
30+
@Disabled // TODO add test container based solution
3131
@TestPropertySource(properties = "mail.supplier.url=pop3://user:pw@localhost:${test.mail.server.port}/INBOX")
3232
public class Pop3PassTests extends AbstractMailSupplierTests {
3333

Diff for: ‎stream-applications-build/pom.xml

+12-13
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<maven-checkstyle-plugin.failOnViolation>true</maven-checkstyle-plugin.failOnViolation>
2727
<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
2828
<puppycrawl-tools-checkstyle.version>10.3.4</puppycrawl-tools-checkstyle.version>
29+
<!--suppress UnresolvedMavenProperty -->
2930
<checkstyle.location>${maven.multiModuleProjectDirectory}/etc/checkstyle</checkstyle.location>
3031
<checkstyle.suppressions.file>${checkstyle.location}/checkstyle-suppressions.xml</checkstyle.suppressions.file>
3132
<checkstyle.nohttp.file>${checkstyle.location}/nohttp-checkstyle.xml</checkstyle.nohttp.file>
@@ -34,23 +35,21 @@
3435
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
3536
<disable.nohttp.checks>true</disable.nohttp.checks>
3637
<spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
37-
<spring-boot.version>3.0.0</spring-boot.version>
38-
<spring-kafka.version>3.0.0</spring-kafka.version>
38+
<spring-boot.version>3.0.1</spring-boot.version>
39+
<spring-kafka.version>3.0.1</spring-kafka.version>
3940
<spring-rabbit.version>3.0.0</spring-rabbit.version>
40-
<spring-integration.version>6.0.2</spring-integration.version>
41+
<spring-integration.version>6.0.1</spring-integration.version>
4142

42-
<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
43-
<spring-cloud-starters.version>4.0.0-SNAPSHOT</spring-cloud-starters.version>
44-
<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
45-
<spring-cloud-stream-dependencies.version>4.0.0-SNAPSHOT</spring-cloud-stream-dependencies.version>
46-
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
47-
<test-containers.version>1.17.5</test-containers.version>
43+
<spring-cloud.version>2022.0.0</spring-cloud.version>
44+
<spring-cloud-starters.version>4.0.0</spring-cloud-starters.version>
45+
<spring-cloud-function.version>4.0.0</spring-cloud-function.version>
46+
<spring-cloud-stream-dependencies.version>4.0.0</spring-cloud-stream-dependencies.version>
47+
<spring-cloud-stream.version>4.0.0</spring-cloud-stream.version>
48+
<test-containers.version>1.17.6</test-containers.version>
4849
<mockserver.version>5.13.2</mockserver.version>
4950

5051
<groovy.version>4.0.5</groovy.version>
5152
<jakarta-jms.version>3.1.0</jakarta-jms.version>
52-
<activemq-broker.version>5.16.5</activemq-broker.version>
53-
<embedded-mongo.version>3.4.8</embedded-mongo.version>
5453

5554
</properties>
5655

@@ -227,14 +226,14 @@
227226
<licenses>
228227
<license>
229228
<name>Apache License, Version 2.0</name>
230-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
229+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
231230
<comments>Copyright 2014-2020 the original author or authors.
232231

233232
Licensed under the Apache License, Version 2.0 (the "License");
234233
you may not use this file except in compliance with the License.
235234
You may obtain a copy of the License at
236235

237-
http://www.apache.org/licenses/LICENSE-2.0
236+
https://www.apache.org/licenses/LICENSE-2.0
238237

239238
Unless required by applicable law or agreed to in writing, software
240239
distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)