Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-593 9f6fa2725 -> b144cc2bc
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b144cc2b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java index cc131d1..0d76931 100644 --- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java +++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java @@ -42,6 +42,7 @@ import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdgeType; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.util.UUIDGenerator; +import com.google.common.base.Optional; import com.google.inject.Inject; import rx.Observable; @@ -119,7 +120,8 @@ public class GraphManagerStressTest { for ( Id sourceId : sourceIds ) { final Iterable<Edge> edges = manager.loadEdgesFromSource( - new SimpleSearchByEdgeType( sourceId, "test", timestamp, SearchByEdgeType.Order.DESCENDING, null ) ) + new SimpleSearchByEdgeType( sourceId, "test", timestamp, SearchByEdgeType.Order.DESCENDING, Optional + .<Edge>absent() ) ) .toBlocking().toIterable(); for ( Edge edge : edges ) { @@ -193,7 +195,7 @@ public class GraphManagerStressTest { @Override public Observable<Edge> doSearch( final GraphManager manager ) { - return manager.loadEdgesFromSource( new SimpleSearchByEdgeType( sourceId, "test", System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, null ) ); + return manager.loadEdgesFromSource( new SimpleSearchByEdgeType( sourceId, "test", System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, Optional.<Edge>absent() ) ); } }; @@ -221,7 +223,7 @@ public class GraphManagerStressTest { @Override public Observable<Edge> doSearch( final GraphManager manager ) { - return manager.loadEdgesToTarget( new SimpleSearchByEdgeType( targetId, "test", System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, null ) ); + return manager.loadEdgesToTarget( new SimpleSearchByEdgeType( targetId, "test", System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, Optional.<Edge>absent() ) ); } }; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b144cc2b/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index 4255752..171baca 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -71,7 +71,7 @@ limitations under the License. <junit.version>4.11</junit.version> <kryo-serializers.version>0.26</kryo-serializers.version> <log4j.version>1.2.17</log4j.version> - <rx.version>0.19.6</rx.version> + <rx.version>0.20.7</rx.version> <slf4j.version>1.7.2</slf4j.version> <surefire.version>2.16</surefire.version> <aws.version>1.9.0</aws.version> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b144cc2b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala ---------------------------------------------------------------------- diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala index aa724d6..07e11fe 100755 --- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala +++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala @@ -40,7 +40,7 @@ import io.gatling.http.Predef._ val postConnection = exec( http("Connect user with device") - .post("/${collectionName}/${entityId}/${connectionType}/${entityId}") + .post("/${connectionName}/${entityId}/${connectionType}/${entityId}") .headers(Headers.jsonAuthorized) .check(status.is(200)) ) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b144cc2b/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index c458acb..9490cd7 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -125,7 +125,6 @@ <usergrid.it.threads>8</usergrid.it.threads> <metrics.version>3.0.0</metrics.version> - <rx.version>0.19.6</rx.version> <surefire.plugin.artifactName>surefire-junit47</surefire.plugin.artifactName> <surefire.plugin.version>2.18.1</surefire.plugin.version> <powermock.version>1.6.1</powermock.version>
