[ 
https://issues.apache.org/jira/browse/DERBY-6125?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Dag H. Wanvik updated DERBY-6125:
---------------------------------

    Attachment: derby-6125-misc-01-b.status
                derby-6125-misc-01-b.diff

Uploading a 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. Regressions ran without error.

This is hopefully the last set of changes for this issue.

#       deleted:    java/client/org/apache/derby/client/am/SqlState.java

Removed this class as there were no longer any references to it.

#       modified:   
java/client/org/apache/derby/client/ClientPooledConnection.java

Removed unused field netPhysicalConnection_.

#       modified:   java/client/org/apache/derby/client/ClientXAConnection.java

Removed unused method createControlConnection; import fix.

#       modified:   java/client/org/apache/derby/client/am/ClientBlob.java

Removed unused method getBinaryString.

#       modified:   
java/client/org/apache/derby/client/am/ClobLocatorWriter.java

Corrected error introduced in a previous patch.

#       modified:   java/client/org/apache/derby/client/am/ClientConnection.java
#       modified:   
java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
#       modified:   
java/client/org/apache/derby/client/am/ClientPreparedStatement.java
#       modified:   java/client/org/apache/derby/client/am/DateTime.java
#       modified:   
java/client/org/apache/derby/client/am/ExceptionFormatter.java
#       modified:   java/client/org/apache/derby/client/am/SqlWarning.java
#       modified:   java/client/org/apache/derby/client/am/Sqlca.java
#       modified:   
java/client/org/apache/derby/client/am/StatementCacheInteractor.java
#       modified:   
java/client/org/apache/derby/client/net/NetConnectionReply.java
#       modified:   
java/client/org/apache/derby/client/net/NetConnectionRequest.java
#       modified:   
java/client/org/apache/derby/client/net/NetStatementReply.java

Visibility restrictions.

#       modified:   
java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
#       modified:   
java/client/org/apache/derby/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:   java/client/org/apache/derby/client/am/ClientResultSet.java

Removed unused fields updatability_delete__, updatability_update__. Visibility 
restrictions.

#       modified:   java/client/org/apache/derby/client/am/ClientStatement.java
#       modified:   java/client/org/apache/derby/client/am/Configuration.java
#       modified:   java/client/org/apache/derby/client/am/Lob.java

Visibility restrictions. Import fix.

#       modified:   
java/client/org/apache/derby/client/am/CloseFilterInputStream.java
#       modified:   java/client/org/apache/derby/client/am/ColumnMetaData.java
#       modified:   java/client/org/apache/derby/client/am/Utils.java
#       modified:   java/client/org/apache/derby/client/net/NetCursor.java
#       modified:   java/client/org/apache/derby/client/net/NetResultSet40.java
#       modified:   java/client/org/apache/derby/client/net/NetSqlca.java
#       modified:   java/client/org/apache/derby/client/net/NetXAResource.java
#       modified:   java/client/org/apache/derby/client/net/NetXAConnection.java
#       modified:   java/client/org/apache/derby/client/net/Typdef.java
#       modified:   
java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
#       modified:   java/client/org/apache/derby/jdbc/ClientXADataSource.java

Import fixes.

#       modified:   java/client/org/apache/derby/client/am/Cursor.java

Import fix, visibility restrictions, removed unused constants
SBCS_CLOB, MBCS_CLOB, DBCS_CLOB, VARIABLE_BYTES.

#       modified:   java/client/org/apache/derby/client/am/Diagnosable.java

Import fixes. Removed interface method printTrace (+ implementations).

#       modified:   java/client/org/apache/derby/client/am/LogWriter.java

Removed unused method traceEntry(Object, String, int, Object, Object, Object)

#       modified:   
java/client/org/apache/derby/client/am/LogicalConnection.java

Removed unused method preparePositionedUpdateStatement

#       modified:   
java/client/org/apache/derby/client/am/MaterialPreparedStatement.java

Removed unused abstract methods methods writeDescribeOutput_ and 
readDescribeOutput_ (+ implementations)

#       modified:   java/client/org/apache/derby/client/am/SqlException.java

Import fixes.  Visibility restrictions. Removed unused method 
printTrace(PrintWriter, String)

#       modified:   java/client/org/apache/derby/client/am/XaException.java

Import fixes. Removed unused method printTrace(PrintWriter, String)

#       modified:   
java/client/org/apache/derby/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:   java/client/org/apache/derby/client/net/DssConstants.java

Removed unused constant GDSFMT_RQSDSS_NOREPLY

#       modified:   java/client/org/apache/derby/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:   java/client/org/apache/derby/client/net/NetAgent.java

Visibility restriction. Removed unused method getPort.

#       modified:   
java/client/org/apache/derby/client/net/NetConfiguration.java

Visibility restriction. Removed unused constant SECMEC_USRIDNWPWD.

#       modified:   java/client/org/apache/derby/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:   java/client/org/apache/derby/client/net/NetConnection40.java

Visibility restrictions. Removed unused constructor 
NetConnection40(NetLogWriter, String, int, ClientBaseDataSourceRoot, boolean)

#       modified:   java/client/org/apache/derby/client/net/NetPackageReply.java

Import fixes. Removed unused field rdbnam. Unused ultimately useless
setting of netConnection_.setReadOnlyTransactionFlag, cd. NetConnction changes.

#       modified:   
java/client/org/apache/derby/client/net/NetPackageRequest.java

Removed unused field collectionName.

#       modified:   
java/client/org/apache/derby/client/net/NetPreparedStatement.java

Removed unused methods writeDescribeOutput_, readDescribeOutput_.

#       modified:   java/client/org/apache/derby/client/net/NetXACallInfo.java

Removed unused field crrtkn_


#       modified:   
java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java

Import fixes. Visibility restrictions. Removed unused constant 
SUPPORTS_EUSRIDPWD.


                
> Code clean up in client driver.
> -------------------------------
>
>                 Key: DERBY-6125
>                 URL: https://issues.apache.org/jira/browse/DERBY-6125
>             Project: Derby
>          Issue Type: Improvement
>          Components: Network Client
>            Reporter: Dag H. Wanvik
>         Attachments: derby-6125-01-a.diff, derby-6125-01-b.diff, 
> derby-6125-01-b.status, derby-6125-02-a.diff, derby-6125-02-a.status, 
> derby-6125-03-04-followup.diff, derby-6125-03-04-followup.status, 
> derby-6125-03-a.diff, derby-6125-03-a.status, derby-6125-04-a.diff, 
> derby-6125-04-a.status, derby-6125-05-a.diff, derby-6125-05-c.diff, 
> derby-6125-05-c.status, derby-6125-05-d.diff, derby-6125-05-d.status, 
> derby-6125-imports-01-a.diff, derby-6125-imports-01-a.status, 
> derby-6125-misc-01-b.diff, derby-6125-misc-01-b.status, 
> derby-6125-rename-01-c.diff.gz, derby-6125-rename-01-c.stat, 
> derby-6125-visibility-01-a.diff, derby-6125-visibility-01-a.status, 
> derby-6125-visibility-01-b.diff, derby-6125-visibility-02-e.diff, 
> derby-6125-visibility-02-e.status, derby-6125-visibility-03-a.diff, 
> derby-6125-visibility-03-a.status, derby-6125-visibility-03-b.diff
>
>
> Clean up unused code, lacking finals, too wide visibility etc.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Reply via email to