[hibernate-commits] Hibernate SVN: r15354 - in search/trunk/src: java/org/hibernate/search/backend and 18 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Oct 15 11:14:26 EDT 2008
Author: hardy.ferentschik
Date: 2008-10-15 11:14:25 -0400 (Wed, 15 Oct 2008)
New Revision: 15354
Added:
search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java
Modified:
search/trunk/src/java/org/hibernate/search/Version.java
search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java
search/trunk/src/java/org/hibernate/search/backend/Workspace.java
search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java
search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java
search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java
search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.java
search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java
search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
search/trunk/src/java/org/hibernate/search/util/FileHelper.java
search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java
search/trunk/src/test/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.java
search/trunk/src/test/org/hibernate/search/test/util/AnalyzerUtils.java
Log:
Added utility class LoggerFactory and switched to a DRY creation of loggers.
Modified: search/trunk/src/java/org/hibernate/search/Version.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/Version.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/Version.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -4,9 +4,10 @@
import java.util.Date;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
+
/**
* @author Emmanuel Bernard
*/
@@ -14,7 +15,7 @@
public static final String VERSION = "3.1.0.SNAPSHOT" + new Date();
static {
- Logger log = LoggerFactory.getLogger( Version.class );
+ Logger log = LoggerFactory.make();
log.info( "Hibernate Search {}", VERSION );
}
Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -7,14 +7,14 @@
import java.util.Properties;
import org.apache.lucene.index.IndexWriter;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.configuration.IndexWriterSetting;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
import org.hibernate.search.backend.configuration.MaskedProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
-
/**
* Wrapper class around the Lucene indexing parameters defined in IndexWriterSetting.
* <p>
@@ -46,7 +46,7 @@
//get keys for "batch" (defaulting to transaction)
Properties batchProps = new MaskedProperty( indexingParameters, BATCH, transactionProps ); //TODO to close HSEARCH-201 just remove 3° parameter
//logger only used during object construction: (logger not serializable).
- Logger log = LoggerFactory.getLogger( LuceneIndexingParameters.class );
+ Logger log = LoggerFactory.make();
transactionIndexParameters = new ParameterSet( transactionProps, TRANSACTION, log );
batchIndexParameters = new ParameterSet( batchProps, BATCH, log );
doSanityChecks( transactionIndexParameters, batchIndexParameters, log );
Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -10,6 +10,8 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.Directory;
+import org.slf4j.Logger;
+
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.SearchException;
import org.hibernate.search.SearchFactory;
@@ -17,8 +19,7 @@
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import org.hibernate.search.util.LoggerFactory;
/**
* Lucene workspace for a DirectoryProvider.<p/>
@@ -38,7 +39,7 @@
//TODO renaming to "DirectoryWorkspace" would be nice.
public class Workspace {
- private final Logger log = LoggerFactory.getLogger( Workspace.class );
+ private final Logger log = LoggerFactory.make();
private static final Analyzer SIMPLE_ANALYZER = new SimpleAnalyzer();
// invariant state:
Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -19,8 +19,9 @@
import java.util.TreeSet;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
+
/**
* A wrapper to Properties, to restrict the availability of
* values to only those which have a key beginning with some
@@ -38,7 +39,7 @@
private static final long serialVersionUID = -593307257383085113L;
- private transient Logger log = LoggerFactory.getLogger( MaskedProperty.class );
+ private transient Logger log = LoggerFactory.make();
private final Properties masked;
private final Properties fallBack;
private final String radix;
@@ -376,7 +377,7 @@
private void readObject(ObjectInputStream aInputStream) throws ClassNotFoundException, IOException {
//always perform the default de-serialization first
aInputStream.defaultReadObject();
- log = LoggerFactory.getLogger( MaskedProperty.class );
+ log = LoggerFactory.make();
}
private void writeObject(ObjectOutputStream aOutputStream) throws IOException {
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -9,24 +9,25 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+
import org.hibernate.Hibernate;
+import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.annotations.common.util.StringHelper;
-import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.QueueingProcessor;
import org.hibernate.search.backend.Work;
+import org.hibernate.search.backend.WorkQueue;
import org.hibernate.search.backend.WorkType;
-import org.hibernate.search.backend.WorkQueue;
import org.hibernate.search.backend.configuration.ConfigurationParseHelper;
import org.hibernate.search.backend.impl.jms.JMSBackendQueueProcessorFactory;
import org.hibernate.search.backend.impl.lucene.LuceneBackendQueueProcessorFactory;
import org.hibernate.search.engine.DocumentBuilder;
import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Batch work until #performWorks is called.
@@ -36,7 +37,7 @@
*/
public class BatchedQueueingProcessor implements QueueingProcessor {
- private static final Logger log = LoggerFactory.getLogger( BatchedQueueingProcessor.class );
+ private static final Logger log = LoggerFactory.make();
private final boolean sync;
private final int batchSize;
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -9,12 +9,13 @@
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
+import org.slf4j.Logger;
+
import org.hibernate.Session;
import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.util.ContextHelper;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Implement the Hibernate Search controller responsible for processing the
@@ -26,7 +27,7 @@
* @author Emmanuel Bernard
*/
public abstract class AbstractJMSHibernateSearchController implements MessageListener {
- private static final Logger log = LoggerFactory.getLogger( AbstractJMSHibernateSearchController.class );
+ private static final Logger log = LoggerFactory.make();
/**
* Return the current or give a new session
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -2,8 +2,8 @@
package org.hibernate.search.backend.impl.jms;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.jms.QueueConnection;
@@ -11,11 +11,11 @@
import javax.jms.QueueSession;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.HibernateException;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.OptimizeLuceneWork;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
@@ -23,7 +23,7 @@
public class JMSBackendQueueProcessor implements Runnable {
private List<LuceneWork> queue;
private JMSBackendQueueProcessorFactory factory;
- private Logger log = LoggerFactory.getLogger( JMSBackendQueueProcessor.class );
+ private Logger log = LoggerFactory.make();
public JMSBackendQueueProcessor(List<LuceneWork> queue,
JMSBackendQueueProcessorFactory jmsBackendQueueProcessorFactory) {
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -5,19 +5,20 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.slf4j.Logger;
+
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
import org.hibernate.search.backend.impl.lucene.works.LuceneWorkVisitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Sanne Grinovero
*/
class PerDPQueueProcessor {
- private final Logger log = LoggerFactory.getLogger( PerDPQueueProcessor.class );
+ private final Logger log = LoggerFactory.make();
private final Workspace workspace;
private final LuceneWorkVisitor worker;
private final List<LuceneWork> workOnWriter = new ArrayList<LuceneWork>();
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -6,27 +6,29 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.Similarity;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
import org.hibernate.search.engine.DocumentBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
-* Stateless implementation that performs a AddLuceneWork.
-* @see LuceneWorkVisitor
-* @see LuceneWorkDelegate
-* @author Emmanuel Bernard
-* @author Hardy Ferentschik
-* @author John Griffin
-* @author Sanne Grinovero
-*/
+ * Stateless implementation that performs a AddLuceneWork.
+ *
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ * @author John Griffin
+ * @author Sanne Grinovero
+ * @see LuceneWorkVisitor
+ * @see LuceneWorkDelegate
+ */
class AddWorkDelegate implements LuceneWorkDelegate {
-
+
private final Workspace workspace;
- private final Logger log = LoggerFactory.getLogger( AddWorkDelegate.class );
+ private final Logger log = LoggerFactory.make();
AddWorkDelegate(Workspace workspace) {
this.workspace = workspace;
@@ -41,24 +43,28 @@
Analyzer analyzer = documentBuilder.getAnalyzer();
Similarity similarity = documentBuilder.getSimilarity();
if ( log.isTraceEnabled() ) {
- log.trace( "add to Lucene index: {}#{}:{}",
- new Object[] { work.getEntityClass(), work.getId(), work.getDocument() } );
+ log.trace(
+ "add to Lucene index: {}#{}:{}",
+ new Object[] { work.getEntityClass(), work.getId(), work.getDocument() }
+ );
}
try {
//TODO the next two operations should be atomic to enable concurrent usage of IndexWriter
// make a wrapping Similarity based on ThreadLocals? or having it autoselect implementation basing on entity?
writer.setSimilarity( similarity );
- writer.addDocument( work.getDocument() , analyzer );
+ writer.addDocument( work.getDocument(), analyzer );
workspace.incrementModificationCounter( 1 );
}
- catch (IOException e) {
- throw new SearchException( "Unable to add to Lucene index: "
- + work.getEntityClass() + "#" + work.getId(), e );
+ catch ( IOException e ) {
+ throw new SearchException(
+ "Unable to add to Lucene index: "
+ + work.getEntityClass() + "#" + work.getId(), e
+ );
}
}
public void performWork(LuceneWork work, IndexReader reader) {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
-
+
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -6,17 +6,17 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.BooleanClause;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
import org.hibernate.search.engine.DocumentBuilder;
+import org.hibernate.search.util.LoggerFactory;
/**
* Stateless implementation that performs a <code>DeleteLuceneWork</code>.
@@ -31,7 +31,7 @@
class DeleteWorkDelegate implements LuceneWorkDelegate {
private final Workspace workspace;
- private final Logger log = LoggerFactory.getLogger( DeleteWorkDelegate.class );
+ private final Logger log = LoggerFactory.make();
DeleteWorkDelegate(Workspace workspace) {
this.workspace = workspace;
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -4,12 +4,13 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.Workspace;
import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Stateless implementation that performs a OptimizeLuceneWork.
@@ -23,7 +24,7 @@
class OptimizeWorkDelegate implements LuceneWorkDelegate {
private final Workspace workspace;
- private final Logger log = LoggerFactory.getLogger( OptimizeWorkDelegate.class );
+ private final Logger log = LoggerFactory.make();
OptimizeWorkDelegate(Workspace workspace) {
this.workspace = workspace;
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -3,12 +3,13 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
import org.hibernate.search.engine.DocumentBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Stateless implementation that performs a PurgeAllLuceneWork.
@@ -21,7 +22,7 @@
*/
class PurgeAllWorkDelegate implements LuceneWorkDelegate {
- private final Logger log = LoggerFactory.getLogger( PurgeAllWorkDelegate.class );
+ private final Logger log = LoggerFactory.make();
PurgeAllWorkDelegate() {
}
Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -16,6 +16,8 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Similarity;
+import org.slf4j.Logger;
+
import org.hibernate.Hibernate;
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.annotations.common.reflection.ReflectionManager;
@@ -49,14 +51,12 @@
import org.hibernate.search.bridge.LuceneOptions;
import org.hibernate.search.bridge.TwoWayFieldBridge;
import org.hibernate.search.bridge.TwoWayString2FieldBridgeAdaptor;
-import org.hibernate.search.engine.LuceneOptionsImpl;
import org.hibernate.search.impl.InitContext;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.IndexShardingStrategy;
import org.hibernate.search.util.BinderHelper;
+import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.ScopedAnalyzer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Set up and provide a manager for indexes classes
@@ -69,7 +69,7 @@
*/
@SuppressWarnings( "unchecked" )
public class DocumentBuilder<T> {
- private static final Logger log = LoggerFactory.getLogger( DocumentBuilder.class );
+ private static final Logger log = LoggerFactory.make();
private final PropertiesMetadata rootPropertiesMetadata = new PropertiesMetadata();
private final XClass beanClass;
Modified: search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -2,19 +2,20 @@
package org.hibernate.search.engine;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import java.util.Collections;
+import org.slf4j.Logger;
+
import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
*/
public class ObjectLoader implements Loader {
- private static final Logger log = LoggerFactory.getLogger( ObjectLoader.class );
+ private static final Logger log = LoggerFactory.make();
private Session session;
public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
Modified: search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,17 +1,18 @@
// $Id$
package org.hibernate.search.engine;
+import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
-import java.io.Serializable;
+import org.slf4j.Logger;
+
+import org.hibernate.Criteria;
import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.hibernate.Criteria;
import org.hibernate.criterion.Disjunction;
import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
@@ -19,7 +20,7 @@
public class ObjectLoaderHelper {
private static final int MAX_IN_CLAUSE = 500;
- private static final Logger log = LoggerFactory.getLogger( ObjectLoader.class );
+ private static final Logger log = LoggerFactory.make();
public static Object load(EntityInfo entityInfo, Session session) {
//be sure to get an initialized object but save from ONFE and ENFE
Modified: search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -3,7 +3,6 @@
import java.util.Properties;
-import org.hibernate.search.Environment;
import org.hibernate.event.EventListeners;
import org.hibernate.event.PostCollectionRecreateEventListener;
import org.hibernate.event.PostCollectionRemoveEventListener;
@@ -11,8 +10,9 @@
import org.hibernate.event.PostDeleteEventListener;
import org.hibernate.event.PostInsertEventListener;
import org.hibernate.event.PostUpdateEventListener;
+import org.hibernate.search.Environment;
+import org.hibernate.search.util.LoggerFactory;
-import org.slf4j.LoggerFactory;
/**
* Helper methods initializing Hibernate Search event listeners.
@@ -33,7 +33,7 @@
// check whether search is explicitly disabled - if so there is nothing to do
String enableSearchListeners = properties.getProperty( Environment.AUTOREGISTER_LISTENERS );
if ( "false".equalsIgnoreCase( enableSearchListeners ) ) {
- LoggerFactory.getLogger( EventListenerRegister.class ).info(
+ LoggerFactory.make().info(
"Property hibernate.search.autoregister_listeners is set to false." +
" No attempt will be made to register Hibernate Search event listeners." );
return;
Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -3,6 +3,8 @@
import java.io.Serializable;
+import org.slf4j.Logger;
+
import org.hibernate.cfg.Configuration;
import org.hibernate.engine.EntityEntry;
import org.hibernate.event.AbstractCollectionEvent;
@@ -23,11 +25,10 @@
import org.hibernate.event.PostUpdateEventListener;
import org.hibernate.search.backend.Work;
import org.hibernate.search.backend.WorkType;
+import org.hibernate.search.backend.impl.EventSourceTransactionContext;
import org.hibernate.search.engine.DocumentBuilder;
import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.backend.impl.EventSourceTransactionContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* This listener supports setting a parent directory for all generated index files.
@@ -46,7 +47,7 @@
PostCollectionRecreateEventListener, PostCollectionRemoveEventListener,
PostCollectionUpdateEventListener, Initializable, Destructible {
- private static final Logger log = LoggerFactory.getLogger( FullTextIndexEventListener.class );
+ private static final Logger log = LoggerFactory.make();
protected boolean used;
protected SearchFactoryImplementor searchFactoryImplementor;
Modified: search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -6,10 +6,11 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Filter;
-import org.hibernate.util.SoftLimitMRUCache;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
+import org.hibernate.util.SoftLimitMRUCache;
+
/**
* A slightly different version of Lucene's original <code>CachingWrapperFilter</code> which
* uses <code>SoftReferences</code> instead of <code>WeakReferences</code> in order to cache
@@ -22,7 +23,7 @@
@SuppressWarnings("serial")
public class CachingWrapperFilter extends Filter {
- private final Logger log = LoggerFactory.getLogger( CachingWrapperFilter.class );
+ private final Logger log = LoggerFactory.make();
public static final int DEFAULT_SIZE = 5;
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -18,7 +18,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
@@ -51,6 +50,7 @@
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.DirectoryProviderFactory;
import org.hibernate.search.store.optimization.OptimizerStrategy;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
@@ -63,7 +63,7 @@
Version.touch();
}
- private final Logger log = LoggerFactory.getLogger( SearchFactoryImpl.class );
+ private final Logger log = LoggerFactory.make();
private final Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
//keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,8 +1,6 @@
//$Id$
package org.hibernate.search.query;
-import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
-
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -18,6 +16,7 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
@@ -25,7 +24,8 @@
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.Explanation;
+import org.slf4j.Logger;
+
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.LockMode;
@@ -54,14 +54,14 @@
import org.hibernate.search.filter.FilterKey;
import org.hibernate.search.filter.StandardFilterKey;
import org.hibernate.search.reader.ReaderProvider;
+import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.util.ContextHelper;
+import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
+import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheResults;
+import org.hibernate.search.util.LoggerFactory;
import org.hibernate.transform.ResultTransformer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.hibernate.search.util.FilterCacheModeTypeHelper.*;
-
/**
* Implementation of {@link org.hibernate.search.FullTextQuery}
*
@@ -70,7 +70,7 @@
*/
//TODO implements setParameter()
public class FullTextQueryImpl extends AbstractQueryImpl implements FullTextQuery {
- private final Logger log = LoggerFactory.getLogger( FullTextQueryImpl.class );
+ private final Logger log = LoggerFactory.make();
private final org.apache.lucene.search.Query luceneQuery;
private Class[] classes;
private Set<Class> classesAndSubclasses;
Modified: search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -17,6 +17,8 @@
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
+import org.slf4j.Logger;
+
import org.hibernate.HibernateException;
import org.hibernate.ScrollableResults;
import org.hibernate.search.SearchException;
@@ -24,9 +26,8 @@
import org.hibernate.search.engine.DocumentExtractor;
import org.hibernate.search.engine.EntityInfo;
import org.hibernate.search.engine.Loader;
+import org.hibernate.search.util.LoggerFactory;
import org.hibernate.type.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Implements scollable and paginated resultsets.
@@ -50,7 +51,7 @@
* @author John Griffin
*/
public class ScrollableResultsImpl implements ScrollableResults {
- private static final Logger log = LoggerFactory.getLogger( ScrollableResultsImpl.class );
+ private static final Logger log = LoggerFactory.make();
private final IndexSearcher searcher;
private final SearchFactory searchFactory;
private final Hits hits;
Modified: search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -14,12 +14,12 @@
import org.apache.lucene.index.MultiReader;
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.SearchException;
+import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.engine.SearchFactoryImplementor;
import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
import static org.hibernate.search.reader.ReaderProviderHelper.clean;
import org.hibernate.search.store.DirectoryProvider;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Share readers per SearchFactory, reusing them iff they are still valid.
@@ -27,7 +27,7 @@
* @author Emmanuel Bernard
*/
public class SharedReaderProvider implements ReaderProvider {
- private final Logger log = LoggerFactory.getLogger ( SharedReaderProvider.class );
+ private final Logger log = LoggerFactory.make();
/**
* nonfair lock. Need to be acquired on indexReader acquisition or release (semaphore)
*/
Modified: search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -14,12 +14,13 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
+import org.slf4j.Logger;
+
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.SearchException;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.store.DirectoryProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* As does SharedReaderProvider this also shares IndexReaders as long as they are "current";
@@ -43,7 +44,7 @@
*/
protected Map<DirectoryProvider,PerDirectoryLatestReader> currentReaders;
- private final Logger log = LoggerFactory.getLogger( SharingBufferReaderProvider.class );
+ private final Logger log = LoggerFactory.make();
public void closeReader(IndexReader multiReader) {
if ( multiReader == null ) return;
Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,27 +1,28 @@
// $Id$
package org.hibernate.search.store;
-import java.util.Properties;
import java.io.File;
import java.io.IOException;
+import java.util.Properties;
-import org.hibernate.search.SearchException;
-import org.hibernate.search.util.FileHelper;
-import org.hibernate.annotations.common.util.StringHelper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.FSDirectory;
-import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
+import org.hibernate.annotations.common.util.StringHelper;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.util.FileHelper;
+import org.hibernate.search.util.LoggerFactory;
+
/**
* @author Emmanuel Bernard
* @author Sanne Grinovero
*/
public class DirectoryProviderHelper {
- private static final Logger log = LoggerFactory.getLogger( DirectoryProviderHelper.class );
+ private static final Logger log = LoggerFactory.make();
private static final String ROOTINDEX_PROP_NAME = "sourceBase";
private static final String RELATIVEINDEX_PROP_NAME = "source";
public static final String COPYBUFFERSIZE_PROP_NAME = "buffer_size_on_copy";
Modified: search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -6,10 +6,11 @@
import java.util.Properties;
import org.apache.lucene.store.FSDirectory;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Use a Lucene FSDirectory
@@ -22,7 +23,7 @@
*/
public class FSDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.getLogger( FSDirectoryProvider.class );
+ private final Logger log = LoggerFactory.make();
private FSDirectory directory;
private String indexName;
Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,22 +1,23 @@
//$Id$
package org.hibernate.search.store;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
import java.util.Timer;
-import java.util.Properties;
import java.util.TimerTask;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
-import java.io.File;
-import java.io.IOException;
import org.apache.lucene.store.FSDirectory;
+import org.slf4j.Logger;
+
import org.hibernate.search.SearchException;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import org.hibernate.search.util.LoggerFactory;
/**
* File based DirectoryProvider that takes care of index copy
@@ -32,7 +33,7 @@
//TODO rename copy?
public class FSMasterDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.getLogger( FSMasterDirectoryProvider.class );
+ private final Logger log = LoggerFactory.make();
private final Timer timer = new Timer( true ); //daemon thread, the copy algorithm is robust
private volatile int current;
Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,22 +1,23 @@
//$Id$
package org.hibernate.search.store;
+import java.io.File;
+import java.io.IOException;
import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.io.File;
-import java.io.IOException;
import org.apache.lucene.store.FSDirectory;
+import org.slf4j.Logger;
+
import org.hibernate.AssertionFailure;
import org.hibernate.search.SearchException;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* File based directory provider that takes care of getting a version of the index
@@ -32,7 +33,7 @@
*/
public class FSSlaveDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.getLogger( FSSlaveDirectoryProvider.class );
+ private final Logger log = LoggerFactory.make();
private final Timer timer = new Timer( true ); //daemon thread, the copy algorithm is robust
private volatile int current; //used also as memory barrier of all other values, which are set once.
Modified: search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,17 +1,18 @@
// $Id$
package org.hibernate.search.store.optimization;
+import java.io.IOException;
import java.util.Properties;
-import java.io.IOException;
-import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.apache.lucene.index.IndexWriter;
+import org.slf4j.Logger;
+
+import org.hibernate.search.SearchException;
import org.hibernate.search.backend.Workspace;
import org.hibernate.search.backend.configuration.ConfigurationParseHelper;
+import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.search.SearchException;
-import org.apache.lucene.index.IndexWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Optimization strategy triggered after a certain amount of operations
@@ -24,7 +25,7 @@
private long operations = 0;
private long transactions = 0;
private DirectoryProvider directoryProvider;
- private final Logger log = LoggerFactory.getLogger( IncrementalOptimizerStrategy.class );
+ private final Logger log = LoggerFactory.make();
public void initialize(DirectoryProvider directoryProvider, Properties indexProperties, SearchFactoryImplementor searchFactoryImplementor) {
this.directoryProvider = directoryProvider;
Modified: search/trunk/src/java/org/hibernate/search/util/FileHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/FileHelper.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/java/org/hibernate/search/util/FileHelper.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -11,7 +11,6 @@
import java.nio.channels.FileChannel;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Emmanuel Bernard
@@ -21,7 +20,7 @@
private static final int FAT_PRECISION = 2000;
public static final long DEFAULT_COPY_BUFFER_SIZE = 16 * 1024 * 1024; // 16 MB
- private static final Logger log = LoggerFactory.getLogger( FileHelper.class );
+ private static final Logger log = LoggerFactory.make();
public static void synchronize(File source, File destination, boolean smart) throws IOException {
synchronize( source, destination, smart, DEFAULT_COPY_BUFFER_SIZE );
Added: search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java (rev 0)
+++ search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -0,0 +1,34 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.search.util;
+
+import org.slf4j.Logger;
+
+/**
+ * A factory class for class loggers. Allows a creation of loggers after the DRY principle.
+ *
+ * @author Hardy Ferentschik
+ */
+public class LoggerFactory {
+ public static Logger make() {
+ Throwable t = new Throwable();
+ StackTraceElement directCaller = t.getStackTrace()[1];
+ return org.slf4j.LoggerFactory.getLogger( directCaller.getClassName() );
+ }
+}
+
Property changes on: search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -5,6 +5,8 @@
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
+import org.slf4j.Logger;
+
import org.hibernate.Transaction;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
@@ -12,15 +14,14 @@
import org.hibernate.search.SearchFactory;
import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.test.util.AnalyzerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
*/
public class AnalyzerTest extends SearchTestCase {
- public static final Logger log = LoggerFactory.getLogger(AnalyzerTest.class);
+ public static final Logger log = LoggerFactory.make();
public void testScopedAnalyzers() throws Exception {
MyEntity en = new MyEntity();
Modified: search/trunk/src/test/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/test/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -4,13 +4,14 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
+import org.slf4j.Logger;
+
import org.hibernate.Transaction;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
import org.hibernate.search.test.SearchTestCase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* Test for http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH-263
@@ -18,7 +19,7 @@
*/
public class DoubleAnalyzerTest extends SearchTestCase {
- public static final Logger log = LoggerFactory.getLogger( DoubleAnalyzerTest.class );
+ public static final Logger log = LoggerFactory.make();
protected Class[] getMappings() {
return new Class[] { MyEntity.class, AlarmEntity.class };
Modified: search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -17,11 +17,10 @@
*/
package org.hibernate.search.test.analyzer.inheritance;
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
+import org.apache.lucene.queryParser.QueryParser;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.Transaction;
import org.hibernate.search.FullTextQuery;
@@ -29,6 +28,7 @@
import org.hibernate.search.Search;
import org.hibernate.search.test.SearchTestCase;
import org.hibernate.search.test.util.AnalyzerUtils;
+import org.hibernate.search.util.LoggerFactory;
/**
* Test to verify HSEARCH-267.
@@ -40,7 +40,7 @@
*/
public class AnalyzerInheritanceTest extends SearchTestCase {
- public static final Logger log = LoggerFactory.getLogger( AnalyzerInheritanceTest.class );
+ public static final Logger log = LoggerFactory.make();
/**
* Try to verify that the right analyzer is used by indexing and searching.
Modified: search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -2,8 +2,8 @@
package org.hibernate.search.test.perf;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -11,20 +11,21 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.IndexSearcher;
+import org.slf4j.Logger;
+
import org.hibernate.SessionFactory;
+import org.hibernate.search.FullTextQuery;
+import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.FullTextQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
/**
* @author Emmanuel Bernard
*/
public class SearcherThread implements Runnable {
- private static final Logger log = LoggerFactory.getLogger( SearcherThread.class );
+ private static final Logger log = LoggerFactory.make();
private final int threadId;
private final String queryString;
private final SessionFactory sf;
Modified: search/trunk/src/test/org/hibernate/search/test/util/AnalyzerUtils.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/util/AnalyzerUtils.java 2008-10-15 14:42:24 UTC (rev 15353)
+++ search/trunk/src/test/org/hibernate/search/test/util/AnalyzerUtils.java 2008-10-15 15:14:25 UTC (rev 15354)
@@ -11,8 +11,9 @@
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.search.util.LoggerFactory;
+
/**
* Helper class to test analyzers. Taken and modified from <i>Lucene in Action</i>.
*
@@ -20,7 +21,7 @@
*/
public class AnalyzerUtils {
- public static final Logger log = LoggerFactory.getLogger( AnalyzerUtils.class );
+ public static final Logger log = LoggerFactory.make();
public static Token[] tokensFromAnalysis(Analyzer analyzer, String field, String text) throws IOException {
TokenStream stream = analyzer.tokenStream( field, new StringReader( text ) );
More information about the hibernate-commits
mailing list