springboot 2.4 (#53)

Author: AbdelHedhili

geo-data-server/pom.xml

@@ -114,10 +114,22 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <!-- cassandra driver 4.0 already brings an org.json and vaadin json is only a subset of org.json -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

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

@@ -6,23 +6,19 @@
  */
 package org.gridsuite.geodata.server;
 
-import com.datastax.driver.core.*;
-import com.powsybl.commons.PowsyblException;
-import org.gridsuite.geodata.extensions.Coordinate;
+import com.datastax.oss.driver.api.core.CqlSession;
 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;
 import org.springframework.core.env.Environment;
 import org.springframework.data.cassandra.config.AbstractCassandraConfiguration;
-import org.springframework.data.cassandra.config.CassandraClusterFactoryBean;
-import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
-import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
+import org.springframework.data.cassandra.config.CqlSessionFactoryBean;
+import org.springframework.data.cassandra.config.SessionFactoryFactoryBean;
+import org.springframework.data.cassandra.core.convert.CassandraConverter;
 import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories;
 
-import java.nio.ByteBuffer;
-
 /**
  * @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
  */
@@ -41,78 +37,20 @@ protected String getKeyspaceName() {
     }
 
     @Bean
-    public CassandraClusterFactoryBean cluster(Environment env) {
-        CassandraClusterFactoryBean clusterFactory = new CassandraClusterFactoryBean();
-        clusterFactory.setContactPoints(env.getRequiredProperty("cassandra.contact-points"));
-        clusterFactory.setPort(Integer.parseInt(env.getRequiredProperty("cassandra.port")));
-
-        CodecRegistry codecRegistry = new CodecRegistry();
-        clusterFactory.setClusterBuilderConfigurer(builder -> {
-            builder.withCodecRegistry(codecRegistry);
-            Cluster cluster = builder.build();
-            KeyspaceMetadata keyspace = cluster.getMetadata().getKeyspace(getKeyspaceName());
-            if (keyspace == null) {
-                throw new PowsyblException("Keyspace '" + getKeyspaceName() + "' not found");
-            }
-            var coordinateType = keyspace.getUserType("coordinate");
-            TypeCodec<UDTValue> coordinateTypeCodec = codecRegistry.codecFor(coordinateType);
-            var coordinateCodec = new CoordinateCodec(coordinateTypeCodec, Coordinate.class);
-            codecRegistry.register(coordinateCodec);
-            return builder;
-        });
-        return clusterFactory;
+    public CqlSessionFactoryBean cassandraSession(Environment env) {
+        var session = new CqlSessionFactoryBean();
+        session.setContactPoints(env.getRequiredProperty("cassandra.contact-points"));
+        session.setPort(Integer.parseInt(env.getRequiredProperty("cassandra.port")));
+        session.setLocalDatacenter(env.getRequiredProperty("cassandra.datacenter"));
+        session.setKeyspaceName(getKeyspaceName());
+        return session;
     }
 
     @Bean
-    public CassandraMappingContext cassandraMapping(Cluster cluster, Environment env) {
-        CassandraMappingContext mappingContext =  new CassandraMappingContext();
-        mappingContext.setUserTypeResolver(new SimpleUserTypeResolver(cluster, getKeyspaceName()));
-        return mappingContext;
-    }
-
-    static class CoordinateCodec extends TypeCodec<Coordinate> {
-
-        private final TypeCodec<UDTValue> innerCodec;
-
-        private final UserType userType;
-
-        public CoordinateCodec(TypeCodec<UDTValue> innerCodec, Class<Coordinate> javaType) {
-            super(innerCodec.getCqlType(), javaType);
-            this.innerCodec = innerCodec;
-            this.userType = (UserType) innerCodec.getCqlType();
-        }
-
-        @Override
-        public ByteBuffer serialize(Coordinate value, ProtocolVersion protocolVersion) {
-            return innerCodec.serialize(toUDTValue(value), protocolVersion);
-        }
-
-        @Override
-        public Coordinate deserialize(ByteBuffer bytes, ProtocolVersion protocolVersion) {
-            return toCoordinate(innerCodec.deserialize(bytes, protocolVersion));
-        }
-
-        @Override
-        public Coordinate parse(String value) {
-            return value == null || value.isEmpty()  ? null : toCoordinate(innerCodec.parse(value));
-        }
-
-        @Override
-        public String format(Coordinate value) {
-            return value == null ? null : innerCodec.format(toUDTValue(value));
-        }
-
-        protected Coordinate toCoordinate(UDTValue value) {
-            return value == null ? null : new Coordinate(
-                    value.getDouble("lat"),
-                    value.getDouble("lon")
-            );
-        }
-
-        protected UDTValue toUDTValue(Coordinate value) {
-            return value == null ? null : userType.newValue()
-                    .setDouble("lat", value.getLat())
-                    .setDouble("lon", value.getLon());
-        }
+    public SessionFactoryFactoryBean cassandraSessionFactory(CqlSession session, CassandraConverter converter) {
+        var sessionFactory = new SessionFactoryFactoryBean();
+        sessionFactory.setSession(session);
+        sessionFactory.setConverter(converter);
+        return sessionFactory;
     }
 }

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

@@ -6,11 +6,8 @@
  */
 package org.gridsuite.geodata.server.repositories;
 
+import lombok.*;
 import org.gridsuite.geodata.extensions.Coordinate;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.ToString;
 import org.springframework.data.cassandra.core.mapping.UserDefinedType;
 
 import java.util.List;
@@ -21,6 +18,7 @@
  */
 @UserDefinedType("coordinate")
 @AllArgsConstructor
+@NoArgsConstructor
 @Getter
 @Builder
 @ToString

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

@@ -6,9 +6,10 @@
  */
 package org.gridsuite.geodata.server.repositories;
 
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.data.UdtValue;
 import org.gridsuite.geodata.extensions.Coordinate;
 import org.gridsuite.geodata.server.dto.LineGeoData;
 import com.powsybl.iidm.network.Country;
@@ -27,16 +28,17 @@
 public class LineCustomRepository {
 
     @Autowired
-    private Session session;
+    private CqlSession session;
 
     private static LineGeoData rowToLineGeoData(Row row) {
         String id = row.getString("id");
-        boolean side1 = row.getBool("side1");
+        boolean side1 = row.getBoolean("side1");
         Country country = Country.valueOf(row.getString("country"));
         Country otherCountry = Country.valueOf(row.getString("otherCountry"));
         String substationStart = row.getString("substationStart");
         String substationEnd = row.getString("substationEnd");
-        List<Coordinate> coordinates = row.getList("coordinates", Coordinate.class);
+        List<Coordinate> coordinates = row.getList("coordinates", UdtValue.class).stream().map(udtValue ->
+                new Coordinate(udtValue.getDouble("lat"), udtValue.getDouble("lon"))).collect(Collectors.toList());
         return LineGeoData.builder()
                 .id(id)
                 .country1(side1 ? country : otherCountry)

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

@@ -9,8 +9,7 @@
 import org.gridsuite.geodata.server.dto.LineGeoData;
 import lombok.*;
 import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
-import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
-import org.springframework.data.cassandra.core.mapping.Table;
+import org.springframework.data.cassandra.core.mapping.*;
 
 import java.util.List;
 

geo-data-server/src/main/resources/cassandra.properties

@@ -1,2 +1,3 @@
 cassandra.contact-points=localhost
 cassandra.port=9042
+cassandra.datacenter=datacenter1

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

@@ -6,7 +6,7 @@
  */
 package org.gridsuite.geodata.server;
 
-import com.github.nosan.embedded.cassandra.api.connection.ClusterCassandraConnection;
+import com.github.nosan.embedded.cassandra.api.connection.CqlSessionCassandraConnection;
 import com.github.nosan.embedded.cassandra.api.cql.CqlDataSet;
 import org.gridsuite.geodata.test.EmbeddedCassandraFactoryConfig;
 import org.junit.Before;
@@ -27,11 +27,11 @@
 public abstract class AbstractEmbeddedCassandraSetup {
 
     @Autowired
-    private ClusterCassandraConnection clusterCassandraConnection;
+    private CqlSessionCassandraConnection cqlSessionCassandraConnection;
 
     @Before
     public void setup() {
-        CqlDataSet.ofClasspaths("truncate.cql").forEachStatement(clusterCassandraConnection::execute);
+        CqlDataSet.ofClasspaths("truncate.cql").forEachStatement(cqlSessionCassandraConnection::execute);
     }
 
 }

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

@@ -6,6 +6,7 @@
  */
 package org.gridsuite.geodata.server;
 
+import com.datastax.oss.driver.api.core.CqlSession;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.powsybl.iidm.network.Country;
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
@@ -55,6 +56,9 @@ public class GeoDataControllerTest {
     @MockBean
     private CassandraConfig cassandraConfig;
 
+    @MockBean
+    private CqlSession cqlSession;
+
     @MockBean
     private NetworkStoreService service;
 

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

@@ -47,7 +47,6 @@ public void test() {
         assertEquals("LineEntity.LineEntityBuilder(country=FR, id=lineID, side1=false, otherCountry=BE, substationStart$value=sub, substationEnd$value=way, coordinates=[CoordinateEntity(lat=11.0, lon=12.0), CoordinateEntity(lat=13.0, lon=14.1)])", lineEntityBuilder.toString());
 
         repository.save(lineEntityBuilder.build());
-
         List<LineEntity> lines = repository.findAll();
 
         assertEquals(1, lines.size());

geo-data-server/src/test/resources/cassandra.properties

@@ -1,2 +1,3 @@
 cassandra.contact-points=localhost
 cassandra.port=9142
+cassandra.datacenter=datacenter1