🎨 Replace image count comparator with Kotlin version

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 4dd9a8e..836baa1 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -18,13 +18,11 @@
 package net.pterodactylus.sone.data;
 
 import static com.google.common.collect.FluentIterable.from;
 package net.pterodactylus.sone.data;
 
 import static com.google.common.collect.FluentIterable.from;

-import static java.util.Arrays.asList;

 import static net.pterodactylus.sone.data.Album.FLATTENER;
 import static net.pterodactylus.sone.data.Album.IMAGES;
 
 import java.util.Collection;
 import java.util.Collections;
 import static net.pterodactylus.sone.data.Album.FLATTENER;
 import static net.pterodactylus.sone.data.Album.IMAGES;
 
 import java.util.Collection;
 import java.util.Collections;

-import java.util.Comparator;

 import java.util.List;
 import java.util.Set;
 
 import java.util.List;
 import java.util.Set;
 


@@ -36,7 +34,6 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import freenet.keys.FreenetURI;
 
 import com.google.common.base.Function;
 import freenet.keys.FreenetURI;
 
 import com.google.common.base.Function;

-import com.google.common.primitives.Ints;

 
 /**
  * A Sone defines everything about a user: her profile, her status updates, her
 
 /**
  * A Sone defines everything about a user: her profile, her status updates, her


@@ -62,21 +59,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
                downloading,
        }
 
                downloading,
        }
 

-       /** Comparator that sorts Sones by number of images (descending). */
-       public static final Comparator<Sone> IMAGE_COUNT_COMPARATOR = new Comparator<Sone>() {
-
-               /**
-                * {@inheritDoc}
-                */
-               @Override
-               public int compare(Sone leftSone, Sone rightSone) {
-                       int rightSoneImageCount = from(asList(rightSone.getRootAlbum())).transformAndConcat(FLATTENER).transformAndConcat(IMAGES).size();
-                       int leftSoneImageCount = from(asList(leftSone.getRootAlbum())).transformAndConcat(FLATTENER).transformAndConcat(IMAGES).size();
-                       /* sort descending. */
-                       return Ints.compare(rightSoneImageCount, leftSoneImageCount);
-               }
-       };
-

        public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
                @Override
                public List<Album> apply(@Nullable Sone sone) {
        public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
                @Override
                public List<Album> apply(@Nullable Sone sone) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/data/Sone.kt b/src/main/kotlin/net/pterodactylus/sone/data/Sone.kt
index c44d6e8..3f70ad7 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/data/Sone.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/data/Sone.kt
@@ -48,3 +48,6 @@ val postCountComparator: Comparator<Sone> =
                comparing<Sone, Int> { it.posts.size }
                                .thenComparing<Int> { it.replies.size }
                                .reversed()
                comparing<Sone, Int> { it.posts.size }
                                .thenComparing<Int> { it.replies.size }
                                .reversed()

+
+val imageCountComparator: Comparator<Sone> =
+               comparing<Sone, Int> { it.rootAlbum.allImages.size }.reversed()

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
index 392dd93..01d1d22 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@ -28,7 +28,7 @@ class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Lo
                                        .filterNot { soneRequest.parameters["filter"] == "not-own" && it.isLocal }
                                        .sortedWith(
                                                        when (soneRequest.parameters["sort"]) {
                                        .filterNot { soneRequest.parameters["filter"] == "not-own" && it.isLocal }
                                        .sortedWith(
                                                        when (soneRequest.parameters["sort"]) {

-                                                               "images" -> Sone.IMAGE_COUNT_COMPARATOR
+                                                               "images" -> imageCountComparator

                                                                "name" -> niceNameComparator.reversed()
                                                                "posts" -> postCountComparator
                                                                else -> lastActivityComparator
                                                                "name" -> niceNameComparator.reversed()
                                                                "posts" -> postCountComparator
                                                                else -> lastActivityComparator

diff --git a/src/test/kotlin/net/pterodactylus/sone/data/SoneTest.kt b/src/test/kotlin/net/pterodactylus/sone/data/SoneTest.kt
index 6b7e51d..1429e54 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/data/SoneTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/data/SoneTest.kt
@@ -120,4 +120,26 @@ class SoneTest {
                assertThat(postCountComparator.compare(sone1, sone2), equalTo(0))
        }
 
                assertThat(postCountComparator.compare(sone1, sone2), equalTo(0))
        }
 

+       @Test
+       fun `image count comparator sorts Sones correctly if number of images is different`() {
+               val sone1 = object : IdOnlySone("1") {
+                       override fun getRootAlbum() = AlbumImpl(this).also { it.addImage(createImage(this)) }
+               }
+               val sone2 = object : IdOnlySone("2") {
+                       override fun getRootAlbum() = AlbumImpl(this).also { it.addImage(createImage(this)); it.addImage(createImage(this)) }
+               }
+               assertThat(imageCountComparator.compare(sone1, sone2), greaterThan(0))
+       }
+
+       @Test
+       fun `image count comparator treats Sones as equal if number of images is the same`() {
+               val sone1 = object : IdOnlySone("1") {
+                       override fun getRootAlbum() = AlbumImpl(this).also { it.addImage(createImage(this)) }
+               }
+               val sone2 = object : IdOnlySone("2") {
+                       override fun getRootAlbum() = AlbumImpl(this).also { it.addImage(createImage(this)) }
+               }
+               assertThat(imageCountComparator.compare(sone1, sone2), equalTo(0))
+       }
+

 }
 }

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
index b273b82..65f279a 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
@@ -61,3 +61,6 @@ fun emptyPostReply(text: String = "", post: Post? = createPost(), sone: Sone = r
        override fun isKnown() = known
        override fun setKnown(known: Boolean): PostReply = this
 }
        override fun isKnown() = known
        override fun setKnown(known: Boolean): PostReply = this
 }

+
+fun createImage(sone: Sone): Image =
+               ImageImpl().modify().setSone(sone).update()