diff --git a/cassandra-driver/src/main/java/org/jnosql/diana/cassandra/column/CassandraProperties.java b/cassandra-driver/src/main/java/org/jnosql/diana/cassandra/column/CassandraProperties.java index c6660c6ee..088412118 100644 --- a/cassandra-driver/src/main/java/org/jnosql/diana/cassandra/column/CassandraProperties.java +++ b/cassandra-driver/src/main/java/org/jnosql/diana/cassandra/column/CassandraProperties.java @@ -96,7 +96,7 @@ public static CassandraProperties of(Map configurations) { settings.prefix(Arrays.asList(OldCassandraConfigurations.HOST.get(), CassandraConfigurations.HOST.get(), Configurations.HOST.get())).stream() - .map(configurations::get).forEach(cp::addNodes); + .map(Object::toString).forEach(cp::addNodes); settings.prefix(Arrays.asList(OldCassandraConfigurations.QUERY.get(), CassandraConfigurations.QUERY.get())) .stream().map(Object::toString).sorted().forEach(cp::addQuery); diff --git a/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraConfigurationTest.java b/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraConfigurationTest.java index c0abad5c8..bc0be3738 100644 --- a/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraConfigurationTest.java +++ b/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/CassandraConfigurationTest.java @@ -20,25 +20,11 @@ import org.jnosql.diana.api.column.ColumnFamilyManagerFactory; import org.junit.jupiter.api.Test; -import java.util.HashMap; -import java.util.Map; - import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; public class CassandraConfigurationTest { - @Test - public void shoudlCreateDocumentEntityManagerFactory() { - Settings settings = ManagerFactorySupplier.INSTANCE.getSettings(); - - Map map = new HashMap<>(); - settings.forEach((k,v) -> map.put(k, v.toString())); - CassandraConfiguration cassandraConfiguration = new CassandraConfiguration(); - ColumnFamilyManagerFactory entityManagerFactory = cassandraConfiguration.getManagerFactory(map); - assertNotNull(entityManagerFactory); - } @Test public void shoudlCreateDocumentEntityManagerFactoryFromSettings() { @@ -57,10 +43,5 @@ public void shoudlCreateDocumentEntityManagerFactoryFromFile() { assertNotNull(entityManagerFactory); } - @Test - public void shouldReturnNPEWhenMapIsNull() { - CassandraConfiguration cassandraConfiguration = new CassandraConfiguration(); - assertThrows(NullPointerException.class, () -> cassandraConfiguration.getManagerFactory(null)); - } } diff --git a/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/ManagerFactorySupplier.java b/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/ManagerFactorySupplier.java index b973ecf1b..f0299b981 100644 --- a/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/ManagerFactorySupplier.java +++ b/cassandra-driver/src/test/java/org/jnosql/diana/cassandra/column/ManagerFactorySupplier.java @@ -48,8 +48,8 @@ public CassandraColumnFamilyManagerFactory get() { Settings getSettings() { Map configuration = new HashMap<>(ConfigurationReader.from(CASSANDRA_FILE_CONFIGURATION)); - configuration.put("cassandra-host-1", cassandra.getContainerIpAddress()); - configuration.put("cassandra-port", cassandra.getFirstMappedPort()); + configuration.put("cassandra.host-1", cassandra.getContainerIpAddress()); + configuration.put("cassandra.port", cassandra.getFirstMappedPort()); return Settings.of(configuration); } } diff --git a/cassandra-driver/src/test/resources/diana-cassandra.properties b/cassandra-driver/src/test/resources/diana-cassandra.properties index c1621823e..02308d060 100644 --- a/cassandra-driver/src/test/resources/diana-cassandra.properties +++ b/cassandra-driver/src/test/resources/diana-cassandra.properties @@ -12,12 +12,11 @@ # # Otavio Santana # -cassandra-host-1=localhost -cassandra-port=9142 -cassandra-threads-number=4 -cassandra-query-1=CREATE KEYSPACE IF NOT EXISTS newKeySpace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3}; -cassandra-query-2=CREATE TYPE IF NOT EXISTS newKeySpace.fullname ( firstname text, lastname text); -cassandra-query-3=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.newColumnFamily (id bigint PRIMARY KEY, version double, options list, name text); -cassandra-query-4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( nickname text PRIMARY KEY, name frozen ); -cassandra-query-5=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.history ( name text PRIMARY KEY, dataStart date, dateEnd timestamp); -cassandra-query-6=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contacts ( user text PRIMARY KEY, names list>); \ No newline at end of file +cassandra.host-1=localhost +cassandra.port=9142 +cassandra.query-1=CREATE KEYSPACE IF NOT EXISTS newKeySpace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 3}; +cassandra.query-2=CREATE TYPE IF NOT EXISTS newKeySpace.fullname ( firstname text, lastname text); +cassandra.query-3=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.newColumnFamily (id bigint PRIMARY KEY, version double, options list, name text); +cassandra.query-4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( nickname text PRIMARY KEY, name frozen ); +cassandra.query-5=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.history ( name text PRIMARY KEY, dataStart date, dateEnd timestamp); +cassandra.query-6=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contacts ( user text PRIMARY KEY, names list>); \ No newline at end of file