From a263ab9f1dbac3fe6b83f28e2952e8d0ef088f65 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 30 Jun 2011 12:04:20 +0000
Subject: [PATCH] [LMS-2301] improvements for sending emails
SVN: 21930
---
.../server/plugins/jython/EmailSender.java | 16 ++++++++++++++++
.../plugins/jython/PluginScriptRunner.java | 2 +-
.../server/plugins/jython/api/IEmailSender.java | 4 ++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
index 0705f96eb4f..db4945abfa9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
@@ -64,6 +64,10 @@ public class EmailSender implements IEmailSender
public IEmailSender withAttachedFile(String filePath, String attachmentName)
{
+ if (attachmentName == null)
+ {
+ throw new IllegalArgumentException("Unspecified attachment name.");
+ }
if (attachmentTextOrNull != null)
{
throw new IllegalStateException("Attachment text was already set.");
@@ -75,6 +79,10 @@ public class EmailSender implements IEmailSender
public IEmailSender withAttachedText(String text, String attachmentName)
{
+ if (attachmentName == null)
+ {
+ throw new IllegalArgumentException("Unspecified attachment name.");
+ }
if (attachmentFilePathOrNull != null)
{
throw new IllegalStateException("Attachment file path was already set.");
@@ -84,6 +92,14 @@ public class EmailSender implements IEmailSender
return this;
}
+ @Override
+ public String toString()
+ {
+ return "EmailSender [subject=" + subject + ", bodyText=" + bodyText
+ + ", attachmentNameOrNull=" + attachmentNameOrNull + ", attachmentFilePathOrNull="
+ + attachmentFilePathOrNull + ", attachmentTextOrNull=" + attachmentTextOrNull + "]";
+ }
+
// sender
public void send()
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java
index d2be4ab35fd..1ca236f2c1a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java
@@ -138,7 +138,7 @@ class PluginScriptRunner
private static ISearchService createSearchService()
{
- return ServiceProvider.getSearchServiceProvider();
+ return ServiceProvider.getSearchService();
}
private static IMailService createMailService(DataSetProcessingContext context)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
index 8621f821882..8bd4b51e089 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
@@ -28,9 +28,9 @@ public interface IEmailSender
IEmailSender withBody(String bodyText);
- IEmailSender withAttachedFile(String attachmentFilePath, String attachmentName);
+ IEmailSender withAttachedFile(String attachmentFilePath, String attachmentFileName);
- IEmailSender withAttachedText(String attachmentText, String attachmentName);
+ IEmailSender withAttachedText(String attachmentText, String attachmentFileName);
void send();
}
--
GitLab