Update utils to more recent version, adapt to new packages, fix bug listing deleted...

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Album.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 9d990fe..44b37b7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -24,8 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import net.pterodactylus.util.collection.Mapper;
-import net.pterodactylus.util.collection.Mappers;
+import net.pterodactylus.util.collection.IterableWrapper;
+import net.pterodactylus.util.collection.filter.NotNullFilter;
+import net.pterodactylus.util.collection.mapper.Mapper;
 import net.pterodactylus.util.object.Default;
 import net.pterodactylus.util.validation.Validation;
 
@@ -207,7 +208,7 @@ public class Album implements Fingerprintable {
         * @return The images in this album
         */
        public List<Image> getImages() {
-               return Mappers.mappedList(imageIds, new Mapper<String, Image>() {
+               return IterableWrapper.wrap(imageIds).map(new Mapper<String, Image>() {
 
                        @Override
                        @SuppressWarnings("synthetic-access")
@@ -215,7 +216,7 @@ public class Album implements Fingerprintable {
                                return images.get(imageId);
                        }
 
-               });
+               }).filter(new NotNullFilter()).list();
        }
 
        /**