diff --git a/dspace-api/src/main/java/org/dspace/curate/Curation.java b/dspace-api/src/main/java/org/dspace/curate/Curation.java index 2f578a5cfe..b3af072a32 100644 --- a/dspace-api/src/main/java/org/dspace/curate/Curation.java +++ b/dspace-api/src/main/java/org/dspace/curate/Curation.java @@ -189,8 +189,7 @@ public class Curation extends DSpaceRunnable { * @throws FileNotFoundException If file of command line variable -r reporter is not found */ private Curator initCurator() throws FileNotFoundException { - Curator curator = new Curator(); - curator.setLogHandler(handler); + Curator curator = new Curator(handler); OutputStream reporterStream; if (null == this.reporter) { reporterStream = new NullOutputStream(); diff --git a/dspace-api/src/main/java/org/dspace/curate/Curator.java b/dspace-api/src/main/java/org/dspace/curate/Curator.java index 9e9d05cd46..90932cdf8c 100644 --- a/dspace-api/src/main/java/org/dspace/curate/Curator.java +++ b/dspace-api/src/main/java/org/dspace/curate/Curator.java @@ -9,6 +9,7 @@ package org.dspace.curate; import java.io.IOException; import java.sql.SQLException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -93,6 +94,16 @@ public class Curator { protected HandleService handleService; protected DSpaceRunnableHandler handler; + /** + * constructor that uses an handler for logging + * + * @param handler {@code DSpaceRunnableHandler} used to logs infos + */ + public Curator(DSpaceRunnableHandler handler) { + this(); + this.handler = handler; + } + /** * No-arg constructor */ @@ -607,11 +618,11 @@ public class Curator { return mb.toString(); } - protected void logInfo(String id) { + protected void logInfo(String message) { if (handler == null) { - log.info(logMessage(id)); + log.info(message); } else { - handler.logInfo(logMessage(id)); + handler.logInfo(message); } } @@ -629,11 +640,11 @@ public class Curator { log.warn(message); } } else { - handler.logWarning(message); + if (object != null) { + handler.logWarning(MessageFormat.format(message, object)); + } else { + handler.logWarning(message); + } } } - - public void setLogHandler(DSpaceRunnableHandler handler) { - this.handler = handler; - } }