Initial integration of Qakka into Usergrid Queue module, and implemen…

…tation of Qakka-based LegacyQueueManager implementation.
apache · Sep 13, 2016 · 3075dce · 3075dce
1 parent 9016fd2
commit 3075dce
Show file tree

Hide file tree

Showing 126 changed files with 12,116 additions and 101 deletions.
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
@@ -40,7 +40,6 @@
         </plugins>
     </reporting>
 
-
     <build>
 
         <resources>
@@ -429,6 +428,7 @@
             <groupId>org.apache.usergrid</groupId>
             <artifactId>queue</artifactId>
             <version>${project.version}</version>
+            <classifier>classes</classifier>
             <type>jar</type>
         </dependency>
 

diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Receipt.java b/stack/core/src/main/java/org/apache/usergrid/persistence/entities/Receipt.java
@@ -16,21 +16,27 @@
  */
 package org.apache.usergrid.persistence.entities;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.apache.usergrid.persistence.TypedEntity;
+import org.apache.usergrid.persistence.annotations.EntityProperty;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.HashMap;
 import java.util.UUID;
-import org.apache.usergrid.persistence.annotations.EntityProperty;
-import org.mortbay.util.ajax.JSON;
 
 @XmlRootElement
 public class Receipt extends TypedEntity {
 
     public static final String ENTITY_TYPE = "receipt";
     public static final String NOTIFICATION_CONNECTION = "notification";
 
+    private static ObjectMapper objectMapper = new ObjectMapper();
+    static private final TypeReference<HashMap> hashMapTypeRef = new TypeReference<HashMap>() {};
+
+
+
     /** device id **/
     @EntityProperty
     protected UUID deviceId;
@@ -65,27 +71,28 @@ public class Receipt extends TypedEntity {
     public Receipt() {
     }
 
-    public Receipt(UUID notificationUUID, String notifierId, Object payload,UUID deviceId) {
+    public Receipt(UUID notificationUUID, String notifierId, Object payload, UUID deviceId) {
         this.notificationUUID = notificationUUID;
         this.notifierId = notifierId;
         HashMap receiptPayload;
-        if(! (payload instanceof HashMap) ){
+
-            if(payload instanceof String){
+        if (!(payload instanceof HashMap)) {
+            if (payload instanceof String) {
                 try {
-                    receiptPayload = (HashMap) JSON.parse((String) payload);
+                    receiptPayload = (HashMap) objectMapper.readValue( (String)payload, hashMapTypeRef );
-                }catch (Exception e){
+                } catch (Exception e) {
                     receiptPayload = new HashMap<>();
-                    receiptPayload.put("payload", payload);
+                    receiptPayload.put( "payload", payload );
                 }
-            }else {
+            } else {
                 receiptPayload = new HashMap<>();
-                receiptPayload.put("payload", payload);
+                receiptPayload.put( "payload", payload );
             }
-        }else{
+        } else {
-            receiptPayload = (HashMap)payload;
+            receiptPayload = (HashMap) payload;
         }
         this.payload = receiptPayload;
-        this.setDeviceId(deviceId);
+        this.setDeviceId( deviceId );
     }
 
     @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)

diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
@@ -20,18 +20,8 @@
 package org.apache.usergrid.corepersistence.index;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.avro.generic.GenericData;
 import org.apache.usergrid.ExperimentalTest;
-import org.junit.Ignore;
 import org.junit.Test;
-
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +30,13 @@
 import rx.observables.ConnectableObservable;
 import rx.schedulers.Schedulers;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -61,8 +58,10 @@ public void testPublish() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch( count+1 );
 
         final Subscription connectedObservable =
-            Observable.range( 0, count ).doOnNext( integer -> latch.countDown() ).doOnCompleted( () -> latch.countDown() ).subscribeOn( Schedulers.io() )
+            Observable.range( 0, count )
-                      .subscribe();
+                .doOnNext( integer -> latch.countDown() )
+                .doOnCompleted( () -> latch.countDown() ).subscribeOn( Schedulers.io() )
+                .subscribe();
 
 
         final boolean completed = latch.await( 3, TimeUnit.SECONDS );

diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
@@ -97,6 +97,7 @@
                   <groupId>${project.parent.groupId}</groupId>
                   <artifactId>queue</artifactId>
                   <version>${project.version}</version>
+                    <classifier>classes</classifier>
                   <type>jar</type>
               </dependency>
 

diff --git a/...nce/queryindex/src/main/java/org/apache/usergrid/persistence/index/guice/IndexModule.java b/...nce/queryindex/src/main/java/org/apache/usergrid/persistence/index/guice/IndexModule.java
@@ -23,7 +23,6 @@
 import com.google.inject.multibindings.Multibinder;
 import org.apache.usergrid.persistence.core.migration.data.DataMigration;
 import org.apache.usergrid.persistence.core.migration.data.MigrationPlugin;
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
 import org.apache.usergrid.persistence.index.*;
 import com.google.inject.AbstractModule;
 

diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml
@@ -21,6 +21,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
         <artifactId>persistence</artifactId>
         <groupId>org.apache.usergrid</groupId>
@@ -30,6 +31,48 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>queue</artifactId>
     <name>Usergrid Queue</name>
+    <packaging>war</packaging>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <servlet.version>3.0.1</servlet.version>
+        <jersey.version>2.23.1</jersey.version>
+        <guice-bridge.version>2.4.0</guice-bridge.version>
+    </properties>
+
+
+    <build>
+
+        <finalName>queue-${project.version}</finalName>
+
+        <pluginManagement>
+            <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archiveClasses>true</archiveClasses>
+                    <attachClasses>true</attachClasses>
+                </configuration>
+            </plugin>
+
+            </plugins>
+        </pluginManagement>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+            </testResource>
+        </testResources>
+
+    </build>
 
     <dependencies>
 
@@ -90,6 +133,119 @@
             <version>4.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.usergrid</groupId>
+            <artifactId>actorsystem</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.usergrid</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>cassandra-all</artifactId>
+                    <groupId>org.apache.cassandra</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--
+                <dependency>
+                    <groupId>com.datastax.cassandra</groupId>
+                    <artifactId>cassandra-driver-core</artifactId>
+                    <version>2.1.9</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.google.guava</groupId>
+                            <artifactId>guava</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <version>1.7.13</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.fasterxml.uuid</groupId>
+                    <artifactId>java-uuid-generator</artifactId>
+                    <version>3.1.4</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                    <version>3.3.2</version>
+                </dependency>
+        -->
+
+        <!-- Java EE & Jersey -->
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
+        <!-- added for Guice Jersey integration -->
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>guice-bridge</artifactId>
+            <version>${guice-bridge.version}</version>
+        </dependency>
+
+        <!-- added for Guice Jersey integration -->
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-servlet</artifactId>
+            <version>${guice.version}</version>
+        </dependency>
+
+        <!-- added to enable logging from within Jersey -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>1.7.5</version>
+        </dependency>
+
+        <!-- Testing -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-jetty</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
     </dependencies>
 
     <!--