Rollback on create_keyspace.cql script : using default keyspace name (#52)

Signed-off-by: Franck LECUYER <[email protected]>

Author: FranckLecuyer

geo-data-server/src/test/java/org/gridsuite/geodata/test/EmbeddedCassandraFactoryConfig.java

@@ -10,9 +10,7 @@
 import com.github.nosan.embedded.cassandra.api.Cassandra;
 import com.github.nosan.embedded.cassandra.api.CassandraFactory;
 import com.github.nosan.embedded.cassandra.api.Version;
-import com.github.nosan.embedded.cassandra.api.cql.CqlScript;
 import com.github.nosan.embedded.cassandra.artifact.RemoteArtifact;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
@@ -36,9 +34,6 @@
 @Configuration
 public class EmbeddedCassandraFactoryConfig {
 
-    @Value("${cassandra-keyspace:geo_data}")
-    private String keyspaceName;
-
     @Bean(initMethod = "start", destroyMethod = "stop")
     Cassandra cassandra(CassandraFactory cassandraFactory) {
         return cassandraFactory.create();
@@ -47,8 +42,7 @@ Cassandra cassandra(CassandraFactory cassandraFactory) {
     @Bean
     CassandraConnection cassandraConnection(Cassandra cassandra) {
         CassandraConnection cassandraConnection = new DefaultCassandraConnectionFactory().create(cassandra);
-        String[] createKeyspace = CqlScript.ofClasspath("create_keyspace.cql").getStatements().stream().map(s -> String.format(s, keyspaceName)).toArray(l -> new String[l]);
-        CqlDataSet.ofStrings(createKeyspace).add(CqlDataSet.ofStrings(String.format("USE %s;", keyspaceName))).add(CqlDataSet.ofClasspaths("geo_data.cql")).forEachStatement(cassandraConnection::execute);
+        CqlDataSet.ofClasspaths("create_keyspace.cql").add(CqlDataSet.ofStrings("USE geo_data;")).add(CqlDataSet.ofClasspaths("geo_data.cql")).forEachStatement(cassandraConnection::execute);
         return cassandraConnection;
     }
 

geo-data-server/src/test/resources/create_keyspace.cql

@@ -1 +1 @@
-CREATE KEYSPACE "%s" WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':1};
+CREATE KEYSPACE "geo_data" WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor':1};