usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [10/50] [abbrv] incubator-usergrid git commit: fixed abstract class name
Date Fri, 12 Dec 2014 14:30:09 GMT
fixed abstract class name


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4bf4d715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4bf4d715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4bf4d715

Branch: refs/heads/no-source-in-es
Commit: 4bf4d715fc11877d672541e0aa04714f7f0c2a9d
Parents: e9cecff
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Dec 8 15:15:00 2014 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Dec 8 15:15:00 2014 -0700

----------------------------------------------------------------------
 .../persistence/queue/DefaultQueueManager.java      |  4 ++--
 .../AbstractServiceNotificationIT.java              | 16 +---------------
 .../notifications/apns/NotificationsServiceIT.java  |  2 --
 .../notifications/gcm/NotificationsServiceIT.java   |  9 +++++++--
 4 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4bf4d715/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index 354aa7b..d9fddd3 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -24,13 +24,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ArrayBlockingQueue;
 
 /**
  * Default queue manager implementation, uses in memory linked queue
  */
 public class DefaultQueueManager implements QueueManager {
-    public ConcurrentLinkedQueue<QueueMessage> queue = new ConcurrentLinkedQueue<>();
+    public ArrayBlockingQueue<QueueMessage> queue = new ArrayBlockingQueue<>(10000);
     @Override
     public synchronized List<QueueMessage> getMessages(int limit, int transactionTimeout,
int waitTime, Class klass) {
         List<QueueMessage> returnQueue = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4bf4d715/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
index 1fd6f3e..55bb91f 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
@@ -39,28 +39,14 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 
-public class AbstractServiceNotificationIT extends AbstractServiceIT {
+public abstract class AbstractServiceNotificationIT extends AbstractServiceIT {
     private NotificationsService ns;
 
-    @Rule
-    public TestName name = new TestName();
-
-    @BeforeClass
-    public static void beforeClass() {
-    }
-
-    @Before
-    public void before() throws Exception {
-
-    }
-
     protected NotificationsService getNotificationService(){
         ns = (NotificationsService) app.getSm().getService("notifications");
         return ns;
     }
 
-
-
     protected Notification scheduleNotificationAndWait(Notification notification)
             throws Exception {
         long timeout = System.currentTimeMillis() + 60000;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4bf4d715/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
index 3b9206e..5fda74b 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
@@ -68,11 +68,9 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT
{
 
     }
 
-    @Override
     @Before
     public void before() throws Exception {
 
-        super.before();
         // create apns notifier //
         app.clear();
         app.put("name", notifierName);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4bf4d715/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
index ce0dca7..8d6fb70 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
@@ -21,6 +21,7 @@ import org.apache.usergrid.persistence.entities.*;
 import org.apache.usergrid.persistence.queue.DefaultQueueManager;
 import org.apache.usergrid.services.notifications.*;
 import org.junit.*;
+import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +35,7 @@ import static org.apache.usergrid.services.notifications.ApplicationQueueManager
 
 public class NotificationsServiceIT extends AbstractServiceNotificationIT {
 
+
     private static final Logger logger = LoggerFactory
             .getLogger(NotificationsServiceIT.class);
 
@@ -54,15 +56,18 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT
{
     private NotificationsService ns;
     private QueueListener listener;
 
+
+
+
+
     @BeforeClass
     public static void setup(){
 
+
     }
-    @Override
     @Before
     public void before() throws Exception {
 
-        super.before();
 
         // create gcm notifier //
 


Mime
View raw message