From de2cc2db73a5de42d9bfaeb92604f28abe2a328a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 24 Oct 2017 17:18:29 +0300
Subject: crosspost: refactoring

* spring-social
* get tokens via service api
---
 .../src/main/java/com/juick/components/Notifications.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'juick-notifications/src/main/java/com/juick/components/Notifications.java')

diff --git a/juick-notifications/src/main/java/com/juick/components/Notifications.java b/juick-notifications/src/main/java/com/juick/components/Notifications.java
index f9d8870f..d160cdc4 100644
--- a/juick-notifications/src/main/java/com/juick/components/Notifications.java
+++ b/juick-notifications/src/main/java/com/juick/components/Notifications.java
@@ -19,7 +19,7 @@ package com.juick.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.android.gcm.server.*;
-import com.juick.DeviceRegistration;
+import com.juick.ExternalToken;
 import com.juick.User;
 import com.juick.formatters.PlainTextFormatter;
 import com.turo.pushy.apns.ApnsClient;
@@ -103,8 +103,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
             }
 
             // GCM
-            List<String> regids = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("gcm"))
-                    .map(DeviceRegistration::getToken).collect(Collectors.toList());
+            List<String> regids = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("gcm"))
+                    .map(ExternalToken::getToken).collect(Collectors.toList());
             if (!regids.isEmpty()) {
                 try {
                     String json = jsonMapper.writeValueAsString(jmsg);
@@ -134,8 +134,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
             }
 
             /*** WinPhone ***/
-            List<String> urls = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("mpns"))
-                    .map(DeviceRegistration::getToken).collect(Collectors.toList());
+            List<String> urls = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("mpns"))
+                    .map(ExternalToken::getToken).collect(Collectors.toList());
 
             if (urls.isEmpty()) {
                 logger.info("WNS: no recipients");
@@ -170,8 +170,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
             }
 
             /*** iOS ***/
-            List<String> tokens = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("apns"))
-                    .map(DeviceRegistration::getToken).collect(Collectors.toList());
+            List<String> tokens = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("apns"))
+                    .map(ExternalToken::getToken).collect(Collectors.toList());
             if (!tokens.isEmpty()) {
                 ApnsPayloadBuilder apnsPayloadBuilder = new ApnsPayloadBuilder();
                 String post = PlainTextFormatter.formatPost(jmsg);
-- 
cgit v1.2.3