Skip to content

Commit

Permalink
BugID: 593
Browse files Browse the repository at this point in the history
  • Loading branch information
mspasiano committed Apr 14, 2011
1 parent b34a7e3 commit b9822e0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 23 deletions.
24 changes: 11 additions & 13 deletions sigla-ejb/src/main/java/it/cnr/contab/util/service/MailService.java
Expand Up @@ -32,9 +32,9 @@ public class MailService {

private String defaultSubject;
private String defaultText;
private String toTestModeList;
private List<String> toTestModeList;

public void setToTestModeList(String toTestModeList) {
public void setToTestModeList(List<String> toTestModeList) {
this.toTestModeList = toTestModeList;
}

Expand Down Expand Up @@ -78,9 +78,7 @@ public void send(List<String> to, List<String> cc, List<String> bcc, String subj
try{
MessagePreparator messagePreparator = new MessagePreparator(
fromAddress,
testMode?toTestModeList:convertListToAddress(to),
convertListToAddress(cc),
convertListToAddress(bcc),
testMode?toTestModeList:to,cc,bcc,
subject,
messageText.toString());
mailSender.send(messagePreparator);
Expand Down Expand Up @@ -131,13 +129,13 @@ private String convertListToAddress(List<String> source){

class MessagePreparator implements MimeMessagePreparator{
private final String from;
private final String to;
private final String cc;
private final String bcc;
private final List<String> to;
private final List<String> cc;
private final List<String> bcc;
private final String subject;
private final String text;

public MessagePreparator(String from, String to, String cc, String bcc,
public MessagePreparator(String from, List<String> to, List<String> cc, List<String> bcc,
String subject, String text) {
super();
this.from = from;
Expand All @@ -151,11 +149,11 @@ public MessagePreparator(String from, String to, String cc, String bcc,
public void prepare(MimeMessage mimeMessage) throws Exception {
MimeMessageHelper message = new MimeMessageHelper(mimeMessage, true, "UTF-8");
message.setFrom(from);
message.setTo(to);
if (cc != null)
message.setCc(cc);
message.setTo(to.toArray(new String[to.size()]));
if (cc != null && !cc.isEmpty())
message.setCc(cc.toArray(new String[cc.size()]));
if (bcc != null)
message.setBcc(bcc);
message.setBcc(bcc.toArray(new String[bcc.size()]));
message.setSubject(subject);
message.setText(text, true);
}
Expand Down
Expand Up @@ -7,11 +7,14 @@
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">

<bean id="mail.avviso.di.pagamento.to.test.mode" class="java.lang.String">
<constructor-arg>
<value>marco.spasiano@cnr.it;matilde.durso@cnr.it</value>
</constructor-arg>
</bean>
<bean id="mail.avviso.di.pagamento.to.test.mode" class="java.util.List">
<constructor-arg>
<list>
<value>marco.spasiano@cnr.it</value>
<value>matilde.durso@cnr.it</value>
</list>
</constructor-arg>
</bean>
<bean id="avviso.di.pagamento.mail.subject" class="java.lang.String">
<constructor-arg>
<value><![CDATA[[sigla] Pagamento Mandato]]></value>
Expand Down
Expand Up @@ -70,11 +70,13 @@
<value>sigla@cnr.it</value>
</constructor-arg>
</bean>
<bean id="defaultToTestMode" class="java.lang.String">
<constructor-arg>
<value>sigla@cnr.it</value>
</constructor-arg>
</bean>
<bean id="defaultToTestMode" class="java.util.List">
<constructor-arg>
<list>
<value>sigla@cnr.it</value>
</list>
</constructor-arg>
</bean>
<bean id="mailService" class="it.cnr.contab.util.service.MailService">
<property name="toTestModeList" ref="defaultToTestMode"/>
</bean>
Expand Down

0 comments on commit b9822e0

Please sign in to comment.