/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision ece6cbb6

Added by Cherian Mathew about 11 years ago

ID ece6cbb698eabc4a9e0dcf860f400d3bf1bee0c6
Parent 3fd8f26b
Child 6635b6cf

ICdmMassIndexer : added methods to clear and add classes to the list of indexed classes
CdmMassIndexer : implemented the new methods in ICdmMassIndexer
TaxonServiceSearchTest : updated test to initialise the list of indexed classes

     import java.io.IOException;
     import java.lang.reflect.Field;
     import java.util.ArrayList;
     import java.util.HashSet;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Set;
     import org.apache.log4j.Logger;
     import org.apache.lucene.index.IndexReader;
-...
     @Transactional
     public class CdmMassIndexer implements ICdmMassIndexer {
     	private Set<Class<? extends CdmBase>> indexedClasses = new HashSet<Class<? extends CdmBase>>();
         public static final Logger logger = Logger.getLogger(CdmMassIndexer.class);
         /*
-...
+            }
             monitor.setTaskName("CdmMassIndexer");
             int steps = indexedClasses().length + 1; // +1 for optimize
             monitor.beginTask("Reindexing " + indexedClasses().length + " classes", steps);
             int steps = indexedClasses().size() + 1; // +1 for optimize
             monitor.beginTask("Reindexing " + indexedClasses().size() + " classes", steps);
             for(Class<? extends CdmBase> type : indexedClasses()){
                 reindex(type, monitor);
+            }
             optimize();
             monitor.worked(1);
             monitor.subTask("Optimizing Index");
             SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
             subMonitor.beginTask("Optimizing Index",1);
             optimize();
             subMonitor.worked(1);
             logger.info("end index optimization");
             subMonitor.done();
             //monitor.worked(1);
             monitor.done();
+        }
-...
+            }
             monitor.setTaskName("CdmMassIndexer");
             int steps = indexedClasses().length + 1; // +1 for optimize
             monitor.beginTask("Purging " + indexedClasses().length + " classes", steps);
             int steps = indexedClasses().size() + 1; // +1 for optimize
             monitor.beginTask("Purging " + indexedClasses().size() + " classes", steps);
             for(Class<? extends CdmBase> type : indexedClasses()){
                 purge(type, monitor);
-...
          */
         @SuppressWarnings("unchecked")
         @Override
         public Class<? extends CdmBase>[] indexedClasses() {
             return new Class[] {
                     TaxonBase.class,
                     DescriptionElementBase.class,
                     Classification.class,
                     TaxonNameBase.class,
                     SpecimenOrObservationBase.class
                     };
         public Set<Class<? extends CdmBase>> indexedClasses() {
     //    	indexedClasses.clear();
     //    	indexedClasses.add(DescriptionElementBase.class);
     //    	indexedClasses.add(TaxonBase.class);
     //    	indexedClasses.add(DescriptionElementBase.class);
     //    	indexedClasses.add(Classification.class);
     //    	indexedClasses.add(TaxonNameBase.class);
     //    	indexedClasses.add(SpecimenOrObservationBase.class);
             return indexedClasses;
+        }
         /**
-...
                     };
+        }
     	@Override
     	public void addToIndexedClasses(Class<? extends CdmBase> cdmBaseClass) {
     		indexedClasses.add(cdmBaseClass);
+    	}
     	@Override
     	public void clearIndexedClasses() {
     		indexedClasses.clear();
+    	}
+    }

     package eu.etaxonomy.cdm.api.service.search;
     import java.util.Set;
     import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
     import eu.etaxonomy.cdm.model.common.CdmBase;
     /**
      * @author andreas
-...
          */
         public abstract void purge(IProgressMonitor monitor);
         public Class[] indexedClasses();
         /**
          * Returns a list of (sub-classes of CdmBase) classes to be indexed.
+         *
          * @return a List of {@link CdmBase} sub classes
          */
         public Set<Class<? extends CdmBase>> indexedClasses();
         /**
          * Adds to the current list of (sub-classes of CdmBase) classes to be indexed.
+         *
          * @param cdmBaseClass sub-class of CdmBase class to add
          */
         public void addToIndexedClasses(Class<? extends CdmBase> cdmBaseClass);
         /**
          * Clears the current list of (sub-classes of CdmBase) classes to be indexed.
          */
         public void clearIndexedClasses();
         /**
          * Create (spell-checking) dictionary listed in {@link ICdmMassIndexer#dictionaryClasses()}.
          * This action will not purge the dictionary.

     import org.apache.lucene.index.CorruptIndexException;
     import org.apache.lucene.queryParser.ParseException;
     import org.junit.Assert;
     import org.junit.Before;
     import org.junit.Ignore;
     import org.junit.Test;
     import org.unitils.dbunit.annotation.DataSet;
-...
         private static final int BENCHMARK_ROUNDS = 300;
     	/**
     	 * @throws java.lang.Exception
     	 */
     	@Before
     	public void setUp() throws Exception {
     		indexer.clearIndexedClasses();
         	indexer.addToIndexedClasses(DescriptionElementBase.class);
     		indexer.addToIndexedClasses(TaxonBase.class);
+    	}
         @Test
         public void testDbUnitUsageTest() throws Exception {
             assertNotNull("taxonService should exist", taxonService);

Also available in: Unified diff

Project

General

Profile

EDIT

Revision ece6cbb6

Added by Cherian Mathew about 11 years ago