Skip to content

Commit d056a3c

Browse files
committed
removes APIs from Cassandra
1 parent b0a7b0f commit d056a3c

15 files changed

+12
-1129
lines changed

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/CassandraColumnFamilyManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ public interface CassandraColumnFamilyManager extends ColumnFamilyManager {
132132
Stream<ColumnEntity> execute(Statement statement) throws NullPointerException;
133133

134134
/**
135-
* Executes an query and uses as {@link CassandraPrepareStatment}
135+
* Executes an query and uses as {@link CassandraPreparedStatement}
136136
*
137137
* @param query the query
138138
* @return the CassandraPrepareStatment instance
139139
* @throws NullPointerException when query is null
140140
*/
141-
CassandraPrepareStatment nativeQueryPrepare(String query) throws NullPointerException;
141+
CassandraPreparedStatement nativeQueryPrepare(String query) throws NullPointerException;
142142
}

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/CassandraColumnFamilyManagerAsync.java

Lines changed: 0 additions & 176 deletions
This file was deleted.

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/CassandraColumnFamilyManagerFactory.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.datastax.driver.core.Cluster;
2020
import com.datastax.driver.core.Session;
21-
import jakarta.nosql.column.ColumnFamilyManagerAsyncFactory;
2221
import jakarta.nosql.column.ColumnFamilyManagerFactory;
2322

2423
import java.util.List;
@@ -27,7 +26,7 @@
2726
/**
2827
* The Cassandra implementation to {@link ColumnFamilyManagerFactory}
2928
*/
30-
public class CassandraColumnFamilyManagerFactory implements ColumnFamilyManagerFactory, ColumnFamilyManagerAsyncFactory {
29+
public class CassandraColumnFamilyManagerFactory implements ColumnFamilyManagerFactory {
3130

3231
private final Cluster cluster;
3332

@@ -50,11 +49,6 @@ public CassandraColumnFamilyManager get(String database) {
5049
return new DefaultCassandraColumnFamilyManager(cluster.connect(database), executor, database);
5150
}
5251

53-
@Override
54-
public CassandraColumnFamilyManagerAsync getAsync(String database) throws UnsupportedOperationException, NullPointerException {
55-
return new DefaultCassandraColumnFamilyManagerAsync(cluster.connect(database), executor, database);
56-
}
57-
5852
@Override
5953
public void close() {
6054
cluster.close();

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/CassandraConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.datastax.driver.core.Cluster;
2020
import jakarta.nosql.Settings;
2121
import jakarta.nosql.column.ColumnConfiguration;
22-
import jakarta.nosql.column.ColumnConfigurationAsync;
2322
import org.eclipse.jnosql.diana.driver.ConfigurationReader;
2423

2524
import java.util.HashMap;
@@ -29,7 +28,7 @@
2928
import static java.util.Objects.requireNonNull;
3029

3130
/**
32-
* The Cassandra implementation to {@link ColumnConfiguration} and {@link ColumnConfigurationAsync} that returns
31+
* The Cassandra implementation to {@link ColumnConfiguration} that returns
3332
* {@link CassandraColumnFamilyManagerFactory}
3433
* This configuration reads "diana-cassandra.properties" files and has the following configuration:
3534
* <p>cassandra.host-: The Cassandra host as prefix, you can set how much you want just setting the number order,
@@ -44,7 +43,7 @@
4443
* @see CassandraConfigurations
4544
* @see OldCassandraConfigurations
4645
*/
47-
public final class CassandraConfiguration implements ColumnConfiguration, ColumnConfigurationAsync {
46+
public final class CassandraConfiguration implements ColumnConfiguration {
4847

4948
static final String CASSANDRA_FILE_CONFIGURATION = "diana-cassandra.properties";
5049

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@
1717

1818
import com.datastax.driver.core.BoundStatement;
1919
import com.datastax.driver.core.ResultSet;
20-
import com.datastax.driver.core.ResultSetFuture;
2120
import com.datastax.driver.core.Session;
22-
import jakarta.nosql.ExecuteAsyncQueryException;
2321
import jakarta.nosql.column.ColumnEntity;
2422

2523
import java.util.concurrent.Executor;
26-
import java.util.function.Consumer;
2724
import java.util.stream.Stream;
2825

2926
/**
3027
* The Diana wrapper to {@link com.datastax.driver.core.PreparedStatement}
3128
*/
32-
public class CassandraPrepareStatment {
29+
public class CassandraPreparedStatement {
3330

3431
private final com.datastax.driver.core.PreparedStatement prepare;
3532

@@ -39,7 +36,7 @@ public class CassandraPrepareStatment {
3936

4037
private BoundStatement boundStatement;
4138

42-
CassandraPrepareStatment(com.datastax.driver.core.PreparedStatement prepare, Executor executor, Session session) {
39+
CassandraPreparedStatement(com.datastax.driver.core.PreparedStatement prepare, Executor executor, Session session) {
4340
this.prepare = prepare;
4441
this.executor = executor;
4542
this.session = session;
@@ -51,27 +48,14 @@ public Stream<ColumnEntity> executeQuery() {
5148
return resultSet.all().stream().map(CassandraConverter::toDocumentEntity);
5249
}
5350

54-
/**
55-
* Executes and call the callback with the result
56-
*
57-
* @param consumer the callback
58-
* @throws ExecuteAsyncQueryException when has async error
59-
* @throws NullPointerException when consumer is null
60-
*/
61-
public void executeQueryAsync(Consumer<Stream<ColumnEntity>> consumer) throws ExecuteAsyncQueryException, NullPointerException {
62-
loadBoundStatment();
63-
ResultSetFuture resultSet = session.executeAsync(boundStatement);
64-
CassandraReturnQueryAsync executeAsync = new CassandraReturnQueryAsync(resultSet, consumer);
65-
resultSet.addListener(executeAsync, executor);
66-
}
6751

6852
/**
6953
* Bind
7054
*
7155
* @param values the values
7256
* @return this instance
7357
*/
74-
public CassandraPrepareStatment bind(Object... values) {
58+
public CassandraPreparedStatement bind(Object... values) {
7559
boundStatement = prepare.bind(values);
7660
return this;
7761
}

cassandra-driver/src/main/java/org/eclipse/jnosql/diana/cassandra/column/CassandraReturnQueryAsync.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)