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

INT-3531 Update to Spring Framework 4.1.2

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3531

INT-3531 Fix Stub AMQP Channel

Compatibility with 3.4.x amqp-client.
This commit is contained in:
Gary Russell
2014-11-11 17:47:26 +02:00
committed by Artem Bilan
parent 5e0c7a1f19
commit 84b182162f
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -121,14 +121,14 @@ subprojects { subproject ->
tomcatVersion = "7.0.55"
smack3Version = '3.2.1'
smackVersion = '4.0.0'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.4.0.RC1'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.4.0.RELEASE'
springDataMongoVersion = '1.6.0.RELEASE'
springDataRedisVersion = '1.4.0.RELEASE'
springGemfireVersion = '1.5.0.RELEASE'
springSecurityVersion = '3.2.5.RELEASE'
springSocialTwitterVersion = '1.1.0.RELEASE'
springRetryVersion = '1.1.1.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.1.1.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.1.2.RELEASE'
springWsVersion = '2.2.0.RELEASE'
xmlUnitVersion = '1.5'
xstreamVersion = '1.4.7'

34
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java
View File

@@ -537,6 +537,40 @@ public class StubRabbitConnectionFactory implements ConnectionFactory {
public void basicPublish(String arg0, String arg1, boolean arg2, BasicProperties arg3, byte[] arg4)
throws IOException {
}
@Override
public void exchangeDeclareNoWait(String exchange, String type, boolean durable, boolean autoDelete,
boolean internal, Map<String, Object> arguments) throws IOException {
}
@Override
public void exchangeDeleteNoWait(String exchange, boolean ifUnused) throws IOException {
}
@Override
public void exchangeBindNoWait(String destination, String source, String routingKey,
Map<String, Object> arguments) throws IOException {
}
@Override
public void exchangeUnbindNoWait(String destination, String source, String routingKey,
Map<String, Object> arguments) throws IOException {
}
@Override
public void queueDeclareNoWait(String queue, boolean durable, boolean exclusive, boolean autoDelete,
Map<String, Object> arguments) throws IOException {
}
@Override
public void queueDeleteNoWait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException {
}
@Override
public void queueBindNoWait(String queue, String exchange, String routingKey, Map<String, Object> arguments)
throws IOException {
}
}
}

19
spring-integration-mail/src/test/java/org/springframework/integration/mail/StubJavaMailSender.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2014 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.
@@ -30,10 +30,11 @@ import org.springframework.mail.javamail.MimeMessagePreparator;
/**
* @author Marius Bogoevici
* @author Gary Russell
*/
public class StubJavaMailSender implements JavaMailSender {
private MimeMessage uniqueMessage;
private final MimeMessage uniqueMessage;
private final List<MimeMessage> sentMimeMessages = new ArrayList<MimeMessage>();
@@ -53,35 +54,43 @@ public class StubJavaMailSender implements JavaMailSender {
return this.sentSimpleMailMessages;
}
@Override
public MimeMessage createMimeMessage() {
return this.uniqueMessage;
}
@Override
public MimeMessage createMimeMessage(InputStream contentStream) throws MailException {
return this.uniqueMessage;
}
@Override
public void send(MimeMessage mimeMessage) throws MailException {
this.sentMimeMessages.add(mimeMessage);
}
public void send(MimeMessage[] mimeMessages) throws MailException {
@Override
public void send(MimeMessage... mimeMessages) throws MailException {
this.sentMimeMessages.addAll(Arrays.asList(mimeMessages));
}
@Override
public void send(MimeMessagePreparator mimeMessagePreparator) throws MailException {
throw new UnsupportedOperationException("MimeMessagePreparator not supported");
}
public void send(MimeMessagePreparator[] mimeMessagePreparators) throws MailException {
@Override
public void send(MimeMessagePreparator... mimeMessagePreparators) throws MailException {
throw new UnsupportedOperationException("MimeMessagePreparator not supported");
}
@Override
public void send(SimpleMailMessage simpleMessage) throws MailException {
this.sentSimpleMailMessages.add(simpleMessage);
}
public void send(SimpleMailMessage[] simpleMessages) throws MailException {
@Override
public void send(SimpleMailMessage... simpleMessages) throws MailException {
this.sentSimpleMailMessages.addAll(Arrays.asList(simpleMessages));
}