1 files changed, 6 insertions, 16 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 9714e597..d0f3e44a 100644
--- a/juick-notifications/src/main/java/com/juick/components/CleanUp.java
+++ b/juick-notifications/src/main/java/com/juick/components/CleanUp.java
@@ -1,15 +1,13 @@
 package com.juick.components;
 
 import com.juick.components.service.TokenService;
-import com.notnoop.apns.ApnsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
-import java.util.Collection;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
 
 /**
  * Created by vitalyster on 22.11.2016.
@@ -20,8 +18,6 @@ public class CleanUp {
     private static Logger logger = LoggerFactory.getLogger(CleanUp.class);
 
     @Inject
-    ApnsService apns;
-    @Inject
     TokenService tokenService;
 
     @Inject
@@ -29,20 +25,14 @@ public class CleanUp {
 
     @Scheduled(fixedRate = 600000)
     public void cleanupTokens() {
-        logger.info("initializing apns tokens cleanup");
-        Collection<String> devices = apns.getInactiveDevices().keySet();
-        int count = devices.size();
-        if (count > 0) {
-            logger.info("{} tokens to delete", count);
-            tokenService.deleteTokens("apns", devices.stream().collect(Collectors.toList()));
-        } else {
-            logger.debug("No APNS tokens to delete");
-        }
         logger.debug("initializing GCM tokens cleanup: {} tokens", push.getInvalidGCMTokens().size());
-        tokenService.deleteTokens("gcm", push.getInvalidGCMTokens().stream().collect(Collectors.toList()));
+        tokenService.deleteTokens("gcm", new ArrayList<>(push.getInvalidGCMTokens()));
         push.cleanupGCMTokens();
         logger.debug("initializing MPNS tokens cleanup: {} tokens", push.getInvalidMPNSTokens().size());
-        tokenService.deleteTokens("mpns", push.getInvalidMPNSTokens().stream().collect(Collectors.toList()));
+        tokenService.deleteTokens("mpns", new ArrayList<>(push.getInvalidMPNSTokens()));
+        push.cleanupMPNSTokens();
+        logger.debug("initializing APNS tokens cleanup: {} tokens", push.getInvalidAPNSTokens().size());
+        tokenService.deleteTokens("apns", new ArrayList<>(push.getInvalidAPNSTokens()));
         push.cleanupMPNSTokens();
     }
 }