Extract ordering functions to MammothLists

2 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java b/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java
index 4262e03..50bf85b 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java
+++ b/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java
@@ -1,11 +1,9 @@
 package org.zwobble.mammoth.html;
 
-import com.google.common.base.Function;
-import com.google.common.collect.Ordering;
-
-import java.util.List;
 import java.util.Map;
 
+import static org.zwobble.mammoth.util.MammothLists.orderedBy;
+
 public class HtmlWriter {
     public static String escapeText(String text) {
         return text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
@@ -16,10 +14,7 @@ public class HtmlWriter {
     }
 
     public static void generateAttributes(Map<String, String> attributes, StringBuilder builder) {
-        List<Map.Entry<String, String>> sortedAttributes = orderBy(Map.Entry<String, String>::getKey)
-            .sortedCopy(attributes.entrySet());
-
-        for (Map.Entry<String, String> attribute : sortedAttributes) {
+        for (Map.Entry<String, String> attribute : orderedBy(attributes.entrySet(), Map.Entry::getKey)) {
             builder
                 .append(" ")
                 .append(attribute.getKey())
@@ -28,8 +23,4 @@ public class HtmlWriter {
                 .append("\"");
         }
     }
-
-    private static <T, R extends Comparable<R>> Ordering<T> orderBy(Function<T, R> getKey) {
-        return Ordering.from((first, second) -> getKey.apply(first).compareTo(getKey.apply(second)));
-    }
 }
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothLists.java b/src/main/java/org/zwobble/mammoth/util/MammothLists.java
index 59f23f8..d6d1136 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/util/MammothLists.java
@@ -3,6 +3,7 @@ package org.zwobble.mammoth.util;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
 
 import java.util.List;
 
@@ -22,4 +23,12 @@ public class MammothLists {
     public static <T, R> List<R> eagerFlatMap(Iterable<T> iterable, Function<T, Iterable<R>> function) {
         return ImmutableList.copyOf(Iterables.concat(Iterables.transform(iterable, function)));
     }
+
+    public static <T, R extends Comparable<R>> List<T> orderedBy(Iterable<T> iterable, Function<T, R> getKey) {
+        return orderBy(getKey).sortedCopy(iterable);
+    }
+
+    private static <T, R extends Comparable<R>> Ordering<T> orderBy(Function<T, R> getKey) {
+        return Ordering.from((first, second) -> getKey.apply(first).compareTo(getKey.apply(second)));
+    }
 }