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

2.4.0-M3; Boot 2.6.0-M2

Browse Source
This commit is contained in:
Gary Russell
2021-09-17 12:38:29 -04:00
parent 331857cfcc
commit adc072be4d
9 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helloworld/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples.spring</groupId>
<artifactId>spring-rabbit-helloworld</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>jar</packaging>
<name>Spring AMQP Hello World</name>
<url>https://www.spring.io</url>
@@ -16,7 +16,7 @@
</description>
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.test.failure.ignore>false</maven.test.failure.ignore>

6
log4j2/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.amqp.samples</groupId>
<artifactId>log4j2</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>jar</packaging>
<name>log4j2</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<version>2.6.0-M2</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring.framework.version>5.3.0-RC2</spring.framework.version>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
</properties>
<dependencies>

2
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-amqp-samples</artifactId>
<name>Spring AMQP Samples</name>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>pom</packaging>
<modules>
<module>helloworld</module>

6
spring-rabbit-confirms-returns/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.amqp.samples</groupId>
<artifactId>spring-rabbit-confirms-returns</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>jar</packaging>
<name>spring-rabbit-confirms-returns</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<version>2.6.0-M2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
</properties>
<dependencies>

6
spring-rabbit-global-errorhandler/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.example</groupId>
<artifactId>spring-rabbit-global-errorhandler</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>jar</packaging>
<name>spring-rabbit-global-errorhandler</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<version>2.6.0-M2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
</properties>
<dependencies>

12
spring-rabbit-global-errorhandler/src/main/java/org/springframework/amqp/samples/errorhandler/Application.java
View File

@@ -12,7 +12,6 @@ import org.springframework.amqp.rabbit.listener.ConditionalRejectingErrorHandler
import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
@@ -29,16 +28,13 @@ public class Application {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext context = SpringApplication.run(Application.class, args);
context.getBean(Application.class).runDemo();
context.getBean(Application.class).runDemo(context.getBean(RabbitTemplate.class));
context.close();
}
@Autowired
private RabbitTemplate template;
private void runDemo() throws Exception {
this.template.convertAndSend(TEST_QUEUE, new Foo("bar"));
this.template.convertAndSend(TEST_QUEUE, new Foo("bar"), m -> {
private void runDemo(RabbitTemplate template) throws Exception {
template.convertAndSend(TEST_QUEUE, new Foo("bar"));
template.convertAndSend(TEST_QUEUE, new Foo("bar"), m -> {
return new Message("some bad json".getBytes(), m.getMessageProperties());
});
Thread.sleep(5000);

6
spring-rabbit-json/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.example</groupId>
<artifactId>spring-rabbit-json</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>jar</packaging>
<name>spring-rabbit-json</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.3</version>
<version>2.6.0-M2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
</properties>
<dependencies>

27
spring-rabbit-json/src/main/java/org/springframework/amqp/samples/json/Application.java
View File

@@ -39,22 +39,17 @@ public class Application {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args);
ctx.getBean(Application.class).runDemo();
ctx.getBean(Application.class).runDemo(ctx.getBean("rabbitTemplate", RabbitTemplate.class),
ctx.getBean("jsonRabbitTemplate", RabbitTemplate.class));
ctx.close();
}
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private RabbitTemplate jsonRabbitTemplate;
@Autowired
private AmqpAdmin rabbitAdmin;
private volatile CountDownLatch latch = new CountDownLatch(2);
public void runDemo() throws Exception {
public void runDemo(RabbitTemplate rabbitTemplate, RabbitTemplate jsonRabbitTemplate) throws Exception {
String json = "{\"foo\" : \"value\" }";
Message jsonMessage = MessageBuilder.withBody(json.getBytes())
.andProperties(MessagePropertiesBuilder.newInstance().setContentType("application/json")
@@ -62,19 +57,19 @@ public class Application {
// inferred type
this.rabbitTemplate.send(INFERRED_FOO_QUEUE, jsonMessage);
this.rabbitTemplate.send(INFERRED_BAR_QUEUE, jsonMessage);
rabbitTemplate.send(INFERRED_FOO_QUEUE, jsonMessage);
rabbitTemplate.send(INFERRED_BAR_QUEUE, jsonMessage);
this.latch.await(10, TimeUnit.SECONDS);
// convertAndReceive with type
this.rabbitTemplate.send(RECEIVE_AND_CONVERT_QUEUE, jsonMessage);
this.rabbitTemplate.send(RECEIVE_AND_CONVERT_QUEUE, jsonMessage);
rabbitTemplate.send(RECEIVE_AND_CONVERT_QUEUE, jsonMessage);
rabbitTemplate.send(RECEIVE_AND_CONVERT_QUEUE, jsonMessage);
Foo foo = this.jsonRabbitTemplate.receiveAndConvert(RECEIVE_AND_CONVERT_QUEUE, 10_000,
Foo foo = jsonRabbitTemplate.receiveAndConvert(RECEIVE_AND_CONVERT_QUEUE, 10_000,
new ParameterizedTypeReference<Foo>() { });
System.out.println("Expected a Foo, got a " + foo);
Bar bar = this.jsonRabbitTemplate.receiveAndConvert(RECEIVE_AND_CONVERT_QUEUE, 10_000,
Bar bar = jsonRabbitTemplate.receiveAndConvert(RECEIVE_AND_CONVERT_QUEUE, 10_000,
new ParameterizedTypeReference<Bar>() { });
System.out.println("Expected a Bar, got a " + bar);
@@ -82,9 +77,9 @@ public class Application {
this.latch = new CountDownLatch(2);
jsonMessage.getMessageProperties().setHeader("__TypeId__", "foo");
this.rabbitTemplate.send(MAPPED_QUEUE, jsonMessage);
rabbitTemplate.send(MAPPED_QUEUE, jsonMessage);
jsonMessage.getMessageProperties().setHeader("__TypeId__", "bar");
this.rabbitTemplate.send(MAPPED_QUEUE, jsonMessage);
rabbitTemplate.send(MAPPED_QUEUE, jsonMessage);
this.latch.await(10, TimeUnit.SECONDS);
this.rabbitAdmin.deleteQueue(RECEIVE_AND_CONVERT_QUEUE);

4
stocks/pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples.spring</groupId>
<artifactId>spring-rabbit-stocks</artifactId>
<version>2.4.0-M2</version>
<version>2.4.0-M3</version>
<packaging>war</packaging>
<name>Spring Rabbit Stocks</name>
<url>https://www.spring.io</url>
@@ -16,7 +16,7 @@
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<spring.framework.version>5.3.7</spring.framework.version>
<spring.amqp.version>2.4.0-M2</spring.amqp.version>
<spring.amqp.version>2.4.0-M3</spring.amqp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.test.failure.ignore>false</maven.test.failure.ignore>