Make cassandra keyspace configurable (#51)

* Add cassandra keyspace name property in application yaml file
Remove keyspace name from cql scripts geo_data.cql and truncate.cql
Use keyspace name property in code
Change in embedded cassandra factory config

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

* Modifications after code review

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

Author: FranckLecuyer

geo-data-server/src/main/java/org/gridsuite/geodata/server/CassandraConfig.java

@@ -10,6 +10,7 @@
 import com.powsybl.commons.PowsyblException;
 import org.gridsuite.geodata.extensions.Coordinate;
 import org.gridsuite.geodata.server.repositories.LineRepository;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -31,9 +32,12 @@
 @EnableCassandraRepositories(basePackageClasses = LineRepository.class)
 public class CassandraConfig extends AbstractCassandraConfiguration {
 
+    @Value("${cassandra-keyspace:geo_data}")
+    private String keyspaceName;
+
     @Override
     protected String getKeyspaceName() {
-        return CassandraConstants.KEYSPACE_GEO_DATA;
+        return keyspaceName;
     }
 
     @Bean
@@ -46,13 +50,13 @@ public CassandraClusterFactoryBean cluster(Environment env) {
         clusterFactory.setClusterBuilderConfigurer(builder -> {
             builder.withCodecRegistry(codecRegistry);
             Cluster cluster = builder.build();
-            KeyspaceMetadata keyspace = cluster.getMetadata().getKeyspace(CassandraConstants.KEYSPACE_GEO_DATA);
+            KeyspaceMetadata keyspace = cluster.getMetadata().getKeyspace(getKeyspaceName());
             if (keyspace == null) {
-                throw new PowsyblException("Keyspace '" + CassandraConstants.KEYSPACE_GEO_DATA + "' not found");
+                throw new PowsyblException("Keyspace '" + getKeyspaceName() + "' not found");
             }
-            UserType coordinateType = keyspace.getUserType("coordinate");
+            var coordinateType = keyspace.getUserType("coordinate");
             TypeCodec<UDTValue> coordinateTypeCodec = codecRegistry.codecFor(coordinateType);
-            CoordinateCodec coordinateCodec = new CoordinateCodec(coordinateTypeCodec, Coordinate.class);
+            var coordinateCodec = new CoordinateCodec(coordinateTypeCodec, Coordinate.class);
             codecRegistry.register(coordinateCodec);
             return builder;
         });
@@ -62,7 +66,7 @@ public CassandraClusterFactoryBean cluster(Environment env) {
     @Bean
     public CassandraMappingContext cassandraMapping(Cluster cluster, Environment env) {
         CassandraMappingContext mappingContext =  new CassandraMappingContext();
-        mappingContext.setUserTypeResolver(new SimpleUserTypeResolver(cluster, CassandraConstants.KEYSPACE_GEO_DATA));
+        mappingContext.setUserTypeResolver(new SimpleUserTypeResolver(cluster, getKeyspaceName()));
         return mappingContext;
     }
 

geo-data-server/src/main/java/org/gridsuite/geodata/server/CassandraConstants.java

@@ -7,3 +7,6 @@ network-store-server:
 
 network-geo-data:
   iterations : 5
+
+cassandra-keyspace: geo_data
+

geo-data-server/src/main/resources/application.yml

@@ -1,22 +1,22 @@
-CREATE TYPE geo_data.coordinate (
+CREATE TYPE coordinate (
     lat double,
     lon double,
 );
 
-CREATE TABLE geo_data.substations (
+CREATE TABLE substations (
     country text,
     id text,
-    coordinate frozen<geo_data.coordinate>,
+    coordinate frozen<coordinate>,
     PRIMARY KEY (country, id)
 );
 
-CREATE TABLE geo_data.lines (
+CREATE TABLE lines (
     country text,
     id text,
     side1 boolean,
     otherCountry text,
     substationStart text,
     substationEnd text,
-    coordinates frozen<list<geo_data.coordinate>>,
+    coordinates frozen<list<coordinate>>,
     PRIMARY KEY (country, id)
 );

geo-data-server/src/main/resources/geo_data.cql

@@ -10,7 +10,9 @@
 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;
@@ -34,6 +36,9 @@
 @Configuration
 public class EmbeddedCassandraFactoryConfig {
 
+    @Value("${cassandra-keyspace:geo_data}")
+    private String keyspaceName;
+
     @Bean(initMethod = "start", destroyMethod = "stop")
     Cassandra cassandra(CassandraFactory cassandraFactory) {
         return cassandraFactory.create();
@@ -42,7 +47,8 @@ Cassandra cassandra(CassandraFactory cassandraFactory) {
     @Bean
     CassandraConnection cassandraConnection(Cassandra cassandra) {
         CassandraConnection cassandraConnection = new DefaultCassandraConnectionFactory().create(cassandra);
-        CqlDataSet.ofClasspaths("create_keyspace.cql", "geo_data.cql").forEachStatement(cassandraConnection::execute);
+        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);
         return cassandraConnection;
     }
 

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

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

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

@@ -1,3 +1,3 @@
-TRUNCATE geo_data.substations;
+TRUNCATE substations;
 
-TRUNCATE geo_data.lines;
+TRUNCATE lines;