rename DefaultNgramAnalyzer to CaseInsensitiveNgramAnalyzer

zanata · Apr 26, 2012 · 84bc623 · 84bc623
1 parent 9e49bf2
commit 84bc623
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/...ibernate/search/DefaultNgramAnalyzer.java → .../search/CaseInsensitiveNgramAnalyzer.java b/...ibernate/search/DefaultNgramAnalyzer.java → .../search/CaseInsensitiveNgramAnalyzer.java
@@ -20,22 +20,21 @@
  */
 package org.zanata.hibernate.search;
 
-//FIXME rename to CaseInsensitiveNgramAnalyzer when merged into master
 
 /**
  * Analyzer that tokenizes into lower-case trigrams.
  * 
  * @author David Mason, damason@redhat.com
  */
-public class DefaultNgramAnalyzer extends ConfigurableNgramAnalyzer
+public class CaseInsensitiveNgramAnalyzer extends ConfigurableNgramAnalyzer
 {
 
-   public DefaultNgramAnalyzer()
+   public CaseInsensitiveNgramAnalyzer()
    {
       super(3, true);
    }
 
-   public DefaultNgramAnalyzer(int ngramLength)
+   public CaseInsensitiveNgramAnalyzer(int ngramLength)
    {
       super(ngramLength, true);
    }

diff --git a/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java b/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
@@ -43,7 +43,7 @@ public void setParameterValues(@SuppressWarnings("rawtypes") Map parameters)
          String caseBehaviour = (String) parameters.get("case");
          if ("fold".equals(caseBehaviour))
          {
-            analyzer = new DefaultNgramAnalyzer();
+            analyzer = new CaseInsensitiveNgramAnalyzer();
          }
          else if ("preserve".equals(caseBehaviour))
          {
@@ -52,7 +52,7 @@ else if ("preserve".equals(caseBehaviour))
          else
          {
             log.warn("invalid value for parameter \"case\": \"{0}\", default will be used", caseBehaviour);
-            analyzer = new DefaultNgramAnalyzer();
+            analyzer = new CaseInsensitiveNgramAnalyzer();
          }
       }
    }
@@ -62,7 +62,7 @@ public void set(String name, Object value, Document luceneDocument, LuceneOption
    {
       if (analyzer == null)
       {
-         analyzer = new DefaultNgramAnalyzer();
+         analyzer = new CaseInsensitiveNgramAnalyzer();
       }
 
       if (!(value instanceof List<?>))

diff --git a/zanata-model/src/main/java/org/zanata/model/HTextContainer.java b/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
@@ -32,7 +32,7 @@
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.zanata.common.HasContents;
-import org.zanata.hibernate.search.DefaultNgramAnalyzer;
+import org.zanata.hibernate.search.CaseInsensitiveNgramAnalyzer;
 
 /**
  * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
@@ -44,47 +44,47 @@ abstract class HTextContainer implements HasContents, Serializable
 
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent0()
    {
       return getContentAtIndex(0);
    }
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent1()
    {
       return getContentAtIndex(1);
    }
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent2()
    {
       return getContentAtIndex(2);
    }
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent3()
    {
       return getContentAtIndex(3);
    }
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent4()
    {
       return getContentAtIndex(4);
    }
 
    @Type(type = "text")
-   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = DefaultNgramAnalyzer.class))
+   @Field(index = Index.TOKENIZED, analyzer = @Analyzer(impl = CaseInsensitiveNgramAnalyzer.class))
    @SuppressWarnings("unused")
    private String getContent5()
    {

diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
@@ -45,7 +45,7 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.log.Log;
 import org.zanata.common.LocaleId;
-import org.zanata.hibernate.search.DefaultNgramAnalyzer;
+import org.zanata.hibernate.search.CaseInsensitiveNgramAnalyzer;
 import org.zanata.model.HDocument;
 import org.zanata.model.HTextFlow;
 import org.zanata.webtrans.shared.model.TransMemoryQuery;
@@ -170,7 +170,7 @@ public List<Object[]> getSearchResult(TransMemoryQuery query, List<Long> transla
       }
 
       org.apache.lucene.search.Query textQuery;
-      DefaultNgramAnalyzer analyzer = new DefaultNgramAnalyzer();
+      CaseInsensitiveNgramAnalyzer analyzer = new CaseInsensitiveNgramAnalyzer();
       if (query.getSearchType() == SearchType.FUZZY_PLURAL)
       {
          int queriesSize = multiQueryText.length;

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
@@ -46,7 +46,7 @@
 import org.zanata.dao.TextFlowDAO;
 import org.zanata.exception.ZanataServiceException;
 import org.zanata.hibernate.search.CaseSensitiveNgramAnalyzer;
-import org.zanata.hibernate.search.DefaultNgramAnalyzer;
+import org.zanata.hibernate.search.CaseInsensitiveNgramAnalyzer;
 import org.zanata.hibernate.search.IndexFieldLabels;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
@@ -117,7 +117,7 @@ public List<HTextFlowTarget> findTextFlowTargets(WorkspaceId workspace, FilterCo
       else
       {
          searchFieldPrefix = IndexFieldLabels.CONTENT_CASE_FOLDED;
-         ngramAnalyzer = new DefaultNgramAnalyzer();
+         ngramAnalyzer = new CaseInsensitiveNgramAnalyzer();
       }
 
       String[] searchFields = new String[6];