diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java index ee44e7b3459..e36f7feaec3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java +++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java @@ -182,7 +182,7 @@ public R submit(Command aCommand) throws CommandException { DataverseRequest dvReq = aCommand.getRequest(); Map affectedDvObjects = aCommand.getAffectedDvObjects(); - logRec.setInfo( aCommand.describe(affectedDvObjects) ); + logRec.setInfo(aCommand.describe()); for (Map.Entry> pair : requiredMap.entrySet()) { String dvName = pair.getKey(); if (!affectedDvObjects.containsKey(dvName)) { diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java index 042585501c8..851c193f8ff 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java @@ -16,6 +16,7 @@ */ public abstract class AbstractCommand implements Command { + // FIXME: rename this from "affectedDataverses" to "affectedDvObjects". It's confusing. private final Map affectedDataverses; private final DataverseRequest request; @@ -83,9 +84,9 @@ protected User getUser() { } @Override - public String describe(Map dvObjMap) { + public String describe() { StringBuilder sb = new StringBuilder(); - for (Map.Entry ent : dvObjMap.entrySet()) { + for (Map.Entry ent : affectedDataverses.entrySet()) { DvObject value = ent.getValue(); sb.append(ent.getKey()).append(":"); sb.append((value != null) ? value.accept(DvObject.NameIdPrinter) : ""); diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/Command.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/Command.java index f78fc80bb41..c6093432092 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/Command.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/Command.java @@ -42,5 +42,5 @@ public interface Command { */ Map> getRequiredPermissions(); - public String describe(Map dvObjMap); + public String describe(); }