Generic class for functions.

src/com/dmdirc/util/collections/URLEncodingMapFlattener.java → src/com/dmdirc/util/collections/CollectionFunctions.java

@@ -25,17 +25,17 @@ package com.dmdirc.util.collections;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 /**
- * Flattens a map into a key=value pair, URLEncoding both the key and the entry.
+ * Collection related functions.
  */
-public class URLEncodingMapFlattener
-        implements Function<Map.Entry<String, String>, Stream<String>> {
+public final class CollectionFunctions {
 
-    @Override
-    public Stream<String> apply(final Map.Entry<String, String> entry) {
+    private CollectionFunctions() {
+    }
+
+    public static Stream<String> flattenAndEncodeKeyPair(final Map.Entry<String, String> entry) {
         String key;
         String value;
         try {

src/com/dmdirc/util/io/Downloader.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.util.io;
 
-import com.dmdirc.util.collections.URLEncodingMapFlattener;
+import com.dmdirc.util.collections.CollectionFunctions;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -82,7 +82,7 @@ public class Downloader {
     public List<String> getPage(final String url,
             final Map<String, String> postData) throws IOException {
         return getPage(url, postData.entrySet().stream()
-                .flatMap(e -> new URLEncodingMapFlattener().apply(e))
+                .flatMap(CollectionFunctions::flattenAndEncodeKeyPair)
                 .collect(Collectors.joining("&")));
     }
 

test/com/dmdirc/util/collections/URLEncodingMapFlattenerTest.java → test/com/dmdirc/util/collections/CollectionFunctionsTest.java

@@ -28,32 +28,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
 
 import static junit.framework.TestCase.assertEquals;
 
-@RunWith(MockitoJUnitRunner.class)
-public class URLEncodingMapFlattenerTest {
+public class CollectionFunctionsTest {
 
-    private URLEncodingMapFlattener instance;
-    private Map<String, String> map;
-
-    @Before
-    public void setUp() throws Exception {
-        instance = new URLEncodingMapFlattener();
-        map = ImmutableMap.<String, String>builder()
+    @Test
+    public void testflattenAndEncodeKeyPair() throws Exception {
+        final Map<String, String> map = ImmutableMap.<String, String>builder()
                 .put("key", "value")
                 .put("key&", "value&")
                 .build();
-    }
-
-    @Test
-    public void testApply() throws Exception {
         final List<String> result = map.entrySet().stream()
-                .flatMap(instance)
+                .flatMap(CollectionFunctions::flattenAndEncodeKeyPair)
                 .collect(Collectors.toList());
         assertEquals(2, result.size());
         assertEquals("key=value", result.get(0));