Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F03AFA95 for ; Fri, 10 May 2013 06:26:50 +0000 (UTC) Received: (qmail 46184 invoked by uid 500); 10 May 2013 06:26:50 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 46169 invoked by uid 500); 10 May 2013 06:26:50 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 46161 invoked by uid 99); 10 May 2013 06:26:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 06:26:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 06:26:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 266EA2388962; Fri, 10 May 2013 06:26:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1480892 [1/2] - in /db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/ client/net/ jdbc/ Date: Fri, 10 May 2013 06:26:14 -0000 To: derby-commits@db.apache.org From: dag@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130510062617.266EA2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dag Date: Fri May 10 06:26:13 2013 New Revision: 1480892 URL: http://svn.apache.org/r1480892 Log: DERBY-6125 Code clean up in client driver Patch derby-6125-misc-01-b, which further removes dead code opened up by previous removals, further limits visibility, and corrects one error introduced in a previous patch for this issue. * deleted: client/am/SqlState.java Removed this class as there were no longer any references to it. * modified: client/ClientPooledConnection.java Removed unused field netPhysicalConnection_. * modified: client/ClientXAConnection.java Removed unused method createControlConnection; import fix. * modified: client/am/ClientBlob.java Removed unused method getBinaryString. * modified: client/am/ClobLocatorWriter.java Corrected error introduced in a previous patch. * modified: client/am/ClientConnection.java * modified: client/am/ClientDatabaseMetaData.java * modified: client/am/ClientPreparedStatement.java * modified: client/am/DateTime.java * modified: client/am/ExceptionFormatter.java * modified: client/am/SqlWarning.java * modified: client/am/Sqlca.java * modified: client/am/StatementCacheInteractor.java * modified: client/net/NetConnectionReply.java * modified: client/net/NetConnectionRequest.java * modified: client/net/NetStatementReply.java Visibility restrictions. * modified: client/am/ClientJDBCObjectFactory.java * modified: client/net/ClientJDBCObjectFactoryImpl.java Removed unused method newClientPooledConnection(ClientBaseDataSourceRoot, LogWriter, String, String, int) Removed unused method newNetConnection(LogWriter, String, Properties) Removed unused method newNetConnection(LogWriter, ClientBaseDataSourceRoot, String, String) Removed unused method newNetConnection(LogWriter, String, int, ClientBaseDataSourceRoot, boolean) Removed unused method newStatement(Agent, ClientConnection) * modified: client/am/ClientResultSet.java Removed unused fields updatability_delete__, updatability_update__. Visibility restrictions. * modified: client/am/ClientStatement.java * modified: client/am/Configuration.java * modified: client/am/Lob.java Visibility restrictions. Import fix. * modified: client/am/CloseFilterInputStream.java * modified: client/am/ColumnMetaData.java * modified: client/am/Utils.java * modified: client/net/NetCursor.java * modified: client/net/NetResultSet40.java * modified: client/net/NetSqlca.java * modified: client/net/NetXAResource.java * modified: client/net/NetXAConnection.java * modified: client/net/Typdef.java * modified: jdbc/ClientConnectionPoolDataSource.java * modified: jdbc/ClientXADataSource.java Import fixes. * modified: client/am/Cursor.java Import fix, visibility restrictions, removed unused constants SBCS_CLOB, MBCS_CLOB, DBCS_CLOB, VARIABLE_BYTES. * modified: client/am/Diagnosable.java Import fixes. Removed interface method printTrace (+ implementations). * modified: client/am/LogWriter.java Removed unused method traceEntry(Object, String, int, Object, Object, Object) * modified: client/am/LogicalConnection.java Removed unused method preparePositionedUpdateStatement * modified: client/am/MaterialPreparedStatement.java Removed unused abstract methods methods writeDescribeOutput_ and readDescribeOutput_ (+ implementations) * modified: client/am/SqlException.java Import fixes. Visibility restrictions. Removed unused method printTrace(PrintWriter, String) * modified: client/am/XaException.java Import fixes. Removed unused method printTrace(PrintWriter, String) * modified: client/net/ClientJDBCObjectFactoryImpl40.java Removed unused method newClientPooledConnection(ClientBaseDataSourceRoot, LogWriter, String, String, int) Removed unused method newNetConnection(LogWriter, String, Properties) Removed unused method newNetConnection(LogWriter, ClientBaseDataSourceRoot, String, String) * modified: client/net/DssConstants.java Removed unused constant GDSFMT_RQSDSS_NOREPLY * modified: client/net/FdocaConstants.java Removed unused constants FDOCA_TYPE_FIXEDBYTES, FDOCA_TYPE_NFIXEDBYTES, FDOCA_TYPE_NVARBYTES, FDOCA_TYPE_NTBYTES, FDOCA_TYPE_NNTBYTES, FDOCA_TYPE_NPSCLBYTE, FDOCA_TYPE_FIXEDCHAR, FDOCA_TYPE_NFIXEDCHAR, FDOCA_TYPE_NVARCHAR , FDOCA_TYPE_NTCHAR, FDOCA_TYPE_NNTCHAR, FDOCA_TYPE_NPSCLCHAR, FDOCA_TYPE_INTEGER_BE, FDOCA_TYPE_NINTEGER_BE, FDOCA_TYPE_NDECIMAL, FDOCA_TYPE_FLOAT_IEEE, FDOCA_TYPE_NFLOAT_IEEE, FDOCA_TYPE_NLOBBYTES, FDOCA_TYPE_NLOBCHAR. * modified: client/net/NetAgent.java Visibility restriction. Removed unused method getPort. * modified: client/net/NetConfiguration.java Visibility restriction. Removed unused constant SECMEC_USRIDNWPWD. * modified: client/net/NetConnection.java Import fix. Removed unused fields cnntkn_, readOnlyTransaction. Removed unused methods getCnnToken. Removed useless method setReadOnlyTransactionFlag. Removed unused constructor NetConnection40(NetLogWriter, String, int, ClientBaseDataSourceRoot, boolean) * modified: client/net/NetConnection40.java Visibility restrictions. Removed unused constructor NetConnection40(NetLogWriter, String, int, ClientBaseDataSourceRoot, boolean) * modified: client/net/NetPackageReply.java Import fixes. Removed unused field rdbnam. Unused ultimately useless setting of netConnection_.setReadOnlyTransactionFlag, cd. NetConnction changes. * modified: client/net/NetPackageRequest.java Removed unused field collectionName. * modified: client/net/NetPreparedStatement.java Removed unused methods writeDescribeOutput_, readDescribeOutput_. * modified: client/net/NetXACallInfo.java Removed unused field crrtkn_ * modified: jdbc/ClientBaseDataSourceRoot.java Import fixes. Visibility restrictions. Removed unused constant SUPPORTS_EUSRIDPWD. Removed: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlState.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientBlob.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientResultSet.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorWriter.java db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Diagnosable.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ExceptionFormatter.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/am/MaterialPreparedStatement.java db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageReply.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXACallInfo.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Fri May 10 06:26:13 2013 @@ -66,7 +66,6 @@ public class ClientPooledConnection impl private int eventIterators; ClientConnection physicalConnection_ = null; - NetConnection netPhysicalConnection_ = null; NetXAConnection netXAPhysicalConnection_ = null; /** @@ -119,7 +118,7 @@ public class ClientPooledConnection impl //PooledConnection which will then raise the events //on the listeners - netPhysicalConnection_ = (NetConnection) + physicalConnection_ = ClientDriver.getFactory().newNetConnection( (NetLogWriter) logWriter_, user, @@ -131,7 +130,6 @@ public class ClientPooledConnection impl } catch (SqlException se) { throw se.getSQLException(); } - physicalConnection_ = netPhysicalConnection_; } /** Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java Fri May 10 06:26:13 2013 @@ -26,7 +26,6 @@ import javax.sql.XAConnection; import javax.transaction.xa.XAResource; import org.apache.derby.client.am.ClientMessageId; -import org.apache.derby.client.am.ClientConnection; import org.apache.derby.client.am.SqlException; import org.apache.derby.client.net.NetLogWriter; import org.apache.derby.client.net.NetXAConnection; @@ -98,39 +97,6 @@ public class ClientXAConnection extends return xares_; } - - public NetXAConnection createControlConnection( - NetLogWriter logWriter, - String user, - String password, - ClientBaseDataSourceRoot dataSource, - int rmId, - boolean isXAConn) throws SQLException { - - try { - controlCon_ = new NetXAConnection(logWriter, - user, - password, - dataSource, - rmId, - isXAConn, - this); - controlCon_.getNetConnection().setTransactionIsolation( - Connection.TRANSACTION_READ_UNCOMMITTED); - - if (logWriter_ != null) { - logWriter_.traceExit(this, "createControlConnection", controlCon_); - } - - return controlCon_; - } - catch ( SqlException se ) - { - throw se.getSQLException(); - } - } - - public synchronized void close() throws SQLException { super.close(); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientBlob.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientBlob.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientBlob.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientBlob.java Fri May 10 06:26:13 2013 @@ -704,10 +704,6 @@ public class ClientBlob extends Lob impl return ((dataType_ & BINARY_STREAM) == BINARY_STREAM); } - public byte[] getBinaryString() { - return binaryString_; - } - private long binaryStringPosition(byte[] pattern, long start) { // perform a local byte string search, starting at start // check that the range of comparison is valid Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java Fri May 10 06:26:13 2013 @@ -872,7 +872,7 @@ public abstract class ClientConnection // Just like closeX except the socket is not pulled. // Physical resources are not closed. - synchronized public void closeForReuse(boolean statementPooling) + synchronized void closeForReuse(boolean statementPooling) throws SqlException { if (!open_) { return; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java Fri May 10 06:26:13 2013 @@ -2420,7 +2420,7 @@ public abstract class ClientDatabaseMeta * Check if server supports boolean values * @return true if the server supports this */ - final public boolean serverSupportsBooleanValues() { + private boolean serverSupportsBooleanValues() { return supportsBooleanValues_; } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java Fri May 10 06:26:13 2013 @@ -54,19 +54,7 @@ public interface ClientJDBCObjectFactory String user, String password) throws SQLException; - /** - * This method is used to return an instance of - * ClientPooledConnection(or ClientPooledConnection40) class which - * implements {@code javax.sql.PooledConnection}. - */ - ClientPooledConnection newClientPooledConnection( - ClientBaseDataSourceRoot ds, - LogWriter logWriter, - String user, - String password, - int rmId) throws SQLException; - - /** + /** * This method is used to return an instance of * ClientXAConnection (or ClientXAConnection40) class which * implements {@code javax.sql.XAConnection}. @@ -220,27 +208,6 @@ public interface ClientJDBCObjectFactory StatementCacheInteractor cacheInteractor); /** - * This method returns an instance of NetConnection (or - * NetConnection40) class which extends from ClientConnection. This - * implements the {@code java.sql.Connection} interface. - */ - ClientConnection newNetConnection( - LogWriter netLogWriter, - String databaseName,Properties properties) - throws SqlException; - - /** - * This method returns an instance of NetConnection (or NetConnection40) class - * which extends from ClientConnection - * this implements the {@code java.sql.Connection} interface - */ - ClientConnection newNetConnection( - LogWriter netLogWriter, - ClientBaseDataSourceRoot clientDataSource, - String user, - String password) throws SqlException; - - /** * This method returns an instance of NetConnection (or NetConnection40) * class which extends from ClientConnection * this implements the java.sql.Connection interface @@ -265,19 +232,6 @@ public interface ClientJDBCObjectFactory boolean isXAConn) throws SqlException; /** - * This method returns an instance of NetConnection - * (or NetConnection40) class which extends from - * ClientConnection this implements the - * {@code java.sql.Connection interface}. - */ - ClientConnection newNetConnection( - LogWriter netLogWriter, - String ipaddr, - int portNumber, - ClientBaseDataSourceRoot dataSource, - boolean isXAConn) throws SqlException; - - /** * This method returns an instance of NetConnection (or NetConnection40) * class which extends Connection. * This implements the {@code java.sql.Connection} interface. @@ -331,19 +285,6 @@ public interface ClientJDBCObjectFactory ClientDatabaseMetaData newNetDatabaseMetaData(Agent netAgent, ClientConnection netConnection); - /** - * This method provides an instance of Statement or Statement40 - * depending on the jdk version under use - * @param agent Agent - * @param connection Connection - * @return a {@code java.sql.Statement} implementation - * @throws SqlException - * - */ - ClientStatement newStatement(Agent agent, - ClientConnection connection) - throws SqlException; - /** * This method provides an instance of Statement or Statement40 * depending on the jdk version under use Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java Fri May 10 06:26:13 2013 @@ -996,7 +996,7 @@ public class ClientPreparedStatement ext setBinaryStream(parameterIndex,x,(long)length); } - protected void setBinaryStreamX(int parameterIndex, + private void setBinaryStreamX(int parameterIndex, InputStream x, int length) throws SqlException { parameterMetaData_.clientParamtertype_[parameterIndex - 1] = Types.BLOB; @@ -1918,7 +1918,7 @@ public class ClientPreparedStatement ext writeDescribeInput(section_); } - void readPrepareDescribeInput() throws SqlException { + private void readPrepareDescribeInput() throws SqlException { readPrepare(); readDescribeInput(); completePrepareDescribe(); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientResultSet.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientResultSet.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientResultSet.java Fri May 10 06:26:13 2013 @@ -87,11 +87,6 @@ public abstract class ClientResultSet im private final static int scrollOrientation_current__ = 8; private final static int scrollOrientation_next__ = 0; - // public final static int updatability_unknown__ = 0; - // public final static int updatability_readOnly__ = 1; - public final static int updatability_delete__ = 2; - public final static int updatability_update__ = 4; - public final static int sensitivity_unknown__ = 0; public final static int sensitivity_insensitive__ = 1; public final static int sensitivity_sensitive_static__ = 2; @@ -476,7 +471,7 @@ public abstract class ClientResultSet im outerStatement_ = null; } - public void nullDataForGC() { + private void nullDataForGC() { // This method is called by closeX(). We cannot call this if cursor is cached, // otherwise it will cause NullPointerException's when cursor is reused. // Cursor is only cached for PreparedStatement's. @@ -487,7 +482,8 @@ public abstract class ClientResultSet im resultSetMetaData_ = null; } - void flowCloseAndAutoCommitIfNotAutoCommitted() throws SqlException { + private void flowCloseAndAutoCommitIfNotAutoCommitted() + throws SqlException { agent_.beginWriteChain(statement_); boolean performedAutoCommit = writeCloseAndAutoCommit(); agent_.flow(statement_); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java Fri May 10 06:26:13 2013 @@ -29,7 +29,6 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; -import java.util.List; import java.util.StringTokenizer; import org.apache.derby.shared.common.reference.SQLState; import org.apache.derby.shared.common.sanity.SanityManager; @@ -378,7 +377,7 @@ public class ClientStatement implements initStatement(agent, connection); } - public void resetStatement(Agent agent, ClientConnection connection) + void resetStatement(Agent agent, ClientConnection connection) throws SqlException { resetStatement(); initStatement(agent, connection); @@ -1700,7 +1699,7 @@ public class ClientStatement implements materialStatement_.writePrepareDescribeOutput_(sql, section); } - public void readPrepareDescribeOutput() throws SqlException { + void readPrepareDescribeOutput() throws SqlException { materialStatement_.readPrepareDescribeOutput_(); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorWriter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorWriter.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorWriter.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorWriter.java Fri May 10 06:26:13 2013 @@ -126,7 +126,7 @@ class ClobLocatorWriter extends Writer { /** * @see java.io.Writer#write(char[]) */ - public void wriUSLte(char[] c) throws IOException { + public void write(char[] c) throws IOException { checkClosed(); writeCharacters(c, 0, c.length); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CloseFilterInputStream.java Fri May 10 06:26:13 2013 @@ -23,7 +23,6 @@ package org.apache.derby.client.am; import java.io.InputStream; import java.io.FilterInputStream; - import java.io.IOException; import org.apache.derby.shared.common.reference.MessageId; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Fri May 10 06:26:13 2013 @@ -25,7 +25,6 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Types; -import java.util.ArrayList; import java.util.Hashtable; import org.apache.derby.iapi.reference.DRDAConstants; import org.apache.derby.iapi.reference.JDBC30Translation; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Fri May 10 06:26:13 2013 @@ -27,7 +27,6 @@ import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.sql.Connection; -import java.util.StringTokenizer; import org.apache.derby.iapi.services.info.ProductGenusNames; import org.apache.derby.iapi.services.info.ProductVersionHolder; @@ -68,7 +67,7 @@ public class Configuration { private final static String[] dncCompatibleJREVersions = {"1.5", "1.6", "1.7", "1.8"}; - public static String[] getDncCompatibleJREVersions() { + static String[] getDncCompatibleJREVersions() { return dncCompatibleJREVersions.clone(); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java Fri May 10 06:26:13 2013 @@ -61,13 +61,13 @@ public abstract class Cursor { public final static int NULL_TERMINATED_STRING = 3; public final static int BYTES = 4; - public final static int VARIABLE_BYTES = 5; + // unused protocol element: VARIABLE_BYTES = 5; // unused protocol element: VARIABLE_SHORT_BYTES = 6; public final static int NULL_TERMINATED_BYTES = 7; - public final static int SBCS_CLOB = 8; - public final static int MBCS_CLOB = 9; - public final static int DBCS_CLOB = 10; + // unused protocol element: SBCS_CLOB = 8; + // unused protocol element: MBCS_CLOB = 9; + // unused protocol element: DBCS_CLOB = 10; //-----------------------------internal state--------------------------------- //-------------Structures for holding and scrolling the data ----------------- @@ -114,9 +114,9 @@ public abstract class Cursor { private boolean isRowUpdated_; final static Boolean ROW_IS_NULL = Boolean.TRUE; - final static Boolean ROW_IS_NOT_NULL = Boolean.FALSE; + private final static Boolean ROW_IS_NOT_NULL = Boolean.FALSE; - Calendar recyclableCalendar_ = null; + private Calendar recyclableCalendar_ = null; // For the net, this data comes from the query descriptor. @@ -130,7 +130,7 @@ public abstract class Cursor { //---------------------------------------------------------------------------- public int[] ccsid_; - char[] charBuffer_; + private char[] charBuffer_; //---------------------constructors/finalizer--------------------------------- Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java Fri May 10 06:26:13 2013 @@ -120,7 +120,7 @@ public class DateTime { * @return Time translated from buffer with specified encoding * @throws UnsupportedEncodingException */ - public static final Time timeBytesToTime(byte[] buffer, + static final Time timeBytesToTime(byte[] buffer, int offset, Calendar recyclableCal, String encoding) Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Diagnosable.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Diagnosable.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Diagnosable.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Diagnosable.java Fri May 10 06:26:13 2013 @@ -21,10 +21,6 @@ package org.apache.derby.client.am; -import java.io.PrintWriter; - interface Diagnosable { public Sqlca getSqlca(); - - public void printTrace(PrintWriter printWriter, String messageHeader); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ExceptionFormatter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ExceptionFormatter.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ExceptionFormatter.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ExceptionFormatter.java Fri May 10 06:26:13 2013 @@ -157,7 +157,7 @@ class ExceptionFormatter { } } - static void printTrace(Sqlca sqlca, + private static void printTrace(Sqlca sqlca, PrintWriter printWriter, String messageHeader) { String header = messageHeader + "[" + "Sqlca@" + Integer.toHexString(sqlca.hashCode()) + "]"; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java Fri May 10 06:26:13 2013 @@ -23,9 +23,8 @@ package org.apache.derby.client.am; import java.io.InputStream; import java.io.IOException; -import java.util.ArrayList; - import java.sql.SQLException; +import java.util.ArrayList; import java.util.Iterator; import org.apache.derby.client.net.NetConfiguration; @@ -79,7 +78,7 @@ public abstract class Lob implements Uni private int transactionID_; //-----------------------------messageId------------------------------------------ - final static protected ClientMessageId LOB_OBJECT_LENGTH_UNKNOWN_YET = + final static private ClientMessageId LOB_OBJECT_LENGTH_UNKNOWN_YET = new ClientMessageId( SQLState.LOB_OBJECT_LENGTH_UNKNOWN_YET ); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java Fri May 10 06:26:13 2013 @@ -595,12 +595,6 @@ public class LogWriter { } void traceEntry(Object instance, String methodName, - int arg1, Object arg2, Object arg3, Object arg4) { - traceEntryAllArgs(instance, methodName, - "(" + arg1 + ", " + arg2 + ", " + arg3 + ", " + arg4 + ")"); - } - - void traceEntry(Object instance, String methodName, int arg1, Object arg2, int arg3, int arg4) { traceEntryAllArgs(instance, methodName, "(" + arg1 + ", " + arg2 + ", " + arg3 + ", " + arg4 + ")"); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection.java Fri May 10 06:26:13 2013 @@ -206,19 +206,6 @@ public class LogicalConnection implement } } - synchronized - public ClientPreparedStatement preparePositionedUpdateStatement( - String sql, - Section querySection) throws SqlException { - - try { - checkForNullPhysicalConnection(); - } catch ( SQLException se ) { - throw new SqlException(se); - } - return physicalConnection_.preparePositionedUpdateStatement(sql, querySection); - } - synchronized public CallableStatement prepareCall(String sql) throws SQLException { try { Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/MaterialPreparedStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/MaterialPreparedStatement.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/MaterialPreparedStatement.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/MaterialPreparedStatement.java Fri May 10 06:26:13 2013 @@ -54,8 +54,4 @@ public interface MaterialPreparedStateme public abstract void writeDescribeInput_(Section section) throws SqlException; public abstract void readDescribeInput_() throws SqlException; - - public abstract void writeDescribeOutput_(Section section) throws SqlException; - - public abstract void readDescribeOutput_() throws SqlException; } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Fri May 10 06:26:13 2013 @@ -21,7 +21,6 @@ package org.apache.derby.client.am; -import java.io.PrintWriter; import java.sql.SQLException; import org.apache.derby.shared.common.i18n.MessageUtil; @@ -184,12 +183,16 @@ public class SqlException extends Except this.errorcode_ = sqlcode.getCode(); } - public SqlException(LogWriter logWriter, ClientMessageId msgid, Object[] args, + private SqlException( + LogWriter logWriter, + ClientMessageId msgid, + Object[] args, SqlCode sqlcode) { + this(logWriter, msgid, args, sqlcode, (Throwable)null); } - public SqlException(LogWriter logWriter, ClientMessageId msgid, Object arg1, + SqlException(LogWriter logWriter, ClientMessageId msgid, Object arg1, SqlCode sqlcode) { this(logWriter, msgid, new Object[] {arg1}, sqlcode); } @@ -296,13 +299,13 @@ public class SqlException extends Except // Once all messages are internationalized, these methods should become // private - protected SqlException(LogWriter logWriter, String reason, String sqlState, + private SqlException(LogWriter logWriter, String reason, String sqlState, int errorCode) { this(logWriter, (Throwable)null, reason, sqlState, errorCode); } - protected SqlException(LogWriter logWriter, Throwable throwable, + private SqlException(LogWriter logWriter, Throwable throwable, String reason, String sqlState, int errorCode ) { message_ = reason; sqlstate_ = sqlState; @@ -489,15 +492,11 @@ public class SqlException extends Except } } - public void printTrace(PrintWriter printWriter, String header) { - ExceptionFormatter.printTrace(this, printWriter, header); - } - /** * Helper method to construct an exception which basically says that * we encountered an underlying Java exception */ - public static SqlException javaException(LogWriter logWriter, Throwable e) { + static SqlException javaException(LogWriter logWriter, Throwable e) { return new SqlException(logWriter, new ClientMessageId (SQLState.JAVA_EXCEPTION), new Object[] {e.getClass().getName(), e.getMessage()}, e); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java Fri May 10 06:26:13 2013 @@ -32,7 +32,7 @@ import java.sql.SQLWarning; */ public class SqlWarning extends SqlException implements Diagnosable { - protected SqlWarning nextWarning_; + private SqlWarning nextWarning_; SqlWarning (LogWriter logwriter, ClientMessageId msgid) { Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Sqlca.java Fri May 10 06:26:13 2013 @@ -228,7 +228,7 @@ public abstract class Sqlca { return sqlErrd_; } - public String formatSqlErrd() { + String formatSqlErrd() { return Utils.getStringFromInts(getSqlErrd()); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/StatementCacheInteractor.java Fri May 10 06:26:13 2013 @@ -215,7 +215,7 @@ public final class StatementCacheInterac * A cache interactor is bound to a single (caching) logical connection. * @throws SQLException if closing an open logical connection fails */ - public synchronized void closeOpenLogicalStatements() + synchronized void closeOpenLogicalStatements() throws SQLException { // Transist to closing state, to avoid changing the list of open // statements as we work our way through the list. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Utils.java Fri May 10 06:26:13 2013 @@ -23,7 +23,6 @@ package org.apache.derby.client.am; import java.math.BigDecimal; import java.sql.SQLException; -import java.sql.Types; import org.apache.derby.shared.common.reference.MessageId; // Self-contained utilities. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/XaException.java Fri May 10 06:26:13 2013 @@ -21,7 +21,6 @@ package org.apache.derby.client.am; -import java.io.PrintWriter; import javax.transaction.xa.XAException; @@ -40,10 +39,6 @@ public class XaException extends XAExcep public Sqlca getSqlca() { return null; } - - public void printTrace(PrintWriter printWriter, String header) { - ExceptionFormatter.printTrace(this, printWriter, header); - } } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java Fri May 10 06:26:13 2013 @@ -85,19 +85,6 @@ public class ClientJDBCObjectFactoryImpl return new ClientPooledConnection(ds,logWriter,user,password); } /** - * @return an instance of {@link - * org.apache.derby.client.ClientPooledConnection} - */ - public ClientPooledConnection newClientPooledConnection( - ClientBaseDataSourceRoot ds, - LogWriter logWriter, - String user, - String password, - int rmId) throws SQLException { - - return new ClientPooledConnection(ds,logWriter,user,password,rmId); - } - /** * @return an instance of {@link org.apache.derby.client.ClientXAConnection} */ public ClientXAConnection newClientXAConnection(ClientBaseDataSourceRoot ds, @@ -279,34 +266,6 @@ public class ClientJDBCObjectFactoryImpl } /** - * @return a new connection, see {@link NetConnection} - */ - public ClientConnection newNetConnection( - LogWriter netLogWriter, - String databaseName, - Properties properties) throws SqlException { - - return new NetConnection( - (NetLogWriter)netLogWriter, - databaseName, - properties); - } - /** - * @return a new connection, see {@link NetConnection} - */ - public ClientConnection newNetConnection( - LogWriter netLogWriter, - ClientBaseDataSourceRoot clientDataSource, - String user, - String password) throws SqlException { - - return new NetConnection( - (NetLogWriter)netLogWriter, - clientDataSource, - user, - password); - } - /** * @return an instance of {@link org.apache.derby.client.net.NetConnection} */ public ClientConnection newNetConnection( @@ -343,23 +302,6 @@ public class ClientJDBCObjectFactoryImpl rmId, isXAConn); } - /** - * @return an instance of {@link org.apache.derby.client.net.NetConnection} - */ - public ClientConnection newNetConnection( - LogWriter netLogWriter, - String ipaddr, - int portNumber, - ClientBaseDataSourceRoot dataSource, - boolean isXAConn) throws SqlException { - - return new NetConnection( - (NetLogWriter)netLogWriter, - ipaddr, - portNumber, - dataSource, - isXAConn); - } /** * Returns an instance of NetConnection. @@ -418,21 +360,6 @@ public class ClientJDBCObjectFactoryImpl (NetConnection)netConnection); } - /** - * This method provides an instance of Statement - * @param agent Agent - * @param connection Connection - * @return a ClientStatement implementation - * @throws SqlException - * - */ - public ClientStatement newStatement( - Agent agent, - ClientConnection connection) throws SqlException { - - return new ClientStatement(agent,connection); - } - /** * This method provides an instance of Statement * @param agent Agent Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java Fri May 10 06:26:13 2013 @@ -80,15 +80,6 @@ public class ClientJDBCObjectFactoryImpl } /** * @return an instance of - * {@link org.apache.derby.client.ClientPooledConnection40} - */ - public ClientPooledConnection newClientPooledConnection( - ClientBaseDataSourceRoot ds, LogWriter logWriter,String user, - String password,int rmId) throws SQLException { - return new ClientPooledConnection40(ds,logWriter,user,password,rmId); - } - /** - * @return an instance of * {@link org.apache.derby.client.ClientXAConnection40} */ public ClientXAConnection newClientXAConnection( @@ -257,34 +248,6 @@ public class ClientJDBCObjectFactoryImpl } /** - * @return an instance of {@link NetConnection40} - */ - public ClientConnection newNetConnection( - LogWriter netLogWriter, - String databaseName, - Properties properties) throws SqlException { - - return new NetConnection40( - (NetLogWriter)netLogWriter, - databaseName, - properties); - } - /** - * @return an instance of {@link NetConnection40} - */ - public ClientConnection newNetConnection - (LogWriter netLogWriter, - ClientBaseDataSourceRoot clientDataSource, - String user, - String password) throws SqlException { - - return new NetConnection40( - (NetLogWriter)netLogWriter, - clientDataSource, - user, - password); - } - /** * @return an instance of * {@link org.apache.derby.client.net.NetConnection40} */ Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java Fri May 10 06:26:13 2013 @@ -41,11 +41,6 @@ class DssConstants { // GDS formatter for an RQSDSS. static final int GDSFMT_RQSDSS = 0x01; - - // GDS formatter for an RQSDSS without a reply. - static final int GDSFMT_RQSDSS_NOREPLY = 0x05; - - // hide the default constructor private DssConstants() { } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/FdocaConstants.java Fri May 10 06:26:13 2013 @@ -22,34 +22,15 @@ package org.apache.derby.client.net; class FdocaConstants { -// PROTOCOL FD:OCA constants. - static final int FDOCA_TYPE_FIXEDBYTES = 0x01; - static final int FDOCA_TYPE_NFIXEDBYTES = 0x81; +// PROTOCOL FD:OCA constants used (subset) static final int FDOCA_TYPE_VARBYTES = 0x02; - static final int FDOCA_TYPE_NVARBYTES = 0x82; - static final int FDOCA_TYPE_NTBYTES = 0x03; - static final int FDOCA_TYPE_NNTBYTES = 0x83; static final int FDOCA_TYPE_PSCLBYTE = 0x07; - static final int FDOCA_TYPE_NPSCLBYTE = 0x87; - static final int FDOCA_TYPE_FIXEDCHAR = 0x10; - static final int FDOCA_TYPE_NFIXEDCHAR = 0x90; static final int FDOCA_TYPE_VARCHAR = 0x11; - static final int FDOCA_TYPE_NVARCHAR = 0x91; - static final int FDOCA_TYPE_NTCHAR = 0x14; - static final int FDOCA_TYPE_NNTCHAR = 0x94; static final int FDOCA_TYPE_PSCLCHAR = 0x19; - static final int FDOCA_TYPE_NPSCLCHAR = 0x99; - static final int FDOCA_TYPE_INTEGER_BE = 0x23; - static final int FDOCA_TYPE_NINTEGER_BE = 0xA3; static final int FDOCA_TYPE_DECIMAL = 0x30; - static final int FDOCA_TYPE_NDECIMAL = 0xB0; static final int FDOCA_TYPE_NUMERIC_CHAR = 0x32; - static final int FDOCA_TYPE_FLOAT_IEEE = 0x48; - static final int FDOCA_TYPE_NFLOAT_IEEE = 0xC8; static final int FDOCA_TYPE_LOBBYTES = 0x50; - static final int FDOCA_TYPE_NLOBBYTES = 0xD0; static final int FDOCA_TYPE_LOBCHAR = 0x51; - static final int FDOCA_TYPE_NLOBCHAR = 0xD1; static final int CPT_TRIPLET_TYPE = 0x7F; // CPT triplet type static final int MDD_TRIPLET_TYPE = 0x78; // MDD triplet type Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java Fri May 10 06:26:13 2013 @@ -525,14 +525,9 @@ public class NetAgent extends Agent { /** * Switches the current CCSID manager to EBCDIC */ - public void switchToEbcdicMgr() { + void switchToEbcdicMgr() { currentCcsidManager_ = ebcdicCcsidManager_; } - - protected int getPort() { - return port_; - } - } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java Fri May 10 06:26:13 2013 @@ -111,7 +111,7 @@ public class NetConfiguration { static final int MGRLVL_5 = 0x05; // Manager Level 7 constant. - static final public int MGRLVL_7 = 0x07; + static final int MGRLVL_7 = 0x07; // Indicates userid/encrypted password security mechanism. public static final int SECMEC_EUSRIDPWD = 0x09; @@ -122,9 +122,6 @@ public class NetConfiguration { // Indicates userid/encrypted password security mechanism. public static final int SECMEC_USRENCPWD = 0x07; - // Indicates userid/new password security mechanism. - static final int SECMEC_USRIDNWPWD = 0x05; - // Indicates userid/password security mechanism. public static final int SECMEC_USRIDPWD = 0x03; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Fri May 10 06:26:13 2013 @@ -25,10 +25,7 @@ import java.io.OutputStream; import java.net.SocketTimeoutException; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.sql.SQLException; import java.util.Arrays; -import java.util.Enumeration; -import java.util.HashMap; import java.util.List; import java.util.Properties; import javax.transaction.xa.Xid; @@ -168,15 +165,10 @@ public class NetConnection extends Clien return password; } - protected byte[] cnntkn_ = null; - protected NetXAResource xares_ = null; private List indoubtTransactions_ = null; protected int currXACallInfoOffset_ = 0; - // Flag to indicate a read only transaction - protected boolean readOnlyTransaction_ = true; - //---------------------constructors/finalizer--------------------------------- NetConnection(NetLogWriter netLogWriter, @@ -238,25 +230,6 @@ public class NetConnection extends Clien initialize(password, dataSource, isXAConn); } - NetConnection(NetLogWriter netLogWriter, - String ipaddr, - int portNumber, - ClientBaseDataSourceRoot dataSource, - boolean isXAConn) throws SqlException { - super(netLogWriter, isXAConn, dataSource); - this.pooledConnection_ = null; - this.closeStatementsOnClose = true; - netAgent_ = (NetAgent) super.agent_; - if (netAgent_.exceptionOpeningSocket_ != null) { - throw netAgent_.exceptionOpeningSocket_; - } - checkDatabaseName(); - this.isXAConnection_ = isXAConn; - flowSimpleConnect(); - productID_ = targetSrvrlslv_; - super.completeConnect(); - } - // For JDBC 2 Connections /** * This constructor is called from the ClientPooledConnection object @@ -573,10 +546,6 @@ public class NetConnection extends Clien } } - private byte[] getCnnToken() { - return cnntkn_; - } - //--------------------------------flow methods-------------------------------- private void flowUSRIDPWDconnect(String password) throws SqlException { @@ -1612,10 +1581,6 @@ public class NetConnection extends Clien return indoubtTransactions_.toArray(result); } - protected void setReadOnlyTransactionFlag(boolean flag) { - readOnlyTransaction_ = flag; - } - public SectionManager newSectionManager (Agent agent) { return new SectionManager(agent); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Fri May 10 06:26:13 2013 @@ -90,15 +90,6 @@ public class NetConnection40 extends Ne super(netLogWriter,user,password,dataSource,rmId,isXAConn); } - NetConnection40(NetLogWriter netLogWriter, - String ipaddr, - int portNumber, - ClientBaseDataSourceRoot dataSource, - boolean isXAConn) throws SqlException{ - super(netLogWriter,ipaddr,portNumber,dataSource,isXAConn); - } - - /** * The constructor for the NetConnection40 class which contains * implementations of JDBC 4.0 specific methods in the java.sql.Connection @@ -121,14 +112,14 @@ public class NetConnection40 extends Ne * @throws SqlException */ - public NetConnection40(NetLogWriter netLogWriter, + NetConnection40(NetLogWriter netLogWriter, String user, String password, ClientBaseDataSourceRoot dataSource, int rmId, boolean isXAConn, ClientPooledConnection cpc) throws SqlException{ - super(netLogWriter,user,password,dataSource,rmId,isXAConn,cpc); + super(netLogWriter,user,password,dataSource,rmId,isXAConn,cpc); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java Fri May 10 06:26:13 2013 @@ -42,7 +42,7 @@ import org.apache.derby.shared.common.i1 import org.apache.derby.shared.common.sanity.SanityManager; -public class NetConnectionReply extends Reply +class NetConnectionReply extends Reply implements ConnectionReplyInterface { private static MessageUtil msgutil_ = SqlException.getMessageUtil(); @@ -330,7 +330,8 @@ public class NetConnectionReply extends } } - void parseExchangeServerAttributesError() throws DisconnectException { + private void parseExchangeServerAttributesError() + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.CMDCHKRM: @@ -344,7 +345,8 @@ public class NetConnectionReply extends } } - void parseAccessSecurityError(NetConnection netConnection) throws DisconnectException { + private void parseAccessSecurityError(NetConnection netConnection) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.CMDCHKRM: @@ -382,7 +384,8 @@ public class NetConnectionReply extends } } - void parseAccessRdbError(NetConnection netConnection) throws DisconnectException { + private void parseAccessRdbError(NetConnection netConnection) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.CMDCHKRM: @@ -435,7 +438,10 @@ public class NetConnectionReply extends * @throws DisconnectException * */ - NetSqlca parseAbnormalEndUow(ConnectionCallbackInterface connection,UnitOfWorkListener uwl) throws DisconnectException { + private NetSqlca parseAbnormalEndUow( + ConnectionCallbackInterface connection, + UnitOfWorkListener uwl) throws DisconnectException { + parseABNUOWRM(); if (peekCodePoint() != CodePoint.SQLCARD) { parseTypdefsOrMgrlvlovrs(); @@ -1720,7 +1726,7 @@ public class NetConnectionReply extends // RDBNAM - required // // Called by all the NET*Reply classes. - void parseABNUOWRM() throws DisconnectException { + private void parseABNUOWRM() throws DisconnectException { boolean svrcodReceived = false; int svrcod = CodePoint.SVRCOD_INFO; boolean rdbnamReceived = false; @@ -2794,7 +2800,8 @@ public class NetConnectionReply extends doValnsprmSemantics(codePoint, Integer.toString(value)); } - void doValnsprmSemantics(int codePoint, String value) throws DisconnectException { + private void doValnsprmSemantics(int codePoint, String value) + throws DisconnectException { // special case the FDODTA codepoint not to disconnect. if (codePoint == CodePoint.FDODTA) { Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java Fri May 10 06:26:13 2013 @@ -176,7 +176,7 @@ class NetConnectionRequest extends Reque // The Relational Database Name (RDBNAM) is an optional parameter // which will not be sent by this command to reduce size, building, // and parsing. - void buildRDBCMM() throws SqlException { + private void buildRDBCMM() throws SqlException { createCommand(); writeLengthCodePoint(0x04, CodePoint.RDBCMM); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java Fri May 10 06:26:13 2013 @@ -30,7 +30,6 @@ import org.apache.derby.client.am.Client import org.apache.derby.client.am.ClientMessageId; import org.apache.derby.client.am.ClientClob; import org.apache.derby.client.am.Cursor; -import org.apache.derby.client.am.Cursor; import org.apache.derby.client.am.DisconnectException; import org.apache.derby.client.am.Lob; import org.apache.derby.client.am.SignedBinary; @@ -39,7 +38,6 @@ import org.apache.derby.client.am.SqlExc import org.apache.derby.client.am.SqlWarning; import org.apache.derby.client.am.ClientTypes; import org.apache.derby.client.am.Utils; -import org.apache.derby.client.am.Utils; import org.apache.derby.shared.common.reference.SQLState; import org.apache.derby.shared.common.sanity.SanityManager; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageReply.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageReply.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageReply.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageReply.java Fri May 10 06:26:13 2013 @@ -22,8 +22,6 @@ package org.apache.derby.client.net; import org.apache.derby.client.am.DisconnectException; -import org.apache.derby.client.am.ClientMessageId; -import org.apache.derby.shared.common.reference.SQLState; class NetPackageReply extends NetConnectionReply { NetPackageReply(NetAgent netAgent, int bufferSize) { @@ -94,18 +92,10 @@ class NetPackageReply extends NetConnect boolean svrcodReceived = false; int svrcod = CodePoint.SVRCOD_INFO; boolean rdbnamReceived = false; - String rdbnam = null; parseLengthAndMatchCodePoint(CodePoint.RDBUPDRM); pushLengthOnCollectionStack(); - // in XA Global transaction we need to know if we have a read-only - // transaction, if we get a RDBUPDRM this is NOT a read-only transaction - // currently only XAConnections care about read-only transactions, if - // non-XA wants this information they will need to initialize the flag - // at start of UOW - netAgent_.netConnection_.setReadOnlyTransactionFlag(false); - int peekCP = peekCodePoint(); while (peekCP != Reply.END_OF_COLLECTION) { @@ -122,7 +112,7 @@ class NetPackageReply extends NetConnect if (peekCP == CodePoint.RDBNAM) { foundInPass = true; rdbnamReceived = checkAndGetReceivedFlag(rdbnamReceived); - rdbnam = parseRDBNAM(true); + parseRDBNAM(true); peekCP = peekCodePoint(); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPackageRequest.java Fri May 10 06:26:13 2013 @@ -34,15 +34,6 @@ class NetPackageRequest extends NetConne super(netAgent, bufferSize); } - // RDB Package Name, Consistency Token - // Scalar Object specifies the fully qualified name of a relational - // database package and its consistency token. - // - // To accomodate larger lengths, the Scalar Data Length - // (SCLDTALEN) Field is used to specify the length of the instance - // variable which follows. - static final String collectionName = "NULLID"; - private void buildCommonPKGNAMinfo(Section section) throws SqlException { String collectionToFlow = COLLECTIONNAME; // the scalar data length field may or may not be required. it depends Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java Fri May 10 06:26:13 2013 @@ -190,12 +190,4 @@ class NetPreparedStatement extends NetSt public void readDescribeInput_() throws SqlException { netAgent_.statementReply_.readDescribeInput(preparedStatement_); } - - public void writeDescribeOutput_(Section section) throws SqlException { - netAgent_.statementRequest_.writeDescribeOutput(this, section); - } - - public void readDescribeOutput_() throws SqlException { - netAgent_.statementReply_.readDescribeOutput(preparedStatement_); - } } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java Fri May 10 06:26:13 2013 @@ -33,9 +33,7 @@ import java.sql.SQLException; import java.sql.SQLXML; import java.sql.Time; import java.sql.Timestamp; -import java.sql.SQLFeatureNotSupportedException; import org.apache.derby.client.am.SQLExceptionFactory; -import org.apache.derby.iapi.sql.ResultSet; import org.apache.derby.client.am.Cursor; import org.apache.derby.client.am.ClientMessageId; import org.apache.derby.client.am.SqlException; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java Fri May 10 06:26:13 2013 @@ -27,7 +27,6 @@ import org.apache.derby.client.am.Client import org.apache.derby.client.am.SqlException; import java.io.UnsupportedEncodingException; import org.apache.derby.client.am.ClientConnection; -import org.apache.derby.client.am.DisconnectException; class NetSqlca extends Sqlca { // these are the same variables that are in the Sqlca except ccsids Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java Fri May 10 06:26:13 2013 @@ -429,8 +429,9 @@ class NetStatementReply extends NetPacka // followed by an optional SQLCARD, followed by an optional // SQL Column Information Reply data object, followed by a Query Descriptor. // There may also be Query Data or an End of Query Reply Message. - NetResultSet parseResultSetCursor(StatementCallbackInterface statementI, - Section section) throws DisconnectException { + private NetResultSet parseResultSetCursor( + StatementCallbackInterface statementI, + Section section) throws DisconnectException { // The first item returne is an OPNQRYRM. NetResultSet netResultSet = parseOPNQRYRM(statementI, false); @@ -473,7 +474,7 @@ class NetStatementReply extends NetPacka return netResultSet; } - void parseOpenQuery(StatementCallbackInterface statementI) + private void parseOpenQuery(StatementCallbackInterface statementI) throws DisconnectException { NetResultSet netResultSet = parseOPNQRYRM(statementI, true); @@ -539,14 +540,16 @@ class NetStatementReply extends NetPacka resultSetI.earlyCloseComplete(netSqlca); } - void parseOpenQueryFailure(StatementCallbackInterface statementI) throws DisconnectException { + private void parseOpenQueryFailure(StatementCallbackInterface statementI) + throws DisconnectException { parseOPNQFLRM(statementI); parseTypdefsOrMgrlvlovrs(); NetSqlca netSqlca = parseSQLCARD(null); statementI.completeOpenQuery(netSqlca, null); } - void parsePrepareError(StatementCallbackInterface statement) throws DisconnectException { + private void parsePrepareError(StatementCallbackInterface statement) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -581,7 +584,8 @@ class NetStatementReply extends NetPacka } } - void parseExecuteImmediateError(StatementCallbackInterface statement) throws DisconnectException { + private void parseExecuteImmediateError(StatementCallbackInterface statement) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -618,7 +622,8 @@ class NetStatementReply extends NetPacka } - void parseDescribeError(StatementCallbackInterface statement) throws DisconnectException { + private void parseDescribeError(StatementCallbackInterface statement) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -648,7 +653,8 @@ class NetStatementReply extends NetPacka } - void parseOpenQueryError(StatementCallbackInterface statementI) throws DisconnectException { + private void parseOpenQueryError(StatementCallbackInterface statementI) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -680,7 +686,8 @@ class NetStatementReply extends NetPacka } } - void parseExecuteError(StatementCallbackInterface statementI) throws DisconnectException { + private void parseExecuteError(StatementCallbackInterface statementI) + throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -716,7 +723,8 @@ class NetStatementReply extends NetPacka } } - void parseExecuteSetStatementError(StatementCallbackInterface statement) throws DisconnectException { + private void parseExecuteSetStatementError( + StatementCallbackInterface statement) throws DisconnectException { int peekCP = peekCodePoint(); switch (peekCP) { case CodePoint.ABNUOWRM: @@ -771,7 +779,7 @@ class NetStatementReply extends NetPacka * @return a NetResultSet value * @exception DisconnectException */ - NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI, + private NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI, boolean isOPNQRYreply) throws DisconnectException { @@ -957,7 +965,7 @@ class NetStatementReply extends NetPacka // terminated in such a manner that the query or result set is now closed. // It cannot be resumed with the CNTQRY command or closed with the CLSQRY command. // The ENDQRYRM is always followed by an SQLCARD. - void parseENDQRYRM(ResultSetCallbackInterface resultSetI) + private void parseENDQRYRM(ResultSetCallbackInterface resultSetI) throws DisconnectException { boolean svrcodReceived = false; int svrcod = CodePoint.SVRCOD_INFO; @@ -1200,7 +1208,8 @@ class NetStatementReply extends NetPacka // Returned from Server: // FDODSC - required // FDODTA - required - NetSqlca parseSQLDTARD(NetSqldta netSqldta) throws DisconnectException { + private NetSqlca parseSQLDTARD(NetSqldta netSqldta) + throws DisconnectException { boolean fdodscReceived = false; boolean fdodtaReceived = false; @@ -1238,7 +1247,7 @@ class NetStatementReply extends NetPacka return netSqlca; } - void parseQRYDSC(NetCursor cursor) throws DisconnectException { + private void parseQRYDSC(NetCursor cursor) throws DisconnectException { parseLengthAndMatchCodePoint(CodePoint.QRYDSC); parseSQLDTARDarray(cursor, false); // false means don't just skip the bytes } @@ -1487,7 +1496,8 @@ class NetStatementReply extends NetPacka } - NetSqlca parseFDODTA(NetCursor netCursor) throws DisconnectException { + private NetSqlca parseFDODTA(NetCursor netCursor) + throws DisconnectException { parseLengthAndMatchCodePoint(CodePoint.FDODTA); int ddmLength = getDdmLength(); ensureBLayerDataInBuffer(ddmLength); @@ -1499,13 +1509,15 @@ class NetStatementReply extends NetPacka return netSqlca; } - void parseFastSQLDTARDdata(NetCursor netCursor) throws DisconnectException { + private void parseFastSQLDTARDdata(NetCursor netCursor) + throws DisconnectException { netCursor.dataBufferStream_ = getFastData(netCursor.dataBufferStream_); netCursor.dataBuffer_ = netCursor.dataBufferStream_.toByteArray(); netCursor.lastValidBytePosition_ = netCursor.dataBuffer_.length; } - void parseSQLDTARDdata(NetCursor netCursor) throws DisconnectException { + private void parseSQLDTARDdata(NetCursor netCursor) + throws DisconnectException { if (longValueForDecryption_ == null) { netCursor.dataBufferStream_ = getData(netCursor.dataBufferStream_); netCursor.dataBuffer_ = netCursor.dataBufferStream_.toByteArray(); @@ -1656,7 +1668,7 @@ class NetStatementReply extends NetPacka return section; } - int parseFastQRYPRCTYP() throws DisconnectException { + private int parseFastQRYPRCTYP() throws DisconnectException { matchCodePoint(CodePoint.QRYPRCTYP); int qryprctyp = readFastUnsignedShort(); if ((qryprctyp != CodePoint.FIXROWPRC) && (qryprctyp != CodePoint.LMTBLKPRC)) { @@ -1665,7 +1677,7 @@ class NetStatementReply extends NetPacka return qryprctyp; } - int parseFastSQLCSRHLD() throws DisconnectException { + private int parseFastSQLCSRHLD() throws DisconnectException { matchCodePoint(CodePoint.SQLCSRHLD); int sqlcsrhld = readFastUnsignedByte(); // 0xF0 is false (default), 0xF1 is true // use constants in if @@ -1675,7 +1687,7 @@ class NetStatementReply extends NetPacka return sqlcsrhld; } - int parseFastQRYATTSCR() throws DisconnectException { + private int parseFastQRYATTSCR() throws DisconnectException { matchCodePoint(CodePoint.QRYATTSCR); int qryattscr = readFastUnsignedByte(); // use constants in if if ((qryattscr != 0xF0) && (qryattscr != 0xF1)) { @@ -1684,7 +1696,7 @@ class NetStatementReply extends NetPacka return qryattscr; } - int parseFastQRYATTSET() throws DisconnectException { + private int parseFastQRYATTSET() throws DisconnectException { matchCodePoint(CodePoint.QRYATTSET); int qryattset = readFastUnsignedByte(); // use constants in if if ((qryattset != 0xF0) && (qryattset != 0xF1)) { @@ -1693,7 +1705,7 @@ class NetStatementReply extends NetPacka return qryattset; } - int parseFastQRYATTSNS() throws DisconnectException { + private int parseFastQRYATTSNS() throws DisconnectException { matchCodePoint(CodePoint.QRYATTSNS); int qryattsns = readFastUnsignedByte(); switch (qryattsns) { @@ -1708,7 +1720,7 @@ class NetStatementReply extends NetPacka return qryattsns; } - int parseFastQRYATTUPD() throws DisconnectException { + private int parseFastQRYATTUPD() throws DisconnectException { matchCodePoint(CodePoint.QRYATTUPD); int qryattupd = readFastUnsignedByte(); switch (qryattupd) { @@ -1745,7 +1757,7 @@ class NetStatementReply extends NetPacka return pkgsnlst; } - NetSqlca parseSQLDARD(ColumnMetaData columnMetaData, + private NetSqlca parseSQLDARD(ColumnMetaData columnMetaData, boolean skipBytes) throws DisconnectException { parseLengthAndMatchCodePoint(CodePoint.SQLDARD); return parseSQLDARDarray(columnMetaData, skipBytes); @@ -1757,7 +1769,7 @@ class NetStatementReply extends NetPacka return parseSQLRSLRDarray(sections); } - ColumnMetaData parseSQLCINRD() throws DisconnectException { + private ColumnMetaData parseSQLCINRD() throws DisconnectException { parseLengthAndMatchCodePoint(CodePoint.SQLCINRD); int ddmLength = getDdmLength(); ensureBLayerDataInBuffer(ddmLength); @@ -1782,7 +1794,7 @@ class NetStatementReply extends NetPacka // SQLDHROW; ROW LID 0xE0; ELEMENT TAKEN 0(all); REP FACTOR 1 // SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1 // SQLDAROW; ROW LID 0x60; ELEMENT TAKEN 0(all); REP FACTOR 0(all) - NetSqlca parseSQLDARDarray(ColumnMetaData columnMetaData, + private NetSqlca parseSQLDARDarray(ColumnMetaData columnMetaData, boolean skipBytes) throws DisconnectException { int ddmLength = 0; if (!ensuredLengthForDecryption_ && longValueForDecryption_ == null) { //if ensuredLength = true, means we already ensured length in decryptData, so don't need to do it again @@ -1877,7 +1889,7 @@ class NetStatementReply extends NetPacka // that specifies information about columns for a result set returned as // reply data in the response to an EXCSQLSTT command that invodes a stored // procedure - ColumnMetaData parseSQLCINRDarray() throws DisconnectException { + private ColumnMetaData parseSQLCINRDarray() throws DisconnectException { ColumnMetaData columnMetaData = ClientDriver.getFactory().newColumnMetaData(netAgent_.logWriter_); parseSQLDHROW(columnMetaData); Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXACallInfo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXACallInfo.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXACallInfo.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXACallInfo.java Fri May 10 06:26:13 2013 @@ -62,7 +62,6 @@ class NetXACallInfo { * suspend / resume */ - private byte[] crrtkn_; private InputStream in_; private OutputStream out_; @@ -85,7 +84,6 @@ class NetXACallInfo { void saveConnectionVariables() { in_ = actualConn_.getNetConnection().getInputStream(); out_ = actualConn_.getNetConnection().getOutputStream(); - crrtkn_ = actualConn_.getCorrelatorToken(); } public InputStream getInputStream() { Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java Fri May 10 06:26:13 2013 @@ -21,11 +21,7 @@ package org.apache.derby.client.net; -import java.sql.SQLException; - -import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; import org.apache.derby.client.am.SqlException; import org.apache.derby.client.am.ClientStatement; @@ -82,10 +78,6 @@ public class NetXAConnection { netCon.crrtkn_ = crttoken; } - public byte[] getCorrelatorToken() { - return netCon.crrtkn_; - } - void setNetXAResource(NetXAResource xares) { netCon.xares_ = xares; } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java Fri May 10 06:26:13 2013 @@ -41,9 +41,6 @@ package org.apache.derby.client.net; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; import javax.sql.XAConnection; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java?rev=1480892&r1=1480891&r2=1480892&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java Fri May 10 06:26:13 2013 @@ -22,8 +22,6 @@ package org.apache.derby.client.net; import java.sql.Types; -import org.apache.derby.iapi.reference.DRDAConstants; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.client.am.Cursor; import org.apache.derby.client.am.DisconnectException; import org.apache.derby.client.am.SignedBinary;