From 33e159047d5f22e37fe5cdd9df421d2358c5c496 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 27 May 2008 18:40:39 +0000 Subject: [PATCH] Use new logging shim. --- .../jdbc/depot/DepotMarshaller.java | 3 +-- src/java/com/samskivert/jdbc/depot/Log.java | 3 +-- .../samskivert/jdbc/depot/MySQLBuilder.java | 5 +++-- .../jdbc/depot/PersistenceContext.java | 19 +++++++++---------- .../jdbc/depot/PostgreSQLBuilder.java | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java index 6fcf694..14a29bb 100644 --- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java +++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java @@ -35,7 +35,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.Level; import com.samskivert.io.PersistenceException; import com.samskivert.jdbc.depot.annotation.Computed; @@ -109,7 +108,7 @@ public class DepotMarshaller try { _schemaVersion = (Integer)field.get(null); } catch (Exception e) { - log.log(Level.WARNING, "Failed to read schema version " + + log.warning("Failed to read schema version " + "[class=" + _pClass + "].", e); } } diff --git a/src/java/com/samskivert/jdbc/depot/Log.java b/src/java/com/samskivert/jdbc/depot/Log.java index 29315fe..09fbee3 100644 --- a/src/java/com/samskivert/jdbc/depot/Log.java +++ b/src/java/com/samskivert/jdbc/depot/Log.java @@ -20,8 +20,7 @@ package com.samskivert.jdbc.depot; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.samskivert.util.Logger; /** * Contains a reference to the log object used by this package. diff --git a/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java b/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java index 89abd5e..e778095 100644 --- a/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java +++ b/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java @@ -31,7 +31,6 @@ import java.sql.Time; import java.sql.Timestamp; import java.util.Set; -import com.samskivert.Log; import com.samskivert.jdbc.JDBCUtil; import com.samskivert.jdbc.depot.FieldMarshaller.BooleanMarshaller; import com.samskivert.jdbc.depot.FieldMarshaller.ByteArrayMarshaller; @@ -50,6 +49,8 @@ import com.samskivert.jdbc.depot.expression.ColumnExp; import com.samskivert.jdbc.depot.expression.EpochSeconds; import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch; +import static com.samskivert.Log.log; + public class MySQLBuilder extends SQLBuilder { @@ -170,7 +171,7 @@ public class MySQLBuilder Statement stmt = conn.createStatement(); try { - Log.info("Adding full-text search index: ftsIx_" + fts.name()); + log.info("Adding full-text search index: ftsIx_" + fts.name()); stmt.executeUpdate(update.toString()); } finally { JDBCUtil.close(stmt); diff --git a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java index 088f71a..d4b266c 100644 --- a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java +++ b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.Level; import java.io.Serializable; import java.sql.Connection; @@ -162,7 +161,7 @@ public class PersistenceContext _cache.shutdown(); } } catch (Throwable t) { - log.log(Level.WARNING, "Failure shutting down Depot cache.", t); + log.warning("Failure shutting down Depot cache.", t); } _conprov.shutdown(); } @@ -250,15 +249,15 @@ public class PersistenceContext if (key != null && _cache != null) { CacheAdapter.CachedValue cacheHit = cacheLookup(key); if (cacheHit != null) { - log.fine("cache hit [key=" + key + ", hit=" + cacheHit + "]"); + log.debug("cache hit [key=" + key + ", hit=" + cacheHit + "]"); T value = cacheHit.getValue(); value = query.transformCacheHit(key, value); if (value != null) { return value; } - log.fine("transformCacheHit returned null; rejecting cached value."); + log.debug("transformCacheHit returned null; rejecting cached value."); } - log.fine("cache miss [key=" + key + "]"); + log.debug("cache miss [key=" + key + "]"); } // otherwise, perform the query @SuppressWarnings("unchecked") T result = (T) invoke(query, null, true); @@ -314,7 +313,7 @@ public class PersistenceContext Thread.dumpStack(); return; } - log.fine("storing [key=" + key + ", value=" + entry + "]"); + log.debug("storing [key=" + key + ", value=" + entry + "]"); CacheAdapter.CacheBin bin = _cache.getCache(key.getCacheId()); CacheAdapter.CachedValue element = bin.lookup(key.getCacheKey()); @@ -328,7 +327,7 @@ public class PersistenceContext Set> listeners = _listenerSets.get(key.getCacheId()); if (listeners != null && listeners.size() > 0) { for (CacheListener listener : listeners) { - log.fine("cascading [listener=" + listener + "]"); + log.debug("cascading [listener=" + listener + "]"); @SuppressWarnings("unchecked") CacheListener casted = (CacheListener)listener; casted.entryCached(key, entry, oldEntry); @@ -368,7 +367,7 @@ public class PersistenceContext if (_cache == null) { return; } - log.fine("invalidating [cacheId=" + cacheId + ", cacheKey=" + cacheKey + "]"); + log.debug("invalidating [cacheId=" + cacheId + ", cacheKey=" + cacheKey + "]"); CacheAdapter.CacheBin bin = _cache.getCache(cacheId); CacheAdapter.CachedValue element = bin.lookup(cacheKey); @@ -384,7 +383,7 @@ public class PersistenceContext if (listeners != null && listeners.size() > 0) { CacheKey key = new SimpleCacheKey(cacheId, cacheKey); for (CacheListener listener : listeners) { - log.fine("cascading [listener=" + listener + "]"); + log.debug("cascading [listener=" + listener + "]"); @SuppressWarnings("unchecked") CacheListener casted = (CacheListener)listener; casted.entryInvalidated(key, oldEntry); @@ -393,7 +392,7 @@ public class PersistenceContext } // then evict the keyed entry, if needed - log.fine("evicting [cacheKey=" + cacheKey + "]"); + log.debug("evicting [cacheKey=" + cacheKey + "]"); bin.remove(cacheKey); } diff --git a/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java b/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java index 1c20476..210c0b0 100644 --- a/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java +++ b/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java @@ -51,7 +51,7 @@ import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch; import com.samskivert.util.ArrayUtil; import com.samskivert.util.StringUtil; -import com.samskivert.Log; +import static com.samskivert.Log.log; public class PostgreSQLBuilder extends SQLBuilder @@ -178,7 +178,7 @@ public class PostgreSQLBuilder Statement stmt = conn.createStatement(); try { - Log.info( + log.info( "Adding full-text search column, index and trigger: " + column + ", " + index + ", " + trigger); liaison.addColumn(conn, table, column, "TSVECTOR", true);