From 26de51c9b73d6bdc3146a63e41afbb2676a7f18f Mon Sep 17 00:00:00 2001 From: dsyer Date: Wed, 13 Jan 2010 10:40:27 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1239: Add email-sending item writer Fix map generics for Spring 3 --- spring-batch-infrastructure/pom.xml | 5 +++++ .../batch/item/mail/SimpleMailMessageItemWriter.java | 6 +++--- .../batch/item/mail/javamail/MimeMessageItemWriter.java | 6 +++--- .../batch/item/mail/SimpleMailMessageItemWriterTests.java | 4 ++-- .../item/mail/javamail/MimeMessageItemWriterTests.java | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index c9648633e..547ff28a7 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -165,6 +165,11 @@ spring-context true + + org.springframework + spring-context-support + true + org.springframework spring-jdbc diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java index fff227c71..cad5d38d3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java @@ -102,9 +102,9 @@ public class SimpleMailMessageItemWriter implements ItemWriter failedMessages = e.getFailedMessages(); - for (Entry entry : failedMessages.entrySet()) { - mailErrorHandler.handle(entry.getKey(), entry.getValue()); + Map failedMessages = e.getFailedMessages(); + for (Entry entry : failedMessages.entrySet()) { + mailErrorHandler.handle((SimpleMailMessage) entry.getKey(), (MessagingException) entry.getValue()); } } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java index d0b9822a6..00e3e3ca1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java @@ -106,9 +106,9 @@ public class MimeMessageItemWriter implements ItemWriter { } catch (MailSendException e) { @SuppressWarnings("unchecked") - Map failedMessages = e.getFailedMessages(); - for (Entry entry : failedMessages.entrySet()) { - mailErrorHandler.handle(new MimeMailMessage(entry.getKey()), entry.getValue()); + Map failedMessages = e.getFailedMessages(); + for (Entry entry : failedMessages.entrySet()) { + mailErrorHandler.handle(new MimeMailMessage((MimeMessage)entry.getKey()), (MessagingException)entry.getValue()); } } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java index 029232bfb..726957e47 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java @@ -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)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java index dfef86c5b..53e21e502 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java @@ -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));