From 8696e1253e84dcc914d5ddbd32160c447a9701bf Mon Sep 17 00:00:00 2001 From: "Brian S. O'Neill" Date: Wed, 11 Oct 2006 16:16:15 +0000 Subject: Resolved some warnings. --- .../java/com/amazon/carbonado/repo/indexed/IndexedCursor.java | 1 - .../com/amazon/carbonado/repo/indexed/IndexedStorage.java | 8 -------- .../com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java | 3 --- src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java | 1 - .../com/amazon/carbonado/repo/jdbc/MysqlSupportStrategy.java | 11 ----------- src/main/java/com/amazon/carbonado/repo/jdbc/OracleBlob.java | 2 -- src/main/java/com/amazon/carbonado/repo/jdbc/OracleClob.java | 2 -- .../java/com/amazon/carbonado/repo/logging/LoggingQuery.java | 2 -- .../carbonado/repo/replicated/ReplicatedRepository.java | 1 - .../amazon/carbonado/repo/replicated/ReplicatedStorage.java | 6 ------ .../amazon/carbonado/repo/replicated/ReplicationTrigger.java | 3 --- .../java/com/amazon/carbonado/repo/sleepycat/BDBCursor.java | 1 - .../com/amazon/carbonado/repo/sleepycat/BDBRepository.java | 1 - .../amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java | 2 -- .../java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java | 2 -- 15 files changed, 46 deletions(-) (limited to 'src/main/java/com/amazon/carbonado/repo') diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedCursor.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedCursor.java index 075df1b..3a50a84 100644 --- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedCursor.java +++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedCursor.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory; import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Storage; diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java index fde1952..99407a8 100644 --- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java @@ -20,7 +20,6 @@ package com.amazon.carbonado.repo.indexed; import java.util.ArrayList; import java.util.Collection; -import java.util.Comparator; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; @@ -30,18 +29,12 @@ import org.apache.commons.logging.LogFactory; import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.PersistNoneException; import com.amazon.carbonado.Query; -import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Storage; -import com.amazon.carbonado.SupportException; import com.amazon.carbonado.Transaction; import com.amazon.carbonado.Trigger; -import com.amazon.carbonado.UniqueConstraintException; - import com.amazon.carbonado.capability.IndexInfo; import com.amazon.carbonado.capability.IndexInfoCapability; @@ -62,7 +55,6 @@ import com.amazon.carbonado.qe.QueryEngine; import com.amazon.carbonado.qe.QueryExecutorFactory; import com.amazon.carbonado.qe.StorageAccess; -import com.amazon.carbonado.spi.RepairExecutor; import com.amazon.carbonado.spi.StorableIndexSet; /** diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java index bb851ab..7e09690 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java @@ -45,9 +45,7 @@ import org.cojen.util.SoftValuedHashMap; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.OptimisticLockException; import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.Repository; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Storage; import com.amazon.carbonado.SupportException; import com.amazon.carbonado.lob.Lob; @@ -136,7 +134,6 @@ class JDBCStorableGenerator { final Map, Class> lobLoaderMap = generateLobLoaders(); // Declare some types. - final TypeDesc storageType = TypeDesc.forClass(Storage.class); final TypeDesc jdbcRepoType = TypeDesc.forClass(JDBCRepository.class); final TypeDesc jdbcSupportType = TypeDesc.forClass(JDBCSupport.class); final TypeDesc resultSetType = TypeDesc.forClass(ResultSet.class); diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java index 08cdb46..b7a732e 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java @@ -39,7 +39,6 @@ import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.IsolationLevel; import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.Query; import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/MysqlSupportStrategy.java b/src/main/java/com/amazon/carbonado/repo/jdbc/MysqlSupportStrategy.java index e06f1f8..d9b5579 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/MysqlSupportStrategy.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/MysqlSupportStrategy.java @@ -18,17 +18,6 @@ package com.amazon.carbonado.repo.jdbc; -import java.io.IOException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Statement; -import java.sql.SQLException; - -import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.Transaction; - /** * * diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/OracleBlob.java b/src/main/java/com/amazon/carbonado/repo/jdbc/OracleBlob.java index f60ade9..0235322 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/OracleBlob.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/OracleBlob.java @@ -25,8 +25,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Blob; -import java.sql.SQLException; - import com.amazon.carbonado.FetchException; import com.amazon.carbonado.PersistException; diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/OracleClob.java b/src/main/java/com/amazon/carbonado/repo/jdbc/OracleClob.java index 573a3ed..052ff5b 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/OracleClob.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/OracleClob.java @@ -25,8 +25,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Clob; -import java.sql.SQLException; - import com.amazon.carbonado.FetchException; import com.amazon.carbonado.PersistException; diff --git a/src/main/java/com/amazon/carbonado/repo/logging/LoggingQuery.java b/src/main/java/com/amazon/carbonado/repo/logging/LoggingQuery.java index 2535c74..ecf54a0 100644 --- a/src/main/java/com/amazon/carbonado/repo/logging/LoggingQuery.java +++ b/src/main/java/com/amazon/carbonado/repo/logging/LoggingQuery.java @@ -23,8 +23,6 @@ import com.amazon.carbonado.FetchException; import com.amazon.carbonado.PersistException; import com.amazon.carbonado.Query; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Storage; - import com.amazon.carbonado.spi.WrappedQuery; /** diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java index 5003053..9a3711f 100644 --- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java +++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java @@ -27,7 +27,6 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.cojen.util.BeanComparator; diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedStorage.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedStorage.java index cf30e5d..f781279 100644 --- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedStorage.java @@ -21,24 +21,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.OptimisticLockException; -import com.amazon.carbonado.PersistException; -import com.amazon.carbonado.PersistNoneException; import com.amazon.carbonado.Query; import com.amazon.carbonado.Storage; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Repository; import com.amazon.carbonado.SupportException; import com.amazon.carbonado.RepositoryException; -import com.amazon.carbonado.Transaction; import com.amazon.carbonado.Trigger; -import com.amazon.carbonado.UniqueConstraintException; import com.amazon.carbonado.UnsupportedTypeException; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.spi.BelatedStorageCreator; -import com.amazon.carbonado.spi.RepairExecutor; /** * ReplicatedStorage diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java index 19915b7..7ac60a6 100644 --- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java +++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java @@ -23,12 +23,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.amazon.carbonado.FetchDeadlockException; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.FetchNoneException; -import com.amazon.carbonado.IsolationLevel; import com.amazon.carbonado.OptimisticLockException; -import com.amazon.carbonado.PersistDeadlockException; import com.amazon.carbonado.PersistException; import com.amazon.carbonado.PersistNoneException; import com.amazon.carbonado.Repository; diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBCursor.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBCursor.java index 81a517b..5d21dad 100644 --- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBCursor.java +++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBCursor.java @@ -20,7 +20,6 @@ package com.amazon.carbonado.repo.sleepycat; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.IsolationLevel; -import com.amazon.carbonado.PersistException; import com.amazon.carbonado.Storable; import com.amazon.carbonado.raw.RawCursor; diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepository.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepository.java index 4618c7d..5147361 100644 --- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepository.java +++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepository.java @@ -43,7 +43,6 @@ import com.amazon.carbonado.PersistException; import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Storage; import com.amazon.carbonado.Transaction; import com.amazon.carbonado.TriggerFactory; diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java index c63445a..3a6d476 100644 --- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java +++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java @@ -32,8 +32,6 @@ import java.util.concurrent.atomic.AtomicReference; import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.TriggerFactory; - import com.amazon.carbonado.repo.indexed.IndexedRepositoryBuilder; import com.amazon.carbonado.raw.GenericStorableCodecFactory; diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java index 588f010..6eba33a 100644 --- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java @@ -22,12 +22,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.MalformedFilterException; import com.amazon.carbonado.PersistException; import com.amazon.carbonado.Query; import com.amazon.carbonado.Repository; -- cgit v1.2.3