From 023cb8fdb36e69175d092a5437b54225f2ccd60d Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 13 Nov 2017 16:09:43 -0500
Subject: [PATCH] remove parameters since the Command has them #4262

---
 .../java/edu/harvard/iq/dataverse/EjbDataverseEngine.java    | 2 +-
 .../harvard/iq/dataverse/engine/command/AbstractCommand.java | 5 +++--
 .../edu/harvard/iq/dataverse/engine/command/Command.java     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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> R submit(Command<R> aCommand) throws CommandException {
             DataverseRequest dvReq = aCommand.getRequest();
             
             Map<String, DvObject> affectedDvObjects = aCommand.getAffectedDvObjects();
-            logRec.setInfo( aCommand.describe(affectedDvObjects) );
+            logRec.setInfo(aCommand.describe());
             for (Map.Entry<String, ? extends Set<Permission>> 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<R> implements Command<R> {
 
+    // FIXME: rename this from "affectedDataverses" to "affectedDvObjects". It's confusing.
     private final Map<String, DvObject> affectedDataverses;
     private final DataverseRequest request;
 
@@ -83,9 +84,9 @@ protected User getUser() {
     }
 
     @Override
-    public String describe(Map<String, DvObject> dvObjMap) {
+    public String describe() {
         StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, DvObject> ent : dvObjMap.entrySet()) {
+        for (Map.Entry<String, DvObject> ent : affectedDataverses.entrySet()) {
             DvObject value = ent.getValue();
             sb.append(ent.getKey()).append(":");
             sb.append((value != null) ? value.accept(DvObject.NameIdPrinter) : "<null>");
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<R> {
 	 */        
     Map<String,Set<Permission>> getRequiredPermissions();
 
-    public String describe(Map<String, DvObject> dvObjMap);
+    public String describe();
 }