db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r547433 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Date Thu, 14 Jun 2007 22:47:11 GMT
Author: kristwaa
Date: Thu Jun 14 15:47:10 2007
New Revision: 547433

URL: http://svn.apache.org/viewvc?view=rev&rev=547433
Log:
DERBY-2823: Rename ClobUpdateableReader to ClobUpdatableReader. Also includes the test class,
and all affected classes.
Patch file: derby-2823-1a.diff

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdatableReader.java
      - copied, changed from r547419, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdateableReader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
      - copied, changed from r547422, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdateableReaderTest.java
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdateableReader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdateableReaderTest.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java?view=diff&rev=547433&r1=547432&r2=547433
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java Thu
Jun 14 15:47:10 2007
@@ -234,7 +234,7 @@
             throw new IllegalArgumentException(
                 "Position must be positive: " + pos);
         }
-        Reader isr = new ClobUpdateableReader (
+        Reader isr = new ClobUpdatableReader (
                 (LOBInputStream) getRawByteStream(), conChild);
 
         long leftToSkip = pos -1;

Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdatableReader.java
(from r547419, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdateableReader.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdatableReader.java?view=diff&rev=547433&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdateableReader.java&r1=547419&p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdatableReader.java&r2=547433
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdateableReader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUpdatableReader.java Thu
Jun 14 15:47:10 2007
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.jdbc.ClobUpdateableReader
+   Derby - Class org.apache.derby.impl.jdbc.ClobUpdatableReader
 
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -32,16 +32,16 @@
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
- * <code>ClobUpdateableReader</code> is used to create a <code>Reader</code>
+ * <code>ClobUpdatableReader</code> is used to create a <code>Reader</code>
  * over a <code>LOBInputStream</code>.
  * <p>
  * This class is aware that the underlying stream can be modified and
  * reinitializes itself if it detects any change in the stream. This
  * invalidates the cache so the changes are reflected immediately.
- *
+ * 
  * @see LOBInputStream
  */
-final class ClobUpdateableReader extends Reader {
+final class ClobUpdatableReader extends Reader {
     
     /** Reader accessing the Clob data and doing the work. */
     private Reader streamReader;
@@ -67,7 +67,7 @@
      * @param conChild a connection object used to obtain synchronization-object
      * @throws IOException
      */
-    ClobUpdateableReader (LOBInputStream stream, ConnectionChild conChild)
+    ClobUpdatableReader (LOBInputStream stream, ConnectionChild conChild)
                                                         throws IOException {
         clob = null;
         materialized = true;
@@ -86,7 +86,7 @@
      * @throws IOException
      * @throws SQLException
      */
-    ClobUpdateableReader (EmbedClob clob) throws IOException, SQLException {
+    ClobUpdatableReader (EmbedClob clob) throws IOException, SQLException {
         this.clob = clob;
         this.conChild = clob;
         // A subset of the Clob has not been requested.
@@ -114,11 +114,11 @@
     }
     
     /**
-     * Construct an <code>ClobUpdateableReader<code> using the 
+     * Construct an <code>ClobUpdatableReader<code> using the 
      * <code>EmbedClob</code> received as parameter. The initial
      * position in the stream is set to <code>pos</code> and the
      * stream is restricted to a length of <code>len</code>.
-     *
+     * 
      * @param clob EmbedClob this stream is associated with.
      * @param pos initial position. The position starts from 0.
      * @param len The length to which the underlying <code>InputStream</code>
@@ -126,7 +126,7 @@
      * @throws IOException
      * @throws SQLException
      */
-    ClobUpdateableReader (EmbedClob clob, long pos, long len) 
+    ClobUpdatableReader (EmbedClob clob, long pos, long len) 
     throws IOException, SQLException {
         this.clob = clob;
         this.conChild = clob;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java?view=diff&rev=547433&r1=547432&r2=547433
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java Thu Jun 14 15:47:10
2007
@@ -255,7 +255,7 @@
         //the Clob object has been freed by calling free() on it
         checkValidity();
         try {
-            return new ClobUpdateableReader (this);
+            return new ClobUpdatableReader (this);
         } catch (IOException ioe) {
             throw Util.setStreamFailure(ioe);
         }
@@ -708,7 +708,7 @@
         }
         
         try {
-            return new ClobUpdateableReader(this,
+            return new ClobUpdatableReader(this,
                                             pos-1,
                                             length);
         } catch (IOException ioe) {

Copied: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
(from r547422, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdateableReaderTest.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java?view=diff&rev=547433&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdateableReaderTest.java&r1=547422&p2=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java&r2=547433
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdateableReaderTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
Thu Jun 14 15:47:10 2007
@@ -1,6 +1,6 @@
 /*
  *
- * Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi.ClobUpdateableReaderTest
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi.ClobUpdatableReaderTest
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -44,11 +44,11 @@
  * Test class to test <code>UpdateableReader</code> for <code>Clob</code>
in
  * embedded driver.
  */
-public class ClobUpdateableReaderTest extends BaseJDBCTestCase {
+public class ClobUpdatableReaderTest extends BaseJDBCTestCase {
     
     private final String dummy = "This is a new String";
         
-    public ClobUpdateableReaderTest (String name) {
+    public ClobUpdatableReaderTest (String name) {
         super (name);
     }
     
@@ -303,11 +303,11 @@
     }
     
     public static Test suite() {
-        TestSuite ts = new TestSuite ("ClobUpdateableReaderTest");
+        TestSuite ts = new TestSuite ("ClobUpdatableReaderTest");
         ts.addTest(TestConfiguration.defaultSuite(
-                    ClobUpdateableReaderTest.class));
-        TestSuite encSuite = new TestSuite ("ClobUpdateableReaderTest:encrypted");
-        encSuite.addTestSuite (ClobUpdateableReaderTest.class);
+                    ClobUpdatableReaderTest.class));
+        TestSuite encSuite = new TestSuite ("ClobUpdatableReaderTest:encrypted");
+        encSuite.addTestSuite (ClobUpdatableReaderTest.class);
         ts.addTest(Decorator.encryptedDatabase (encSuite));
         return ts;
     }        

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?view=diff&rev=547433&r1=547432&r2=547433
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Thu Jun 14 15:47:10 2007
@@ -114,8 +114,8 @@
             // an inner class implements ConnectionEventListener.
             suite.addTest(DataSourceTest.suite());
 
-            //suite to test updateable reader for clob in embedded driver
-            suite.addTest (ClobUpdateableReaderTest.suite());
+            //suite to test updatable reader for clob in embedded driver
+            suite.addTest (ClobUpdatableReaderTest.suite());
             
             //truncate test for clob
             suite.addTest (ClobTruncateTest.suite());



Mime
View raw message