diff --git a/commons/src/main/java/org/archive/util/ArchiveUtils.java b/commons/src/main/java/org/archive/util/ArchiveUtils.java index 6e8e8d7f..54e6aa63 100644 --- a/commons/src/main/java/org/archive/util/ArchiveUtils.java +++ b/commons/src/main/java/org/archive/util/ArchiveUtils.java @@ -748,8 +748,16 @@ public class ArchiveUtils { * @param obj Object to prettify * @return prettified String */ + @SuppressWarnings("unchecked") public static String prettyString(Object obj) { - return "<"+obj+">"; + // these things have to checked and casted unfortunately + if (obj instanceof Object[]) { + return prettyString((Object[]) obj); + } else if (obj instanceof Map) { + return prettyString((Map) obj); + } else { + return "<"+obj+">"; + } } /** @@ -777,29 +785,27 @@ public class ArchiveUtils { } /** - * Provide a slightly-improved String of Map[] + * Provide a slightly-improved String of Object[] * - * @param Map[] - * @return prettified (in square brackets) of Map[] + * @param Object[] + * @return prettified (in square brackets) of Object[] */ - @SuppressWarnings("unchecked") - public static String prettyString(Map[] maps) { + public static String prettyString(Object[] array) { StringBuilder builder = new StringBuilder(); builder.append("[ "); boolean needsComma = false; - for( Map map : maps) { - if(map==null) continue; + for (Object o: array) { + if(o==null) continue; if(needsComma) { builder.append(", "); } - builder.append(prettyString(map)); + builder.append(prettyString(o)); needsComma = true; } builder.append(" ]"); return builder.toString(); } - private static String loadVersion() { InputStream input = ArchiveUtils.class.getResourceAsStream( "/org/archive/util/version.txt"); diff --git a/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java index 6596805f..d61f5ed8 100644 --- a/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java +++ b/modules/src/main/java/org/archive/modules/recrawl/PersistProcessor.java @@ -39,6 +39,7 @@ import org.apache.commons.lang.SerializationUtils; import org.archive.bdb.BdbModule; import org.archive.modules.CrawlURI; import org.archive.modules.Processor; +import org.archive.util.ArchiveUtils; import org.archive.util.FileUtils; import org.archive.util.IoUtils; import org.archive.util.OneLineSimpleLogger; @@ -198,7 +199,7 @@ public abstract class PersistProcessor extends Processor { Map alist = (Map) SerializationUtils.deserialize(Base64.decodeBase64(splits[1].getBytes("UTF-8"))); if (logger.isLoggable(Level.FINE)) { - logger.fine(splits[0] + " " + alist); + logger.fine(splits[0] + " " + ArchiveUtils.prettyString(alist)); } if (historyMap != null) { @@ -211,7 +212,7 @@ public abstract class PersistProcessor extends Processor { return count; } - + /** * Populates a new environment db from an old environment db or a persist * log. If path to new environment is not provided, only logs the entries