move describe from EjbDataverseEngine to Command interface #4262

IQSS · Nov 13, 2017 · 26eb11d · scolapasta · Nov 13, 2017 · pdurbin
1 parent 529b1e7
commit 26eb11d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git 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( describe(affectedDvObjects) );
+            logRec.setInfo( aCommand.describe(affectedDvObjects) );
             for (Map.Entry<String, ? extends Set<Permission>> pair : requiredMap.entrySet()) {
                 String dvName = pair.getKey();
                 if (!affectedDvObjects.containsKey(dvName)) {
@@ -442,16 +442,5 @@ public DataCaptureModuleServiceBean dataCaptureModule() {
 
         return ctxt;
     }
-
-
-    private String describe( Map<String, DvObject> dvObjMap ) {
-        StringBuilder sb = new StringBuilder();
-        for ( Map.Entry<String, DvObject> ent : dvObjMap.entrySet() ) {
-            DvObject value = ent.getValue();
-            sb.append(ent.getKey()).append(":");
-            sb.append( (value!=null) ? value.accept(DvObject.NameIdPrinter) : "<null>");
-            sb.append(" ");
-        }
-        return sb.toString();
-    }
+
 }
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
@@ -81,4 +81,17 @@ public Map<String, Set<Permission>> getRequiredPermissions() {
     protected User getUser() {
        return getRequest().getUser();
     }
+
+    @Override
+    public String describe(Map<String, DvObject> dvObjMap) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, DvObject> ent : dvObjMap.entrySet()) {
+            DvObject value = ent.getValue();
+            sb.append(ent.getKey()).append(":");
+            sb.append((value != null) ? value.accept(DvObject.NameIdPrinter) : "<null>");
+            sb.append(" ");
+        }
+        return sb.toString();
+    }
+
 }
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
@@ -41,5 +41,6 @@ public interface Command<R> {
 	 * @return A map of the permissions required for this command
 	 */        
     Map<String,Set<Permission>> getRequiredPermissions();
-
+
+    public String describe(Map<String, DvObject> dvObjMap);
 }