1 files changed, 7 insertions, 4 deletions
diff --git a/juick-notifications/src/main/java/com/juick/components/CleanUp.java b/juick-notifications/src/main/java/com/juick/components/CleanUp.java
index 7b800fec..9714e597 100644
--- a/juick-notifications/src/main/java/com/juick/components/CleanUp.java
+++ b/juick-notifications/src/main/java/com/juick/components/CleanUp.java
@@ -8,8 +8,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * Created by vitalyster on 22.11.2016.
@@ -34,12 +34,15 @@ public class CleanUp {
         int count = devices.size();
         if (count > 0) {
             logger.info("{} tokens to delete", count);
-            tokenService.deleteTokens("apns", new ArrayList<>(devices));
+            tokenService.deleteTokens("apns", devices.stream().collect(Collectors.toList()));
         } else {
-            logger.info("No APNS tokens to delete");
+            logger.debug("No APNS tokens to delete");
         }
         logger.debug("initializing GCM tokens cleanup: {} tokens", push.getInvalidGCMTokens().size());
-        tokenService.deleteTokens("gcm", push.getInvalidGCMTokens());
+        tokenService.deleteTokens("gcm", push.getInvalidGCMTokens().stream().collect(Collectors.toList()));
         push.cleanupGCMTokens();
+        logger.debug("initializing MPNS tokens cleanup: {} tokens", push.getInvalidMPNSTokens().size());
+        tokenService.deleteTokens("mpns", push.getInvalidMPNSTokens().stream().collect(Collectors.toList()));
+        push.cleanupMPNSTokens();
     }
 }