Skip to content

Commit

Permalink
Add RabbitMQ streams
Browse files Browse the repository at this point in the history
Closes gh-1418
  • Loading branch information
mhalbritter committed Feb 27, 2024
1 parent 50f6554 commit 31d62a9
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
Expand Down Expand Up @@ -39,7 +39,7 @@ static Iterable<ImplicitDependency> create() {
return create(
onDependencies("activemq", "artemis").customizeBuild(addDependency("jms"))
.customizeHelpDocument(addReferenceLink("JMS Module", "jms")),
onDependencies("amqp").customizeBuild(addDependency("amqp"))
onDependencies("amqp", "amqp-streams").customizeBuild(addDependency("amqp"))
.customizeHelpDocument(addReferenceLink("AMQP Module", "amqp")),
onDependencies("data-jdbc", "jdbc").customizeBuild(addDependency("jdbc"))
.customizeHelpDocument(addReferenceLink("JDBC Module", "jdbc")),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
Expand Down Expand Up @@ -44,7 +44,7 @@ abstract class TestcontainersModuleRegistry {

static Iterable<ImplicitDependency> create(Version platformVersion) {
List<ImplicitDependency.Builder> builders = new ArrayList<>();
builders.add(onDependencies("amqp").customizeBuild(addModule("rabbitmq"))
builders.add(onDependencies("amqp", "amqp-streams").customizeBuild(addModule("rabbitmq"))
.customizeHelpDocument(addReferenceLink("RabbitMQ Module", "rabbitmq/")));
builders.add(onDependencies("cloud-gcp", "cloud-gcp-pubsub").customizeBuild(addModule("gcloud"))
.customizeHelpDocument(addReferenceLink("GCloud Module", "gcloud/")));
Expand Down
9 changes: 9 additions & 0 deletions start-site/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,15 @@ initializr:
description: Messaging with RabbitMQ
- rel: reference
href: https://docs.spring.io/spring-boot/docs/{bootVersion}/reference/htmlsingle/index.html#messaging.amqp
- name: Spring for RabbitMQ Streams
id: amqp-streams
description: Building stream processing applications with RabbitMQ.
groupId: org.springframework.amqp
artifactId: spring-rabbit-stream
starter: false
links:
- rel: reference
href: https://docs.spring.io/spring-amqp/reference/stream.html
- name: Spring for Apache Kafka
id: kafka
description: Publish, subscribe, store, and process streams of records.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
Expand Down Expand Up @@ -60,15 +60,16 @@ void buildWithSupportedEntries(String springBootDependencyId, String integration

static Stream<Arguments> supportedEntries() {
return Stream.of(Arguments.arguments("artemis", "jms"), Arguments.arguments("amqp", "amqp"),
Arguments.arguments("data-jdbc", "jdbc"), Arguments.arguments("jdbc", "jdbc"),
Arguments.arguments("data-jpa", "jpa"), Arguments.arguments("data-mongodb", "mongodb"),
Arguments.arguments("data-mongodb-reactive", "mongodb"), Arguments.arguments("data-r2dbc", "r2dbc"),
Arguments.arguments("data-redis", "redis"), Arguments.arguments("data-redis-reactive", "redis"),
Arguments.arguments("kafka", "kafka"), Arguments.arguments("kafka-streams", "kafka"),
Arguments.arguments("mail", "mail"), Arguments.arguments("rsocket", "rsocket"),
Arguments.arguments("security", "security"), Arguments.arguments("web", "http"),
Arguments.arguments("webflux", "webflux"), Arguments.arguments("websocket", "websocket"),
Arguments.arguments("websocket", "stomp"), Arguments.arguments("web-services", "ws"));
Arguments.arguments("amqp-streams", "amqp"), Arguments.arguments("data-jdbc", "jdbc"),
Arguments.arguments("jdbc", "jdbc"), Arguments.arguments("data-jpa", "jpa"),
Arguments.arguments("data-mongodb", "mongodb"), Arguments.arguments("data-mongodb-reactive", "mongodb"),
Arguments.arguments("data-r2dbc", "r2dbc"), Arguments.arguments("data-redis", "redis"),
Arguments.arguments("data-redis-reactive", "redis"), Arguments.arguments("kafka", "kafka"),
Arguments.arguments("kafka-streams", "kafka"), Arguments.arguments("mail", "mail"),
Arguments.arguments("rsocket", "rsocket"), Arguments.arguments("security", "security"),
Arguments.arguments("web", "http"), Arguments.arguments("webflux", "webflux"),
Arguments.arguments("websocket", "websocket"), Arguments.arguments("websocket", "stomp"),
Arguments.arguments("web-services", "ws"));
}

@ParameterizedTest
Expand All @@ -87,15 +88,16 @@ void linkToSupportedEntriesWhenSpringIntegrationIsNotPresentIsNotAdded(String de

static Stream<Arguments> referenceLinks() {
return Stream.of(Arguments.arguments("artemis", "jms"), Arguments.arguments("amqp", "amqp"),
Arguments.arguments("data-jdbc", "jdbc"), Arguments.arguments("jdbc", "jdbc"),
Arguments.arguments("data-jpa", "jpa"), Arguments.arguments("data-mongodb", "mongodb"),
Arguments.arguments("data-mongodb-reactive", "mongodb"), Arguments.arguments("data-r2dbc", "r2dbc"),
Arguments.arguments("data-redis", "redis"), Arguments.arguments("data-redis-reactive", "redis"),
Arguments.arguments("kafka", "kafka"), Arguments.arguments("kafka-streams", "kafka"),
Arguments.arguments("mail", "mail"), Arguments.arguments("rsocket", "rsocket"),
Arguments.arguments("security", "security"), Arguments.arguments("web", "http"),
Arguments.arguments("webflux", "webflux"), Arguments.arguments("websocket", "web-sockets"),
Arguments.arguments("websocket", "stomp"), Arguments.arguments("web-services", "ws"));
Arguments.arguments("amqp-streams", "amqp"), Arguments.arguments("data-jdbc", "jdbc"),
Arguments.arguments("jdbc", "jdbc"), Arguments.arguments("data-jpa", "jpa"),
Arguments.arguments("data-mongodb", "mongodb"), Arguments.arguments("data-mongodb-reactive", "mongodb"),
Arguments.arguments("data-r2dbc", "r2dbc"), Arguments.arguments("data-redis", "redis"),
Arguments.arguments("data-redis-reactive", "redis"), Arguments.arguments("kafka", "kafka"),
Arguments.arguments("kafka-streams", "kafka"), Arguments.arguments("mail", "mail"),
Arguments.arguments("rsocket", "rsocket"), Arguments.arguments("security", "security"),
Arguments.arguments("web", "http"), Arguments.arguments("webflux", "webflux"),
Arguments.arguments("websocket", "web-sockets"), Arguments.arguments("websocket", "stomp"),
Arguments.arguments("web-services", "ws"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
Expand Down Expand Up @@ -66,8 +66,9 @@ void buildWithSpringBoot32AndOracleJdbcDriverUsesOracleFree() {
}

static Stream<Arguments> supportedEntriesBuild() {
return Stream.of(Arguments.arguments("amqp", "rabbitmq"), Arguments.arguments("cloud-gcp", "gcloud"),
Arguments.arguments("cloud-gcp-pubsub", "gcloud"), Arguments.arguments("data-cassandra", "cassandra"),
return Stream.of(Arguments.arguments("amqp", "rabbitmq"), Arguments.of("amqp-streams", "rabbitmq"),
Arguments.arguments("cloud-gcp", "gcloud"), Arguments.arguments("cloud-gcp-pubsub", "gcloud"),
Arguments.arguments("data-cassandra", "cassandra"),
Arguments.arguments("data-cassandra-reactive", "cassandra"),
Arguments.arguments("data-couchbase", "couchbase"),
Arguments.arguments("data-couchbase-reactive", "couchbase"),
Expand Down Expand Up @@ -96,8 +97,8 @@ void linkToSupportedEntriesWhenTestContainerIsNotPresentIsNotAdded(String depend
}

static Stream<Arguments> supportedEntriesHelpDocument() {
return Stream.of(Arguments.arguments("amqp", "rabbitmq/"), Arguments.arguments("cloud-gcp", "gcloud/"),
Arguments.arguments("cloud-gcp-pubsub", "gcloud/"),
return Stream.of(Arguments.arguments("amqp", "rabbitmq/"), Arguments.arguments("amqp-streams", "rabbitmq/"),
Arguments.arguments("cloud-gcp", "gcloud/"), Arguments.arguments("cloud-gcp-pubsub", "gcloud/"),
Arguments.arguments("cloud-starter-consul-config", "consul/"),
Arguments.arguments("cloud-starter-vault-config", "vault/"),
Arguments.arguments("data-cassandra", "databases/cassandra/"),
Expand Down

0 comments on commit 31d62a9

Please sign in to comment.