You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/05/11 05:46:17 UTC
[24/33] usergrid git commit: Fix file naming issues ( had to use git
mv for git to pickup case changes in filenames).
Fix file naming issues ( had to use git mv for git to pickup case changes in filenames).
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/190e5199
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/190e5199
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/190e5199
Branch: refs/heads/datastax-cass-driver
Commit: 190e51992c97da7e863d399eafa9cc7455d8121c
Parents: f9a29e8
Author: Michael Russo <mr...@apigee.com>
Authored: Sun May 1 17:37:22 2016 +0800
Committer: Michael Russo <mr...@apigee.com>
Committed: Sun May 1 17:37:22 2016 +0800
----------------------------------------------------------------------
.../core/datastax/DataStaxSessionProvider.java | 43 ++++
.../core/datastax/DatastaxSessionProvider.java | 43 ----
.../core/datastax/impl/DataStaxClusterImpl.java | 222 +++++++++++++++++++
.../core/datastax/impl/DatastaxClusterImpl.java | 222 -------------------
.../core/datastax/DataStaxClusterTest.java | 84 +++++++
.../core/datastax/DatastaxClusterTest.java | 84 -------
6 files changed, 349 insertions(+), 349 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DataStaxSessionProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DataStaxSessionProvider.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DataStaxSessionProvider.java
new file mode 100644
index 0000000..5e9a633
--- /dev/null
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DataStaxSessionProvider.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.usergrid.persistence.core.datastax;
+
+
+import com.datastax.driver.core.Session;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+@Singleton
+public class DataStaxSessionProvider implements Provider<Session> {
+
+ private final DataStaxCluster dataStaxCluster;
+
+ @Inject
+ public DataStaxSessionProvider( final DataStaxCluster dataStaxCluster ){
+
+ this.dataStaxCluster = dataStaxCluster;
+ }
+
+ @Override
+ public Session get(){
+
+ return dataStaxCluster.getApplicationSession();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DatastaxSessionProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DatastaxSessionProvider.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DatastaxSessionProvider.java
deleted file mode 100644
index 5e9a633..0000000
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/DatastaxSessionProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.datastax;
-
-
-import com.datastax.driver.core.Session;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
-@Singleton
-public class DataStaxSessionProvider implements Provider<Session> {
-
- private final DataStaxCluster dataStaxCluster;
-
- @Inject
- public DataStaxSessionProvider( final DataStaxCluster dataStaxCluster ){
-
- this.dataStaxCluster = dataStaxCluster;
- }
-
- @Override
- public Session get(){
-
- return dataStaxCluster.getApplicationSession();
- }
-}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
new file mode 100644
index 0000000..34cfec8
--- /dev/null
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.usergrid.persistence.core.datastax.impl;
+
+import com.datastax.driver.core.*;
+import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy;
+import com.datastax.driver.core.policies.LoadBalancingPolicy;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import org.apache.usergrid.persistence.core.CassandraFig;
+import org.apache.usergrid.persistence.core.datastax.CQLUtils;
+import org.apache.usergrid.persistence.core.datastax.DataStaxCluster;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+@Singleton
+public class DataStaxClusterImpl implements DataStaxCluster {
+
+ private static final Logger logger = LoggerFactory.getLogger( DataStaxClusterImpl.class );
+
+
+ private final CassandraFig cassandraFig;
+ private Cluster cluster;
+ private Session applicationSession;
+ private Session clusterSession;
+
+ @Inject
+ public DataStaxClusterImpl(final CassandraFig cassandraFig ) throws Exception {
+ this.cassandraFig = cassandraFig;
+ this.cluster = buildCluster();
+
+ logger.info("Initialized datastax cluster client. Hosts={}, Idle Timeout={}s, Pool Timeout={}s",
+ cluster.getMetadata().getAllHosts().toString(),
+ cluster.getConfiguration().getPoolingOptions().getIdleTimeoutSeconds(),
+ cluster.getConfiguration().getPoolingOptions().getPoolTimeoutMillis() / 1000);
+
+
+ }
+
+ @Override
+ public Cluster getCluster(){
+
+ // ensure we can build the cluster if it was previously closed
+ if ( cluster.isClosed() ){
+ cluster = buildCluster();
+ }
+
+ return cluster;
+ }
+
+ @Override
+ public Session getClusterSession(){
+
+ // always grab cluster from getCluster() in case it was prematurely closed
+ if ( clusterSession == null || clusterSession.isClosed() ){
+ clusterSession = getCluster().connect();
+ }
+
+ return clusterSession;
+ }
+
+ @Override
+ public Session getApplicationSession(){
+
+ // always grab cluster from getCluster() in case it was prematurely closed
+ if ( applicationSession == null || applicationSession.isClosed() ){
+ applicationSession = getCluster().connect( CQLUtils.quote(cassandraFig.getApplicationKeyspace() ) );
+ }
+ return applicationSession;
+ }
+
+
+ /**
+ * Execute CQL that will create the keyspace if it doesn't exist and alter it if it does.
+ * @throws Exception
+ */
+ @Override
+ public void createOrUpdateKeyspace() throws Exception {
+
+ clusterSession = getClusterSession();
+
+ final String createApplicationKeyspace = String.format(
+ "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = %s",
+ CQLUtils.quote(cassandraFig.getApplicationKeyspace()),
+ CQLUtils.getFormattedReplication( cassandraFig.getStrategy(), cassandraFig.getStrategyOptions() )
+
+ );
+
+ final String updateApplicationKeyspace = String.format(
+ "ALTER KEYSPACE %s WITH replication = %s",
+ CQLUtils.quote(cassandraFig.getApplicationKeyspace()),
+ CQLUtils.getFormattedReplication( cassandraFig.getStrategy(), cassandraFig.getStrategyOptions() )
+ );
+
+ clusterSession.execute(createApplicationKeyspace);
+ clusterSession.executeAsync(updateApplicationKeyspace);
+
+ logger.info("Created/Updated keyspace: {}", cassandraFig.getApplicationKeyspace());
+
+ waitForSchemaAgreement();
+ }
+
+ /**
+ * Wait until all Cassandra nodes agree on the schema. Sleeps 100ms between checks.
+ *
+ */
+ public void waitForSchemaAgreement() {
+
+ while ( true ) {
+
+ if( this.cluster.getMetadata().checkSchemaAgreement() ){
+ return;
+ }
+
+ //sleep and try it again
+ try {
+ Thread.sleep( 100 );
+ }
+ catch ( InterruptedException e ) {
+ //swallow
+ }
+ }
+ }
+
+ public Cluster buildCluster(){
+
+ ConsistencyLevel defaultConsistencyLevel;
+ try {
+ defaultConsistencyLevel = ConsistencyLevel.valueOf(cassandraFig.getReadCl());
+ } catch (IllegalArgumentException e){
+
+ logger.error("Unable to parse provided consistency level in property: {}, defaulting to: {}",
+ CassandraFig.READ_CL,
+ ConsistencyLevel.LOCAL_QUORUM);
+
+ defaultConsistencyLevel = ConsistencyLevel.LOCAL_QUORUM;
+ }
+
+
+ LoadBalancingPolicy loadBalancingPolicy;
+ if( !cassandraFig.getLocalDataCenter().isEmpty() ){
+
+ loadBalancingPolicy = new DCAwareRoundRobinPolicy.Builder()
+ .withLocalDc( cassandraFig.getLocalDataCenter() ).build();
+ }else{
+ loadBalancingPolicy = new DCAwareRoundRobinPolicy.Builder().build();
+ }
+
+ final PoolingOptions poolingOptions = new PoolingOptions()
+ .setCoreConnectionsPerHost(HostDistance.LOCAL, cassandraFig.getConnections() / 2)
+ .setMaxConnectionsPerHost(HostDistance.LOCAL, cassandraFig.getConnections())
+ .setIdleTimeoutSeconds(cassandraFig.getTimeout() / 1000)
+ .setPoolTimeoutMillis(cassandraFig.getPoolTimeout());
+
+ final QueryOptions queryOptions = new QueryOptions()
+ .setConsistencyLevel(defaultConsistencyLevel);
+
+ Cluster.Builder datastaxCluster = Cluster.builder()
+ .withClusterName(cassandraFig.getClusterName())
+ .addContactPoints(cassandraFig.getHosts().split(","))
+ .withCompression(ProtocolOptions.Compression.LZ4)
+ .withLoadBalancingPolicy(loadBalancingPolicy)
+ .withPoolingOptions(poolingOptions)
+ .withQueryOptions(queryOptions)
+ .withProtocolVersion(getProtocolVersion(cassandraFig.getVersion()));
+
+ // only add auth credentials if they were provided
+ if ( !cassandraFig.getUsername().isEmpty() && !cassandraFig.getPassword().isEmpty() ){
+ datastaxCluster.withCredentials(
+ cassandraFig.getUsername(),
+ cassandraFig.getPassword()
+ );
+ }
+
+
+ return datastaxCluster.build();
+
+ }
+
+ private ProtocolVersion getProtocolVersion(String versionNumber){
+
+ ProtocolVersion protocolVersion;
+ switch (versionNumber) {
+
+ case "2.1":
+ protocolVersion = ProtocolVersion.V3;
+ break;
+ case "2.0":
+ protocolVersion = ProtocolVersion.V2;
+ break;
+ case "1.2":
+ protocolVersion = ProtocolVersion.V1;
+ break;
+ default:
+ protocolVersion = ProtocolVersion.NEWEST_SUPPORTED;
+ break;
+
+ }
+
+ return protocolVersion;
+
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
deleted file mode 100644
index 34cfec8..0000000
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.datastax.impl;
-
-import com.datastax.driver.core.*;
-import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy;
-import com.datastax.driver.core.policies.LoadBalancingPolicy;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.apache.usergrid.persistence.core.CassandraFig;
-import org.apache.usergrid.persistence.core.datastax.CQLUtils;
-import org.apache.usergrid.persistence.core.datastax.DataStaxCluster;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-@Singleton
-public class DataStaxClusterImpl implements DataStaxCluster {
-
- private static final Logger logger = LoggerFactory.getLogger( DataStaxClusterImpl.class );
-
-
- private final CassandraFig cassandraFig;
- private Cluster cluster;
- private Session applicationSession;
- private Session clusterSession;
-
- @Inject
- public DataStaxClusterImpl(final CassandraFig cassandraFig ) throws Exception {
- this.cassandraFig = cassandraFig;
- this.cluster = buildCluster();
-
- logger.info("Initialized datastax cluster client. Hosts={}, Idle Timeout={}s, Pool Timeout={}s",
- cluster.getMetadata().getAllHosts().toString(),
- cluster.getConfiguration().getPoolingOptions().getIdleTimeoutSeconds(),
- cluster.getConfiguration().getPoolingOptions().getPoolTimeoutMillis() / 1000);
-
-
- }
-
- @Override
- public Cluster getCluster(){
-
- // ensure we can build the cluster if it was previously closed
- if ( cluster.isClosed() ){
- cluster = buildCluster();
- }
-
- return cluster;
- }
-
- @Override
- public Session getClusterSession(){
-
- // always grab cluster from getCluster() in case it was prematurely closed
- if ( clusterSession == null || clusterSession.isClosed() ){
- clusterSession = getCluster().connect();
- }
-
- return clusterSession;
- }
-
- @Override
- public Session getApplicationSession(){
-
- // always grab cluster from getCluster() in case it was prematurely closed
- if ( applicationSession == null || applicationSession.isClosed() ){
- applicationSession = getCluster().connect( CQLUtils.quote(cassandraFig.getApplicationKeyspace() ) );
- }
- return applicationSession;
- }
-
-
- /**
- * Execute CQL that will create the keyspace if it doesn't exist and alter it if it does.
- * @throws Exception
- */
- @Override
- public void createOrUpdateKeyspace() throws Exception {
-
- clusterSession = getClusterSession();
-
- final String createApplicationKeyspace = String.format(
- "CREATE KEYSPACE IF NOT EXISTS %s WITH replication = %s",
- CQLUtils.quote(cassandraFig.getApplicationKeyspace()),
- CQLUtils.getFormattedReplication( cassandraFig.getStrategy(), cassandraFig.getStrategyOptions() )
-
- );
-
- final String updateApplicationKeyspace = String.format(
- "ALTER KEYSPACE %s WITH replication = %s",
- CQLUtils.quote(cassandraFig.getApplicationKeyspace()),
- CQLUtils.getFormattedReplication( cassandraFig.getStrategy(), cassandraFig.getStrategyOptions() )
- );
-
- clusterSession.execute(createApplicationKeyspace);
- clusterSession.executeAsync(updateApplicationKeyspace);
-
- logger.info("Created/Updated keyspace: {}", cassandraFig.getApplicationKeyspace());
-
- waitForSchemaAgreement();
- }
-
- /**
- * Wait until all Cassandra nodes agree on the schema. Sleeps 100ms between checks.
- *
- */
- public void waitForSchemaAgreement() {
-
- while ( true ) {
-
- if( this.cluster.getMetadata().checkSchemaAgreement() ){
- return;
- }
-
- //sleep and try it again
- try {
- Thread.sleep( 100 );
- }
- catch ( InterruptedException e ) {
- //swallow
- }
- }
- }
-
- public Cluster buildCluster(){
-
- ConsistencyLevel defaultConsistencyLevel;
- try {
- defaultConsistencyLevel = ConsistencyLevel.valueOf(cassandraFig.getReadCl());
- } catch (IllegalArgumentException e){
-
- logger.error("Unable to parse provided consistency level in property: {}, defaulting to: {}",
- CassandraFig.READ_CL,
- ConsistencyLevel.LOCAL_QUORUM);
-
- defaultConsistencyLevel = ConsistencyLevel.LOCAL_QUORUM;
- }
-
-
- LoadBalancingPolicy loadBalancingPolicy;
- if( !cassandraFig.getLocalDataCenter().isEmpty() ){
-
- loadBalancingPolicy = new DCAwareRoundRobinPolicy.Builder()
- .withLocalDc( cassandraFig.getLocalDataCenter() ).build();
- }else{
- loadBalancingPolicy = new DCAwareRoundRobinPolicy.Builder().build();
- }
-
- final PoolingOptions poolingOptions = new PoolingOptions()
- .setCoreConnectionsPerHost(HostDistance.LOCAL, cassandraFig.getConnections() / 2)
- .setMaxConnectionsPerHost(HostDistance.LOCAL, cassandraFig.getConnections())
- .setIdleTimeoutSeconds(cassandraFig.getTimeout() / 1000)
- .setPoolTimeoutMillis(cassandraFig.getPoolTimeout());
-
- final QueryOptions queryOptions = new QueryOptions()
- .setConsistencyLevel(defaultConsistencyLevel);
-
- Cluster.Builder datastaxCluster = Cluster.builder()
- .withClusterName(cassandraFig.getClusterName())
- .addContactPoints(cassandraFig.getHosts().split(","))
- .withCompression(ProtocolOptions.Compression.LZ4)
- .withLoadBalancingPolicy(loadBalancingPolicy)
- .withPoolingOptions(poolingOptions)
- .withQueryOptions(queryOptions)
- .withProtocolVersion(getProtocolVersion(cassandraFig.getVersion()));
-
- // only add auth credentials if they were provided
- if ( !cassandraFig.getUsername().isEmpty() && !cassandraFig.getPassword().isEmpty() ){
- datastaxCluster.withCredentials(
- cassandraFig.getUsername(),
- cassandraFig.getPassword()
- );
- }
-
-
- return datastaxCluster.build();
-
- }
-
- private ProtocolVersion getProtocolVersion(String versionNumber){
-
- ProtocolVersion protocolVersion;
- switch (versionNumber) {
-
- case "2.1":
- protocolVersion = ProtocolVersion.V3;
- break;
- case "2.0":
- protocolVersion = ProtocolVersion.V2;
- break;
- case "1.2":
- protocolVersion = ProtocolVersion.V1;
- break;
- default:
- protocolVersion = ProtocolVersion.NEWEST_SUPPORTED;
- break;
-
- }
-
- return protocolVersion;
-
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DataStaxClusterTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DataStaxClusterTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DataStaxClusterTest.java
new file mode 100644
index 0000000..227f11d
--- /dev/null
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DataStaxClusterTest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.usergrid.persistence.core.datastax;
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+import com.google.inject.Inject;
+import org.apache.usergrid.persistence.core.CassandraFig;
+import org.apache.usergrid.persistence.core.guice.TestCommonModule;
+import org.apache.usergrid.persistence.core.test.ITRunner;
+import org.apache.usergrid.persistence.core.test.UseModules;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+@RunWith( ITRunner.class )
+@UseModules( TestCommonModule.class )
+public class DataStaxClusterTest {
+
+
+ @Inject
+ DataStaxCluster dataStaxCluster;
+
+ @Inject
+ CassandraFig cassandraFig;
+
+
+ @Test
+ public void testConnectCloseCluster() {
+
+ Cluster cluster = dataStaxCluster.getCluster();
+
+ assertTrue(!cluster.isClosed());
+
+ cluster.close();
+ assertTrue(cluster.isClosed());
+
+ // validate getCluster will re-init the cluster
+ cluster = dataStaxCluster.getCluster();
+ assertTrue(!cluster.isClosed());
+
+
+ }
+
+ @Test
+ public void testGetClusterSession() {
+
+ Session session = dataStaxCluster.getClusterSession();
+ String clusterName = session.getCluster().getClusterName();
+ String keyspaceName = session.getLoggedKeyspace();
+
+ // cluster session is not logged to a keyspace
+ assertNull(keyspaceName);
+ assertNotNull(clusterName);
+ }
+
+ @Test
+ public void testGetApplicationSession() {
+
+ Session session = dataStaxCluster.getApplicationSession();
+ String keyspaceName = session.getLoggedKeyspace();
+
+
+ assertEquals(cassandraFig.getApplicationKeyspace(), keyspaceName);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/190e5199/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java
deleted file mode 100644
index ca7f97a..0000000
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.datastax;
-
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-import com.google.inject.Inject;
-import org.apache.usergrid.persistence.core.CassandraFig;
-import org.apache.usergrid.persistence.core.guice.TestCommonModule;
-import org.apache.usergrid.persistence.core.test.ITRunner;
-import org.apache.usergrid.persistence.core.test.UseModules;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-@RunWith( ITRunner.class )
-@UseModules( TestCommonModule.class )
-public class DatastaxClusterTest {
-
-
- @Inject
- DataStaxCluster dataStaxCluster;
-
- @Inject
- CassandraFig cassandraFig;
-
-
- @Test
- public void testConnectCloseCluster() {
-
- Cluster cluster = dataStaxCluster.getCluster();
-
- assertTrue(!cluster.isClosed());
-
- cluster.close();
- assertTrue(cluster.isClosed());
-
- // validate getCluster will re-init the cluster
- cluster = dataStaxCluster.getCluster();
- assertTrue(!cluster.isClosed());
-
-
- }
-
- @Test
- public void testGetClusterSession() {
-
- Session session = dataStaxCluster.getClusterSession();
- String clusterName = session.getCluster().getClusterName();
- String keyspaceName = session.getLoggedKeyspace();
-
- // cluster session is not logged to a keyspace
- assertNull(keyspaceName);
- assertNotNull(clusterName);
- }
-
- @Test
- public void testGetApplicationSession() {
-
- Session session = dataStaxCluster.getApplicationSession();
- String keyspaceName = session.getLoggedKeyspace();
-
-
- assertEquals(cassandraFig.getApplicationKeyspace(), keyspaceName);
- }
-
-}