Author: jbellis
Date: Mon Sep 5 18:55:02 2011
New Revision: 1165388
URL: http://svn.apache.org/viewvc?rev=1165388&view=rev
Log:
clean up JDBC class declarations and accessibility modifiers
patch by Rick Shaw for CASSANDRA-3135
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractCassandraConnection.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractStatement.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDatabaseMetaData.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractCassandraConnection.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractCassandraConnection.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractCassandraConnection.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractCassandraConnection.java
Mon Sep 5 18:55:02 2011
@@ -33,7 +33,7 @@ import java.sql.Savepoint;
import java.sql.Struct;
import java.util.Map;
-public class AbstractCassandraConnection
+abstract class AbstractCassandraConnection
{
protected static final String NOT_SUPPORTED = "the Cassandra
implementation does not support this method";
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java
Mon Sep 5 18:55:02 2011
@@ -26,7 +26,7 @@ import java.sql.*;
import java.util.Map;
/** a class to hold all the unimplemented crap */
-class AbstractResultSet
+abstract class AbstractResultSet
{
protected static final String NOT_SUPPORTED = "the Cassandra
implementation does not support this method";
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractStatement.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractStatement.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractStatement.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractStatement.java
Mon Sep 5 18:55:02 2011
@@ -24,7 +24,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
-public class AbstractStatement
+abstract class AbstractStatement
{
protected static final String NOT_SUPPORTED = "the Cassandra
implementation does not support this method";
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java
Mon Sep 5 18:55:02 2011
@@ -36,7 +36,7 @@ import org.apache.cassandra.thrift.CqlRe
import org.apache.cassandra.thrift.CqlRow;
import org.apache.cassandra.utils.ByteBufferUtil;
-public class CResultSet extends AbstractResultSet implements CassandraResultSet
+class CResultSet extends AbstractResultSet implements CassandraResultSet
{
public static final int DEFAULT_TYPE = ResultSet.TYPE_FORWARD_ONLY;
public static final int DEFAULT_CONCURRENCY = ResultSet.CONCUR_READ_ONLY;
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
Mon Sep 5 18:55:02 2011
@@ -409,7 +409,7 @@ class CassandraConnection extends Abstra
* @throws SchemaDisagreementException when the client side and server
side are at different versions of schema (Thrift)
* @throws TException when there is a error in Thrift
processing
*/
- public CqlResult execute(String queryStr, Compression compression) throws
InvalidRequestException, UnavailableException, TimedOutException,
SchemaDisagreementException, TException
+ protected CqlResult execute(String queryStr, Compression compression)
throws InvalidRequestException, UnavailableException, TimedOutException,
SchemaDisagreementException, TException
{
currentKeyspace = determineCurrentKeyspace(queryStr, currentKeyspace);
@@ -436,7 +436,7 @@ class CassandraConnection extends Abstra
* @throws SchemaDisagreementException when the client side and server
side are at different versions of schema (Thrift)
* @throws TException when there is a error in Thrift
processing
*/
- public CqlResult execute(String queryStr) throws InvalidRequestException,
UnavailableException, TimedOutException, SchemaDisagreementException, TException
+ protected CqlResult execute(String queryStr) throws
InvalidRequestException, UnavailableException, TimedOutException,
SchemaDisagreementException, TException
{
return execute(queryStr, defaultCompression);
}
@@ -444,7 +444,7 @@ class CassandraConnection extends Abstra
/**
* Shutdown the remote connection
*/
- public void disconnect()
+ protected void disconnect()
{
transport.close();
}
@@ -452,7 +452,7 @@ class CassandraConnection extends Abstra
/**
* Connection state.
*/
- public boolean isConnected()
+ protected boolean isConnected()
{
return transport.isOpen();
}
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDatabaseMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDatabaseMetaData.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDatabaseMetaData.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDatabaseMetaData.java
Mon Sep 5 18:55:02 2011
@@ -32,7 +32,7 @@ import java.sql.SQLFeatureNotSupportedEx
import org.apache.cassandra.db.DBConstants;
import org.apache.cassandra.utils.FBUtilities;
-public class CassandraDatabaseMetaData implements DatabaseMetaData
+class CassandraDatabaseMetaData implements DatabaseMetaData
{
private CassandraConnection connection;
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java
Mon Sep 5 18:55:02 2011
@@ -60,7 +60,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class CassandraPreparedStatement extends CassandraStatement implements
PreparedStatement
+class CassandraPreparedStatement extends CassandraStatement implements
PreparedStatement
{
// private static final Pattern Parameterizable =
Pattern.compile("(SELECT|DELETE|UPDATE)\\s+.*", Pattern.CASE_INSENSITIVE);
private static final Pattern Select =
Pattern.compile("SELECT[\\s+FIRST\\s+\\d+]?[\\s+REVERSED]?\\s+(.*)WHERE\\s+(.*)",
Pattern.CASE_INSENSITIVE);
@@ -551,6 +551,5 @@ public class CassandraPreparedStatement
throw new SQLException("No parameter bound to " + (index - 1));
return p;
}
-
}
}
Modified:
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java?rev=1165388&r1=1165387&r2=1165388&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
(original)
+++
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
Mon Sep 5 18:55:02 2011
@@ -76,14 +76,14 @@ class ColumnDecoder
metadata.put(String.format("%s.%s", ks.getName(),
cf.getName()), new CFamMeta(cf));
}
- AbstractTerm<?> getComparator(String keyspace, String columnFamily)
+ protected AbstractTerm<?> getComparator(String keyspace, String
columnFamily)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace,
columnFamily));
AbstractTerm<?> type = (cf != null) ?
TypesMap.getTermForComparator(cf.comparator) : null;
return (type == null) ? null : type;
}
- AbstractTerm<?> getNameType(String keyspace, String columnFamily,
ByteBuffer name)
+ private AbstractTerm<?> getNameType(String keyspace, String columnFamily,
ByteBuffer name)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace,
columnFamily));
try
@@ -98,7 +98,7 @@ class ColumnDecoder
return TypesMap.getTermForComparator(cf.comparator);
}
- AbstractTerm<?> getValueType(String keyspace, String columnFamily,
ByteBuffer name)
+ private AbstractTerm<?> getValueType(String keyspace, String columnFamily,
ByteBuffer name)
{
CFamMeta cf = metadata.get(String.format("%s.%s", keyspace,
columnFamily));
if (cf == null)
