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

RESOLVED - issue BATCH-1239: Add email-sending item writer

Browse Source 
Fix map generics for Spring 3
This commit is contained in:
dsyer
2010-01-13 10:40:27 +00:00
parent 2f66e56b84
commit 26de51c9b7
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure/pom.xml
View File

@@ -165,6 +165,11 @@
<artifactId>spring-context</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java
View File

@@ -102,9 +102,9 @@ public class SimpleMailMessageItemWriter implements ItemWriter<SimpleMailMessage
}
catch (MailSendException e) {
@SuppressWarnings("unchecked")
Map<SimpleMailMessage, MessagingException> failedMessages = e.getFailedMessages();
for (Entry<SimpleMailMessage, MessagingException> entry : failedMessages.entrySet()) {
mailErrorHandler.handle(entry.getKey(), entry.getValue());
Map<Object, Exception> failedMessages = e.getFailedMessages();
for (Entry<Object, Exception> entry : failedMessages.entrySet()) {
mailErrorHandler.handle((SimpleMailMessage) entry.getKey(), (MessagingException) entry.getValue());
}
}
}

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java
View File

@@ -106,9 +106,9 @@ public class MimeMessageItemWriter implements ItemWriter<MimeMessage> {
}
catch (MailSendException e) {
@SuppressWarnings("unchecked")
Map<MimeMessage, MessagingException> failedMessages = e.getFailedMessages();
for (Entry<MimeMessage, MessagingException> entry : failedMessages.entrySet()) {
mailErrorHandler.handle(new MimeMailMessage(entry.getKey()), entry.getValue());
Map<Object, Exception> failedMessages = e.getFailedMessages();
for (Entry<Object, Exception> entry : failedMessages.entrySet()) {
mailErrorHandler.handle(new MimeMailMessage((MimeMessage)entry.getKey()), (MessagingException)entry.getValue());
}
}
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java
View File

@@ -75,7 +75,7 @@ public class SimpleMailMessageItemWriterTests {
mailSender.send(EasyMock.aryEq(items));
EasyMock.expectLastCall().andThrow(
new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
EasyMock.replay(mailSender);
writer.write(Arrays.asList(items));
@@ -100,7 +100,7 @@ public class SimpleMailMessageItemWriterTests {
mailSender.send(EasyMock.aryEq(items));
EasyMock.expectLastCall().andThrow(
new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
EasyMock.replay(mailSender);
writer.write(Arrays.asList(items));

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java
View File

@@ -80,7 +80,7 @@ public class MimeMessageItemWriterTests {
mailSender.send(EasyMock.aryEq(items));
EasyMock.expectLastCall().andThrow(
new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
EasyMock.replay(mailSender);
writer.write(Arrays.asList(items));
@@ -105,7 +105,7 @@ public class MimeMessageItemWriterTests {
mailSender.send(EasyMock.aryEq(items));
EasyMock.expectLastCall().andThrow(
new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
new MailSendException(Collections.singletonMap((Object)foo, (Exception) new MessagingException("FOO"))));
EasyMock.replay(mailSender);
writer.write(Arrays.asList(items));