Merge pull request #344 from kw-udon/dev

Rename, Add Unit Test

src/main/config/es/fess_config.json

@@ -392,7 +392,7 @@
           }
         }
       },
-      "suggest_bad_word" : {
+      "bad_word" : {
         "_all" : {
           "enabled" : false
         },
@@ -627,12 +627,12 @@
           }
         }
       },
-      "suggest_elevate_word_to_label" : {
+      "elevate_word_to_label" : {
         "_all" : {
           "enabled" : false
         },
         "properties" : {
-          "suggestElevateWordId" : {
+          "elevateWordId" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
@@ -642,7 +642,7 @@
           }
         }
       },
-      "suggest_elevate_word" : {
+      "elevate_word" : {
         "_all" : {
           "enabled" : false
         },

src/main/java/org/codelibs/fess/app/pager/SuggestBadWordPager.java → src/main/java/org/codelibs/fess/app/pager/BadWordPager.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class SuggestBadWordPager implements Serializable {
+public class BadWordPager implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -134,7 +134,7 @@ public class SuggestBadWordPager implements Serializable {
         this.pageNumberList = pageNumberList;
     }
 
-    public SuggestBadWordPager() {
+    public BadWordPager() {
         super();
     }
 

src/main/java/org/codelibs/fess/app/pager/SuggestElevateWordPager.java → src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.codelibs.fess.Constants;
 
-public class SuggestElevateWordPager implements Serializable {
+public class ElevateWordPager implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -137,7 +137,7 @@ public class SuggestElevateWordPager implements Serializable {
         this.pageNumberList = pageNumberList;
     }
 
-    public SuggestElevateWordPager() {
+    public ElevateWordPager() {
         super();
     }
 

src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java → src/main/java/org/codelibs/fess/app/service/BadWordService.java

@@ -30,10 +30,10 @@ import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.SuggestBadWordPager;
-import org.codelibs.fess.es.config.cbean.SuggestBadWordCB;
-import org.codelibs.fess.es.config.exbhv.SuggestBadWordBhv;
-import org.codelibs.fess.es.config.exentity.SuggestBadWord;
+import org.codelibs.fess.app.pager.BadWordPager;
+import org.codelibs.fess.es.config.cbean.BadWordCB;
+import org.codelibs.fess.es.config.exbhv.BadWordBhv;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
@@ -43,62 +43,62 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;
 
-public class SuggestBadWordService implements Serializable {
+public class BadWordService implements Serializable {
 
     private static final String DELETE_PREFIX = "--";
 
     private static final long serialVersionUID = 1L;
 
-    private static final Log log = LogFactory.getLog(SuggestBadWordService.class);
+    private static final Log log = LogFactory.getLog(BadWordService.class);
 
     @Resource
-    protected SuggestBadWordBhv suggestBadWordBhv;
+    protected BadWordBhv badWordBhv;
 
-    public SuggestBadWordService() {
+    public BadWordService() {
         super();
     }
 
-    public List<SuggestBadWord> getSuggestBadWordList(final SuggestBadWordPager suggestBadWordPager) {
+    public List<BadWord> getBadWordList(final BadWordPager badWordPager) {
 
-        final PagingResultBean<SuggestBadWord> suggestBadWordList = suggestBadWordBhv.selectPage(cb -> {
-            cb.paging(suggestBadWordPager.getPageSize(), suggestBadWordPager.getCurrentPageNumber());
-            setupListCondition(cb, suggestBadWordPager);
+        final PagingResultBean<BadWord> badWordList = badWordBhv.selectPage(cb -> {
+            cb.paging(badWordPager.getPageSize(), badWordPager.getCurrentPageNumber());
+            setupListCondition(cb, badWordPager);
         });
 
         // update pager
-        BeanUtil.copyBeanToBean(suggestBadWordList, suggestBadWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
-        suggestBadWordPager.setPageNumberList(suggestBadWordList.pageRange(op -> {
+        BeanUtil.copyBeanToBean(badWordList, badWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+        badWordPager.setPageNumberList(badWordList.pageRange(op -> {
             op.rangeSize(5);
         }).createPageNumberList());
 
-        return suggestBadWordList;
+        return badWordList;
     }
 
-    public OptionalEntity<SuggestBadWord> getSuggestBadWord(final String id) {
-        return suggestBadWordBhv.selectByPK(id);
+    public OptionalEntity<BadWord> getBadWord(final String id) {
+        return badWordBhv.selectByPK(id);
     }
 
-    public void store(final SuggestBadWord suggestBadWord) {
-        setupStoreCondition(suggestBadWord);
+    public void store(final BadWord badWord) {
+        setupStoreCondition(badWord);
 
-        suggestBadWordBhv.insertOrUpdate(suggestBadWord, op -> {
+        badWordBhv.insertOrUpdate(badWord, op -> {
             op.setRefresh(true);
         });
 
     }
 
-    public void delete(final SuggestBadWord suggestBadWord) {
-        setupDeleteCondition(suggestBadWord);
+    public void delete(final BadWord badWord) {
+        setupDeleteCondition(badWord);
 
-        suggestBadWordBhv.delete(suggestBadWord, op -> {
+        badWordBhv.delete(badWord, op -> {
             op.setRefresh(true);
         });
 
     }
 
-    protected void setupListCondition(final SuggestBadWordCB cb, final SuggestBadWordPager suggestBadWordPager) {
-        if (suggestBadWordPager.id != null) {
-            cb.query().docMeta().setId_Equal(suggestBadWordPager.id);
+    protected void setupListCondition(final BadWordCB cb, final BadWordPager badWordPager) {
+        if (badWordPager.id != null) {
+            cb.query().docMeta().setId_Equal(badWordPager.id);
         }
         // TODO Long, Integer, String supported only.
 
@@ -109,19 +109,19 @@ public class SuggestBadWordService implements Serializable {
 
     }
 
-    protected void setupEntityCondition(final SuggestBadWordCB cb, final Map<String, String> keys) {
+    protected void setupEntityCondition(final BadWordCB cb, final Map<String, String> keys) {
 
         // setup condition
 
     }
 
-    protected void setupStoreCondition(final SuggestBadWord suggestBadWord) {
+    protected void setupStoreCondition(final BadWord badWord) {
 
         // setup condition
 
     }
 
-    protected void setupDeleteCondition(final SuggestBadWord suggestBadWord) {
+    protected void setupDeleteCondition(final BadWord badWord) {
 
         // setup condition
 
@@ -133,34 +133,34 @@ public class SuggestBadWordService implements Serializable {
             List<String> list;
             csvReader.readValues(); // ignore header
             while ((list = csvReader.readValues()) != null) {
-                String badWord = getValue(list, 0);
-                if (StringUtil.isBlank(badWord)) {
+                String targetWord = getValue(list, 0);
+                if (StringUtil.isBlank(targetWord)) {
                     // skip
                     continue;
                 }
                 try {
                     boolean isDelete = false;
-                    if (badWord.startsWith(DELETE_PREFIX)) {
+                    if (targetWord.startsWith(DELETE_PREFIX)) {
                         isDelete = true;
-                        badWord = badWord.substring(2);
+                        targetWord = targetWord.substring(2);
                     }
-                    final String target = badWord;
-                    SuggestBadWord suggestBadWord = suggestBadWordBhv.selectEntity(cb -> {
+                    final String target = targetWord;
+                    BadWord badWord = badWordBhv.selectEntity(cb -> {
                         cb.query().setSuggestWord_Equal(target);
                     }).orElse(null);//TODO
                     final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong();
                     if (isDelete) {
-                        suggestBadWordBhv.delete(suggestBadWord);
-                    } else if (suggestBadWord == null) {
-                        suggestBadWord = new SuggestBadWord();
-                        suggestBadWord.setSuggestWord(badWord);
-                        suggestBadWord.setCreatedBy("system");
-                        suggestBadWord.setCreatedTime(now);
-                        suggestBadWordBhv.insert(suggestBadWord);
+                        badWordBhv.delete(badWord);
+                    } else if (badWord == null) {
+                        badWord = new BadWord();
+                        badWord.setSuggestWord(targetWord);
+                        badWord.setCreatedBy("system");
+                        badWord.setCreatedTime(now);
+                        badWordBhv.insert(badWord);
                     } else {
-                        suggestBadWord.setUpdatedBy("system");
-                        suggestBadWord.setUpdatedTime(now);
-                        suggestBadWordBhv.update(suggestBadWord);
+                        badWord.setUpdatedBy("system");
+                        badWord.setUpdatedTime(now);
+                        badWordBhv.update(badWord);
                     }
                 } catch (final Exception e) {
                     log.warn("Failed to read a sugget elevate word: " + list, e);
@@ -182,11 +182,11 @@ public class SuggestBadWordService implements Serializable {
             list.add("BadWord");
             csvWriter.writeValues(list);
 
-            suggestBadWordBhv.selectCursor(cb -> {
+            badWordBhv.selectCursor(cb -> {
                 cb.query().matchAll();
-            }, new EntityRowHandler<SuggestBadWord>() {
+            }, new EntityRowHandler<BadWord>() {
                 @Override
-                public void handle(final SuggestBadWord entity) {
+                public void handle(final BadWord entity) {
                     final List<String> list = new ArrayList<String>();
                     addToList(list, entity.getSuggestWord());
                     try {

src/main/java/org/codelibs/fess/app/service/SuggestElevateWordService.java → src/main/java/org/codelibs/fess/app/service/ElevateWordService.java

@@ -30,12 +30,12 @@ import org.apache.commons.logging.LogFactory;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.SuggestElevateWordPager;
-import org.codelibs.fess.es.config.cbean.SuggestElevateWordCB;
-import org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv;
-import org.codelibs.fess.es.config.exbhv.SuggestElevateWordToLabelBhv;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWordToLabel;
+import org.codelibs.fess.app.pager.ElevateWordPager;
+import org.codelibs.fess.es.config.cbean.ElevateWordCB;
+import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
+import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;
@@ -45,47 +45,47 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;
 
-public class SuggestElevateWordService implements Serializable {
+public class ElevateWordService implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private static final Log log = LogFactory.getLog(SuggestElevateWordService.class);
+    private static final Log log = LogFactory.getLog(ElevateWordService.class);
 
     @Resource
-    protected SuggestElevateWordToLabelBhv suggestElevateWordToLabelBhv;
+    protected ElevateWordToLabelBhv elevateWordToLabelBhv;
 
     @Resource
-    protected SuggestElevateWordBhv suggestElevateWordBhv;
+    protected ElevateWordBhv elevateWordBhv;
 
-    public SuggestElevateWordService() {
+    public ElevateWordService() {
         super();
     }
 
-    public List<SuggestElevateWord> getSuggestElevateWordList(final SuggestElevateWordPager suggestElevateWordPager) {
+    public List<ElevateWord> getElevateWordList(final ElevateWordPager elevateWordPager) {
 
-        final PagingResultBean<SuggestElevateWord> suggestElevateWordList = suggestElevateWordBhv.selectPage(cb -> {
-            cb.paging(suggestElevateWordPager.getPageSize(), suggestElevateWordPager.getCurrentPageNumber());
-            setupListCondition(cb, suggestElevateWordPager);
+        final PagingResultBean<ElevateWord> elevateWordList = elevateWordBhv.selectPage(cb -> {
+            cb.paging(elevateWordPager.getPageSize(), elevateWordPager.getCurrentPageNumber());
+            setupListCondition(cb, elevateWordPager);
         });
 
         // update pager
-        BeanUtil.copyBeanToBean(suggestElevateWordList, suggestElevateWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
-        suggestElevateWordPager.setPageNumberList(suggestElevateWordList.pageRange(op -> {
+        BeanUtil.copyBeanToBean(elevateWordList, elevateWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+        elevateWordPager.setPageNumberList(elevateWordList.pageRange(op -> {
             op.rangeSize(5);
         }).createPageNumberList());
 
-        return suggestElevateWordList;
+        return elevateWordList;
     }
 
-    public OptionalEntity<SuggestElevateWord> getSuggestElevateWord(final String id) {
-        return suggestElevateWordBhv.selectByPK(id).map(entity -> {
+    public OptionalEntity<ElevateWord> getElevateWord(final String id) {
+        return elevateWordBhv.selectByPK(id).map(entity -> {
 
-            final List<SuggestElevateWordToLabel> wctltmList = suggestElevateWordToLabelBhv.selectList(wctltmCb -> {
-                wctltmCb.query().setSuggestElevateWordId_Equal(entity.getId());
+            final List<ElevateWordToLabel> wctltmList = elevateWordToLabelBhv.selectList(wctltmCb -> {
+                wctltmCb.query().setElevateWordId_Equal(entity.getId());
             });
             if (!wctltmList.isEmpty()) {
                 final List<String> labelTypeIds = new ArrayList<String>(wctltmList.size());
-                for (final SuggestElevateWordToLabel mapping : wctltmList) {
+                for (final ElevateWordToLabel mapping : wctltmList) {
                     labelTypeIds.add(mapping.getLabelTypeId());
                 }
                 entity.setLabelTypeIds(labelTypeIds.toArray(new String[labelTypeIds.size()]));
@@ -94,40 +94,40 @@ public class SuggestElevateWordService implements Serializable {
         });
     }
 
-    public void store(final SuggestElevateWord suggestElevateWord) {
-        final boolean isNew = suggestElevateWord.getId() == null;
-        final String[] labelTypeIds = suggestElevateWord.getLabelTypeIds();
-        setupStoreCondition(suggestElevateWord);
+    public void store(final ElevateWord elevateWord) {
+        final boolean isNew = elevateWord.getId() == null;
+        final String[] labelTypeIds = elevateWord.getLabelTypeIds();
+        setupStoreCondition(elevateWord);
 
-        suggestElevateWordBhv.insertOrUpdate(suggestElevateWord, op -> {
+        elevateWordBhv.insertOrUpdate(elevateWord, op -> {
             op.setRefresh(true);
         });
-        final String suggestElevateWordId = suggestElevateWord.getId();
+        final String elevateWordId = elevateWord.getId();
         if (isNew) {
             // Insert
             if (labelTypeIds != null) {
-                final List<SuggestElevateWordToLabel> wctltmList = new ArrayList<SuggestElevateWordToLabel>();
+                final List<ElevateWordToLabel> wctltmList = new ArrayList<ElevateWordToLabel>();
                 for (final String id : labelTypeIds) {
-                    final SuggestElevateWordToLabel mapping = new SuggestElevateWordToLabel();
-                    mapping.setSuggestElevateWordId(suggestElevateWordId);
+                    final ElevateWordToLabel mapping = new ElevateWordToLabel();
+                    mapping.setElevateWordId(elevateWordId);
                     mapping.setLabelTypeId(id);
                     wctltmList.add(mapping);
                 }
-                suggestElevateWordToLabelBhv.batchInsert(wctltmList, op -> {
+                elevateWordToLabelBhv.batchInsert(wctltmList, op -> {
                     op.setRefresh(true);
                 });
             }
         } else {
             // Update
             if (labelTypeIds != null) {
-                final List<SuggestElevateWordToLabel> list = suggestElevateWordToLabelBhv.selectList(wctltmCb -> {
-                    wctltmCb.query().setSuggestElevateWordId_Equal(suggestElevateWordId);
+                final List<ElevateWordToLabel> list = elevateWordToLabelBhv.selectList(wctltmCb -> {
+                    wctltmCb.query().setElevateWordId_Equal(elevateWordId);
                 });
-                final List<SuggestElevateWordToLabel> newList = new ArrayList<SuggestElevateWordToLabel>();
-                final List<SuggestElevateWordToLabel> matchedList = new ArrayList<SuggestElevateWordToLabel>();
+                final List<ElevateWordToLabel> newList = new ArrayList<ElevateWordToLabel>();
+                final List<ElevateWordToLabel> matchedList = new ArrayList<ElevateWordToLabel>();
                 for (final String id : labelTypeIds) {
                     boolean exist = false;
-                    for (final SuggestElevateWordToLabel mapping : list) {
+                    for (final ElevateWordToLabel mapping : list) {
                         if (mapping.getLabelTypeId().equals(id)) {
                             exist = true;
                             matchedList.add(mapping);
@@ -136,35 +136,35 @@ public class SuggestElevateWordService implements Serializable {
                     }
                     if (!exist) {
                         // new
-                        final SuggestElevateWordToLabel mapping = new SuggestElevateWordToLabel();
-                        mapping.setSuggestElevateWordId(suggestElevateWordId);
+                        final ElevateWordToLabel mapping = new ElevateWordToLabel();
+                        mapping.setElevateWordId(elevateWordId);
                         mapping.setLabelTypeId(id);
                         newList.add(mapping);
                     }
                 }
                 list.removeAll(matchedList);
-                suggestElevateWordToLabelBhv.batchInsert(newList, op -> {
+                elevateWordToLabelBhv.batchInsert(newList, op -> {
                     op.setRefresh(true);
                 });
-                suggestElevateWordToLabelBhv.batchDelete(list, op -> {
+                elevateWordToLabelBhv.batchDelete(list, op -> {
                     op.setRefresh(true);
                 });
             }
         }
     }
 
-    public void delete(final SuggestElevateWord suggestElevateWord) {
-        setupDeleteCondition(suggestElevateWord);
+    public void delete(final ElevateWord elevateWord) {
+        setupDeleteCondition(elevateWord);
 
-        suggestElevateWordBhv.delete(suggestElevateWord, op -> {
+        elevateWordBhv.delete(elevateWord, op -> {
             op.setRefresh(true);
         });
 
     }
 
-    protected void setupListCondition(final SuggestElevateWordCB cb, final SuggestElevateWordPager suggestElevateWordPager) {
-        if (suggestElevateWordPager.id != null) {
-            cb.query().docMeta().setId_Equal(suggestElevateWordPager.id);
+    protected void setupListCondition(final ElevateWordCB cb, final ElevateWordPager elevateWordPager) {
+        if (elevateWordPager.id != null) {
+            cb.query().docMeta().setId_Equal(elevateWordPager.id);
         }
         // TODO Long, Integer, String supported only.
 
@@ -175,19 +175,19 @@ public class SuggestElevateWordService implements Serializable {
 
     }
 
-    protected void setupEntityCondition(final SuggestElevateWordCB cb, final Map<String, String> keys) {
+    protected void setupEntityCondition(final ElevateWordCB cb, final Map<String, String> keys) {
 
         // setup condition
 
     }
 
-    protected void setupStoreCondition(final SuggestElevateWord suggestElevateWord) {
+    protected void setupStoreCondition(final ElevateWord elevateWord) {
 
         // setup condition
 
     }
 
-    protected void setupDeleteCondition(final SuggestElevateWord suggestElevateWord) {
+    protected void setupDeleteCondition(final ElevateWord elevateWord) {
 
         // setup condition
 
@@ -207,7 +207,7 @@ public class SuggestElevateWordService implements Serializable {
                 try {
                     final String role = getValue(list, 2);
                     final String label = getValue(list, 3);
-                    SuggestElevateWord suggestElevateWord = suggestElevateWordBhv.selectEntity(cb -> {
+                    ElevateWord elevateWord = elevateWordBhv.selectEntity(cb -> {
                         cb.query().setSuggestWord_Equal(suggestWord);
                         if (StringUtil.isNotBlank(role)) {
                             cb.query().setTargetRole_Equal(role);
@@ -219,24 +219,24 @@ public class SuggestElevateWordService implements Serializable {
                     final String reading = getValue(list, 1);
                     final String boost = getValue(list, 4);
                     final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong();
-                    if (suggestElevateWord == null) {
-                        suggestElevateWord = new SuggestElevateWord();
-                        suggestElevateWord.setSuggestWord(suggestWord);
-                        suggestElevateWord.setReading(reading);
-                        suggestElevateWord.setTargetRole(role);
-                        suggestElevateWord.setTargetLabel(label);
-                        suggestElevateWord.setBoost(StringUtil.isBlank(boost) ? 1.0f : Float.parseFloat(boost));
-                        suggestElevateWord.setCreatedBy("system");
-                        suggestElevateWord.setCreatedTime(now);
-                        suggestElevateWordBhv.insert(suggestElevateWord);
+                    if (elevateWord == null) {
+                        elevateWord = new ElevateWord();
+                        elevateWord.setSuggestWord(suggestWord);
+                        elevateWord.setReading(reading);
+                        elevateWord.setTargetRole(role);
+                        elevateWord.setTargetLabel(label);
+                        elevateWord.setBoost(StringUtil.isBlank(boost) ? 1.0f : Float.parseFloat(boost));
+                        elevateWord.setCreatedBy("system");
+                        elevateWord.setCreatedTime(now);
+                        elevateWordBhv.insert(elevateWord);
                     } else if (StringUtil.isBlank(reading) && StringUtil.isBlank(boost)) {
-                        suggestElevateWordBhv.delete(suggestElevateWord);
+                        elevateWordBhv.delete(elevateWord);
                     } else {
-                        suggestElevateWord.setReading(reading);
-                        suggestElevateWord.setBoost(StringUtil.isBlank(boost) ? 1.0f : Float.parseFloat(boost));
-                        suggestElevateWord.setUpdatedBy("system");
-                        suggestElevateWord.setUpdatedTime(now);
-                        suggestElevateWordBhv.update(suggestElevateWord);
+                        elevateWord.setReading(reading);
+                        elevateWord.setBoost(StringUtil.isBlank(boost) ? 1.0f : Float.parseFloat(boost));
+                        elevateWord.setUpdatedBy("system");
+                        elevateWord.setUpdatedTime(now);
+                        elevateWordBhv.update(elevateWord);
                     }
                 } catch (final Exception e) {
                     log.warn("Failed to read a sugget elevate word: " + list, e);
@@ -262,11 +262,11 @@ public class SuggestElevateWordService implements Serializable {
             list.add("Boost");
             csvWriter.writeValues(list);
 
-            suggestElevateWordBhv.selectCursor(cb -> {
+            elevateWordBhv.selectCursor(cb -> {
                 cb.query().matchAll();
-            }, new EntityRowHandler<SuggestElevateWord>() {
+            }, new EntityRowHandler<ElevateWord>() {
                 @Override
-                public void handle(final SuggestElevateWord entity) {
+                public void handle(final ElevateWord entity) {
                     final List<String> list = new ArrayList<String>();
                     addToList(list, entity.getSuggestWord());
                     addToList(list, entity.getReading());

src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java

@@ -29,11 +29,11 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.SuggestBadWordPager;
-import org.codelibs.fess.app.service.SuggestBadWordService;
+import org.codelibs.fess.app.pager.BadWordPager;
+import org.codelibs.fess.app.service.BadWordService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.SuggestBadWord;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
@@ -54,9 +54,9 @@ public class AdminBadwordAction extends FessAdminAction {
     //                                                                           Attribute
     //                                                                           =========
     @Resource
-    private SuggestBadWordService suggestBadWordService;
+    private BadWordService badWordService;
     @Resource
-    private SuggestBadWordPager suggestBadWordPager;
+    private BadWordPager badWordPager;
     @Resource
     private SystemHelper systemHelper;
     @Resource
@@ -84,9 +84,9 @@ public class AdminBadwordAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         pageNumber.ifPresent(num -> {
-            suggestBadWordPager.setCurrentPageNumber(pageNumber.get());
+            badWordPager.setCurrentPageNumber(pageNumber.get());
         }).orElse(() -> {
-            suggestBadWordPager.setCurrentPageNumber(0);
+            badWordPager.setCurrentPageNumber(0);
         });
         return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
@@ -95,7 +95,7 @@ public class AdminBadwordAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse search(final SearchForm form) {
-        copyBeanToBean(form, suggestBadWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+        copyBeanToBean(form, badWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
         return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -103,17 +103,17 @@ public class AdminBadwordAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse reset(final SearchForm form) {
-        suggestBadWordPager.clear();
+        badWordPager.clear();
         return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     protected void searchPaging(final RenderData data, final SearchForm form) {
-        data.register("suggestBadWordItems", suggestBadWordService.getSuggestBadWordList(suggestBadWordPager)); // page navi
+        data.register("badWordItems", badWordService.getBadWordList(badWordPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(suggestBadWordPager, form, op -> op.include("id"));
+        copyBeanToBean(badWordPager, form, op -> op.include("id"));
     }
 
     // ===================================================================================
@@ -137,7 +137,7 @@ public class AdminBadwordAction extends FessAdminAction {
     public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, () -> asListHtml());
         final String id = form.id;
-        suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
+        badWordService.getBadWord(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
@@ -162,7 +162,7 @@ public class AdminBadwordAction extends FessAdminAction {
         saveToken();
         return asDetailsHtml().useForm(EditForm.class, op -> {
             op.setup(form -> {
-                suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
+                badWordService.getBadWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
                         copyOp.excludeNull();
                     });
@@ -191,7 +191,7 @@ public class AdminBadwordAction extends FessAdminAction {
             final Path tempFile = Files.createTempFile(null, null);
             try {
                 try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) {
-                    suggestBadWordService.exportCsv(writer);
+                    badWordService.exportCsv(writer);
                 } catch (final Exception e) {
                     throwValidationError(messages -> messages.addErrorsFailedToDownloadBadwordFile(GLOBAL), () -> asDownloadHtml());
                 }
@@ -221,8 +221,8 @@ public class AdminBadwordAction extends FessAdminAction {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, () -> asEditHtml());
         verifyToken(() -> asEditHtml());
-        getSuggestBadWord(form).ifPresent(entity -> {
-            suggestBadWordService.store(entity);
+        getBadWord(form).ifPresent(entity -> {
+            badWordService.store(entity);
             suggestHelper.addBadWord(entity.getSuggestWord());
             saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
         }).orElse(() -> {
@@ -236,8 +236,8 @@ public class AdminBadwordAction extends FessAdminAction {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, () -> asEditHtml());
         verifyToken(() -> asEditHtml());
-        getSuggestBadWord(form).ifPresent(entity -> {
-            suggestBadWordService.store(entity);
+        getBadWord(form).ifPresent(entity -> {
+            badWordService.store(entity);
             suggestHelper.storeAllBadWords();
             saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
         }).orElse(() -> {
@@ -252,8 +252,8 @@ public class AdminBadwordAction extends FessAdminAction {
         validate(form, messages -> {}, () -> asDetailsHtml());
         verifyToken(() -> asDetailsHtml());
         final String id = form.id;
-        suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
-            suggestBadWordService.delete(entity);
+        badWordService.getBadWord(id).ifPresent(entity -> {
+            badWordService.delete(entity);
             suggestHelper.deleteBadWord(entity.getSuggestWord());
             saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
         }).orElse(() -> {
@@ -267,25 +267,25 @@ public class AdminBadwordAction extends FessAdminAction {
         validate(form, messages -> {}, () -> asUploadHtml());
         verifyToken(() -> asUploadHtml());
         new Thread(() -> {
-            try (Reader reader = new BufferedReader(new InputStreamReader(form.suggestBadWordFile.getInputStream(), getCsvEncoding()))) {
-                suggestBadWordService.importCsv(reader);
+            try (Reader reader = new BufferedReader(new InputStreamReader(form.badWordFile.getInputStream(), getCsvEncoding()))) {
+                badWordService.importCsv(reader);
                 suggestHelper.storeAllBadWords();
             } catch (final Exception e) {
                 throw new FessSystemException("Failed to import data.", e);
             }
         }).start();
-        saveInfo(messages -> messages.addSuccessUploadSuggestBadWord(GLOBAL));
+        saveInfo(messages -> messages.addSuccessUploadBadWord(GLOBAL));
         return redirect(getClass());
     }
 
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
-    private OptionalEntity<SuggestBadWord> getEntity(final CreateForm form, final String username, final long currentTime) {
+    private OptionalEntity<BadWord> getEntity(final CreateForm form, final String username, final long currentTime) {
         switch (form.crudMode) {
         case CrudMode.CREATE:
             if (form instanceof CreateForm) {
-                return OptionalEntity.of(new SuggestBadWord()).map(entity -> {
+                return OptionalEntity.of(new BadWord()).map(entity -> {
                     entity.setCreatedBy(username);
                     entity.setCreatedTime(currentTime);
                     return entity;
@@ -294,7 +294,7 @@ public class AdminBadwordAction extends FessAdminAction {
             break;
         case CrudMode.EDIT:
             if (form instanceof EditForm) {
-                return suggestBadWordService.getSuggestBadWord(((EditForm) form).id);
+                return badWordService.getBadWord(((EditForm) form).id);
             }
             break;
         default:
@@ -303,7 +303,7 @@ public class AdminBadwordAction extends FessAdminAction {
         return OptionalEntity.empty();
     }
 
-    protected OptionalEntity<SuggestBadWord> getSuggestBadWord(final CreateForm form) {
+    protected OptionalEntity<BadWord> getBadWord(final CreateForm form) {
         final String username = systemHelper.getUsername();
         final long currentTime = systemHelper.getCurrentTimeAsLong();
         return getEntity(form, username, currentTime).map(entity -> {
@@ -334,10 +334,10 @@ public class AdminBadwordAction extends FessAdminAction {
     //                                                                           =========
     private HtmlResponse asListHtml() {
         return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
-            data.register("suggestBadWordItems", suggestBadWordService.getSuggestBadWordList(suggestBadWordPager));
+            data.register("badWordItems", badWordService.getBadWordList(badWordPager));
         }).useForm(SearchForm.class, setup -> {
             setup.setup(form -> {
-                copyBeanToBean(suggestBadWordPager, form, op -> op.include("id"));
+                copyBeanToBean(badWordPager, form, op -> op.include("id"));
             });
         });
     }

src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java

@@ -29,6 +29,6 @@ public class UploadForm implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Required
-    public MultipartFormFile suggestBadWordFile;
+    public MultipartFormFile badWordFile;
 
 }

src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java

@@ -29,13 +29,13 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.app.pager.SuggestElevateWordPager;
+import org.codelibs.fess.app.pager.ElevateWordPager;
+import org.codelibs.fess.app.service.ElevateWordService;
 import org.codelibs.fess.app.service.LabelTypeService;
-import org.codelibs.fess.app.service.SuggestElevateWordService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.admin.badword.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
@@ -56,9 +56,9 @@ public class AdminElevatewordAction extends FessAdminAction {
     //                                                                           Attribute
     //                                                                           =========
     @Resource
-    private SuggestElevateWordService suggestElevateWordService;
+    private ElevateWordService elevateWordService;
     @Resource
-    private SuggestElevateWordPager suggestElevateWordPager;
+    private ElevateWordPager elevateWordPager;
     @Resource
     private SystemHelper systemHelper;
     @Resource
@@ -88,9 +88,9 @@ public class AdminElevatewordAction extends FessAdminAction {
     @Execute
     public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         pageNumber.ifPresent(num -> {
-            suggestElevateWordPager.setCurrentPageNumber(pageNumber.get());
+            elevateWordPager.setCurrentPageNumber(pageNumber.get());
         }).orElse(() -> {
-            suggestElevateWordPager.setCurrentPageNumber(0);
+            elevateWordPager.setCurrentPageNumber(0);
         });
         return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
@@ -99,7 +99,7 @@ public class AdminElevatewordAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse search(final SearchForm form) {
-        copyBeanToBean(form, suggestElevateWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+        copyBeanToBean(form, elevateWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
         return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -107,17 +107,17 @@ public class AdminElevatewordAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse reset(final SearchForm form) {
-        suggestElevateWordPager.clear();
+        elevateWordPager.clear();
         return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
             searchPaging(data, form);
         });
     }
 
     protected void searchPaging(final RenderData data, final SearchForm form) {
-        data.register("suggestElevateWordItems", suggestElevateWordService.getSuggestElevateWordList(suggestElevateWordPager)); // page navi
+        data.register("elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
 
         // restore from pager
-        copyBeanToBean(suggestElevateWordPager, form, op -> op.include("id"));
+        copyBeanToBean(elevateWordPager, form, op -> op.include("id"));
     }
 
     // ===================================================================================
@@ -143,7 +143,7 @@ public class AdminElevatewordAction extends FessAdminAction {
     public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, () -> asListHtml());
         final String id = form.id;
-        suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
+        elevateWordService.getElevateWord(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
@@ -168,7 +168,7 @@ public class AdminElevatewordAction extends FessAdminAction {
         saveToken();
         return asHtml(path_AdminElevateword_AdminElevatewordDetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
-                suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
+                elevateWordService.getElevateWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
                         copyOp.excludeNull();
                     });
@@ -199,7 +199,7 @@ public class AdminElevatewordAction extends FessAdminAction {
             final Path tempFile = Files.createTempFile(null, null);
             try {
                 try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) {
-                    suggestElevateWordService.exportCsv(writer);
+                    elevateWordService.exportCsv(writer);
                 } catch (final Exception e) {
                     throwValidationError(messages -> messages.addErrorsFailedToDownloadElevateFile(GLOBAL), () -> asDownloadHtml());
                 }
@@ -229,9 +229,9 @@ public class AdminElevatewordAction extends FessAdminAction {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, () -> asEditHtml());
         verifyToken(() -> asEditHtml());
-        getSuggestElevateWord(form).ifPresent(
+        getElevateWord(form).ifPresent(
                 entity -> {
-                    suggestElevateWordService.store(entity);
+                    elevateWordService.store(entity);
                     suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(),
                             entity.getTargetRole(), entity.getBoost());
                     saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
@@ -246,8 +246,8 @@ public class AdminElevatewordAction extends FessAdminAction {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, () -> asEditHtml());
         verifyToken(() -> asEditHtml());
-        getSuggestElevateWord(form).ifPresent(entity -> {
-            suggestElevateWordService.store(entity);
+        getElevateWord(form).ifPresent(entity -> {
+            elevateWordService.store(entity);
             suggestHelper.deleteAllElevateWord();
             suggestHelper.storeAllElevateWords();
             saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
@@ -263,8 +263,8 @@ public class AdminElevatewordAction extends FessAdminAction {
         validate(form, messages -> {}, () -> asDetailsHtml());
         verifyToken(() -> asDetailsHtml());
         final String id = form.id;
-        suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
-            suggestElevateWordService.delete(entity);
+        elevateWordService.getElevateWord(id).ifPresent(entity -> {
+            elevateWordService.delete(entity);
             suggestHelper.deleteElevateWord(entity.getSuggestWord());
             saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
         }).orElse(() -> {
@@ -280,24 +280,24 @@ public class AdminElevatewordAction extends FessAdminAction {
         new Thread(() -> {
             Reader reader = null;
             try {
-                reader = new BufferedReader(new InputStreamReader(form.suggestElevateWordFile.getInputStream(), getCsvEncoding()));
-                suggestElevateWordService.importCsv(reader);
+                reader = new BufferedReader(new InputStreamReader(form.elevateWordFile.getInputStream(), getCsvEncoding()));
+                elevateWordService.importCsv(reader);
             } catch (final Exception e) {
                 throw new FessSystemException("Failed to import data.", e);
             }
         }).start();
-        saveInfo(messages -> messages.addSuccessUploadSuggestElevateWord(GLOBAL));
+        saveInfo(messages -> messages.addSuccessUploadElevateWord(GLOBAL));
         return redirect(getClass());
     }
 
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
-    private OptionalEntity<SuggestElevateWord> getEntity(final CreateForm form, final String username, final long currentTime) {
+    private OptionalEntity<ElevateWord> getEntity(final CreateForm form, final String username, final long currentTime) {
         switch (form.crudMode) {
         case CrudMode.CREATE:
             if (form instanceof CreateForm) {
-                return OptionalEntity.of(new SuggestElevateWord()).map(entity -> {
+                return OptionalEntity.of(new ElevateWord()).map(entity -> {
                     entity.setCreatedBy(username);
                     entity.setCreatedTime(currentTime);
                     return entity;
@@ -306,7 +306,7 @@ public class AdminElevatewordAction extends FessAdminAction {
             break;
         case CrudMode.EDIT:
             if (form instanceof EditForm) {
-                return suggestElevateWordService.getSuggestElevateWord(((EditForm) form).id);
+                return elevateWordService.getElevateWord(((EditForm) form).id);
             }
             break;
         default:
@@ -315,7 +315,7 @@ public class AdminElevatewordAction extends FessAdminAction {
         return OptionalEntity.empty();
     }
 
-    protected OptionalEntity<SuggestElevateWord> getSuggestElevateWord(final CreateForm form) {
+    protected OptionalEntity<ElevateWord> getElevateWord(final CreateForm form) {
         final String username = systemHelper.getUsername();
         final long currentTime = systemHelper.getCurrentTimeAsLong();
         return getEntity(form, username, currentTime).map(entity -> {
@@ -350,10 +350,10 @@ public class AdminElevatewordAction extends FessAdminAction {
     //                                                                           =========
     private HtmlResponse asListHtml() {
         return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
-            data.register("suggestElevateWordItems", suggestElevateWordService.getSuggestElevateWordList(suggestElevateWordPager)); // page navi
+            data.register("elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
             }).useForm(SearchForm.class, setup -> {
             setup.setup(form -> {
-                copyBeanToBean(suggestElevateWordPager, form, op -> op.include("id"));
+                copyBeanToBean(elevateWordPager, form, op -> op.include("id"));
             });
         });
     }

src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java

@@ -29,6 +29,6 @@ public class UploadForm implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Required
-    public MultipartFormFile suggestElevateWordFile;
+    public MultipartFormFile elevateWordFile;
 
 }

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordToLabelBhv.java → src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java

@@ -21,9 +21,9 @@ import java.util.Map;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordToLabelDbm;
-import org.codelibs.fess.es.config.cbean.SuggestElevateWordToLabelCB;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWordToLabel;
+import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
+import org.codelibs.fess.es.config.cbean.BadWordCB;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
@@ -40,7 +40,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior<SuggestElevateWordToLabel, SuggestElevateWordToLabelCB> {
+public abstract class BsBadWordBhv extends EsAbstractBehavior<BadWord, BadWordCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,25 +57,30 @@ public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior<
 
     @Override
     public String asEsIndexType() {
-        return "suggest_elevate_word_to_label";
+        return "bad_word";
     }
 
     @Override
     public String asEsSearchType() {
-        return "suggest_elevate_word_to_label";
+        return "bad_word";
     }
 
     @Override
-    public SuggestElevateWordToLabelDbm asDBMeta() {
-        return SuggestElevateWordToLabelDbm.getInstance();
+    public BadWordDbm asDBMeta() {
+        return BadWordDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends SuggestElevateWordToLabel> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends BadWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setSuggestElevateWordId(DfTypeUtil.toString(source.get("suggestElevateWordId")));
-            result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
+            result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
+            result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
+            result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
+            result.setTargetRole(DfTypeUtil.toString(source.get("targetRole")));
+            result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
+            result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
@@ -86,26 +91,25 @@ public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior<
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public int selectCount(CBCall<BadWordCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestElevateWordToLabel> selectEntity(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public OptionalEntity<BadWord> selectEntity(CBCall<BadWordCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<SuggestElevateWordToLabel> facadeSelectEntity(SuggestElevateWordToLabelCB cb) {
+    protected OptionalEntity<BadWord> facadeSelectEntity(BadWordCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestElevateWordToLabel> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestElevateWordToLabelCB cb,
-            Class<? extends ENTITY> tp) {
+    protected <ENTITY extends BadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(BadWordCB cb, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
     @Override
-    public SuggestElevateWordToLabelCB newConditionBean() {
-        return new SuggestElevateWordToLabelCB();
+    public BadWordCB newConditionBean() {
+        return new BadWordCB();
     }
 
     @Override
@@ -113,135 +117,135 @@ public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior<
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public SuggestElevateWordToLabel selectEntityWithDeletedCheck(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public BadWord selectEntityWithDeletedCheck(CBCall<BadWordCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestElevateWordToLabel> selectByPK(String id) {
+    public OptionalEntity<BadWord> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<SuggestElevateWordToLabel> facadeSelectByPK(String id) {
+    protected OptionalEntity<BadWord> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestElevateWordToLabel> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends BadWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected SuggestElevateWordToLabelCB xprepareCBAsPK(String id) {
+    protected BadWordCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends SuggestElevateWordToLabel> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends BadWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends SuggestElevateWordToLabel> typeOfSelectedEntity() {
-        return SuggestElevateWordToLabel.class;
+    protected Class<? extends BadWord> typeOfSelectedEntity() {
+        return BadWord.class;
     }
 
     @Override
-    protected Class<SuggestElevateWordToLabel> typeOfHandlingEntity() {
-        return SuggestElevateWordToLabel.class;
+    protected Class<BadWord> typeOfHandlingEntity() {
+        return BadWord.class;
     }
 
     @Override
-    protected Class<SuggestElevateWordToLabelCB> typeOfHandlingConditionBean() {
-        return SuggestElevateWordToLabelCB.class;
+    protected Class<BadWordCB> typeOfHandlingConditionBean() {
+        return BadWordCB.class;
     }
 
-    public ListResultBean<SuggestElevateWordToLabel> selectList(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public ListResultBean<BadWord> selectList(CBCall<BadWordCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<SuggestElevateWordToLabel> selectPage(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public PagingResultBean<BadWord> selectPage(CBCall<BadWordCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<SuggestElevateWordToLabel>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<BadWord>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<SuggestElevateWordToLabelCB> cbLambda, EntityRowHandler<SuggestElevateWordToLabel> entityLambda) {
+    public void selectCursor(CBCall<BadWordCB> cbLambda, EntityRowHandler<BadWord> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<SuggestElevateWordToLabelCB> cbLambda, EntityRowHandler<List<SuggestElevateWordToLabel>> entityLambda) {
+    public void selectBulk(CBCall<BadWordCB> cbLambda, EntityRowHandler<List<BadWord>> entityLambda) {
         delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
     }
 
     // ===================================================================================
     //                                                                              Update
     //                                                                              ======
-    public void insert(SuggestElevateWordToLabel entity) {
+    public void insert(BadWord entity) {
         doInsert(entity, null);
     }
 
-    public void insert(SuggestElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insert(BadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsert(entity, null);
     }
 
-    public void update(SuggestElevateWordToLabel entity) {
+    public void update(BadWord entity) {
         doUpdate(entity, null);
     }
 
-    public void update(SuggestElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void update(BadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doUpdate(entity, null);
     }
 
-    public void insertOrUpdate(SuggestElevateWordToLabel entity) {
+    public void insertOrUpdate(BadWord entity) {
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void insertOrUpdate(SuggestElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(BadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void delete(SuggestElevateWordToLabel entity) {
+    public void delete(BadWord entity) {
         doDelete(entity, null);
     }
 
-    public void delete(SuggestElevateWordToLabel entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
+    public void delete(BadWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<SuggestElevateWordToLabelCB> cbLambda) {
+    public int queryDelete(CBCall<BadWordCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<SuggestElevateWordToLabel> list) {
+    public int[] batchInsert(List<BadWord> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<SuggestElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<SuggestElevateWordToLabel> list) {
+    public int[] batchUpdate(List<BadWord> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<SuggestElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<SuggestElevateWordToLabel> list) {
+    public int[] batchDelete(List<BadWord> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<SuggestElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java → src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java

@@ -21,9 +21,9 @@ import java.util.Map;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestBadWordDbm;
-import org.codelibs.fess.es.config.cbean.SuggestBadWordCB;
-import org.codelibs.fess.es.config.exentity.SuggestBadWord;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
+import org.codelibs.fess.es.config.cbean.ElevateWordCB;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
@@ -40,7 +40,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadWord, SuggestBadWordCB> {
+public abstract class BsElevateWordBhv extends EsAbstractBehavior<ElevateWord, ElevateWordCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,25 +57,27 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
 
     @Override
     public String asEsIndexType() {
-        return "suggest_bad_word";
+        return "elevate_word";
     }
 
     @Override
     public String asEsSearchType() {
-        return "suggest_bad_word";
+        return "elevate_word";
     }
 
     @Override
-    public SuggestBadWordDbm asDBMeta() {
-        return SuggestBadWordDbm.getInstance();
+    public ElevateWordDbm asDBMeta() {
+        return ElevateWordDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends SuggestBadWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends ElevateWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
+            result.setBoost(DfTypeUtil.toFloat(source.get("boost")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
+            result.setReading(DfTypeUtil.toString(source.get("reading")));
             result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
             result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
             result.setTargetRole(DfTypeUtil.toString(source.get("targetRole")));
@@ -91,25 +93,25 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<SuggestBadWordCB> cbLambda) {
+    public int selectCount(CBCall<ElevateWordCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestBadWord> selectEntity(CBCall<SuggestBadWordCB> cbLambda) {
+    public OptionalEntity<ElevateWord> selectEntity(CBCall<ElevateWordCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<SuggestBadWord> facadeSelectEntity(SuggestBadWordCB cb) {
+    protected OptionalEntity<ElevateWord> facadeSelectEntity(ElevateWordCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestBadWordCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ElevateWord> OptionalEntity<ENTITY> doSelectOptionalEntity(ElevateWordCB cb, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
     @Override
-    public SuggestBadWordCB newConditionBean() {
-        return new SuggestBadWordCB();
+    public ElevateWordCB newConditionBean() {
+        return new ElevateWordCB();
     }
 
     @Override
@@ -117,135 +119,135 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public SuggestBadWord selectEntityWithDeletedCheck(CBCall<SuggestBadWordCB> cbLambda) {
+    public ElevateWord selectEntityWithDeletedCheck(CBCall<ElevateWordCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestBadWord> selectByPK(String id) {
+    public OptionalEntity<ElevateWord> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<SuggestBadWord> facadeSelectByPK(String id) {
+    protected OptionalEntity<ElevateWord> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestBadWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ElevateWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected SuggestBadWordCB xprepareCBAsPK(String id) {
+    protected ElevateWordCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ElevateWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends SuggestBadWord> typeOfSelectedEntity() {
-        return SuggestBadWord.class;
+    protected Class<? extends ElevateWord> typeOfSelectedEntity() {
+        return ElevateWord.class;
     }
 
     @Override
-    protected Class<SuggestBadWord> typeOfHandlingEntity() {
-        return SuggestBadWord.class;
+    protected Class<ElevateWord> typeOfHandlingEntity() {
+        return ElevateWord.class;
     }
 
     @Override
-    protected Class<SuggestBadWordCB> typeOfHandlingConditionBean() {
-        return SuggestBadWordCB.class;
+    protected Class<ElevateWordCB> typeOfHandlingConditionBean() {
+        return ElevateWordCB.class;
     }
 
-    public ListResultBean<SuggestBadWord> selectList(CBCall<SuggestBadWordCB> cbLambda) {
+    public ListResultBean<ElevateWord> selectList(CBCall<ElevateWordCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<SuggestBadWord> selectPage(CBCall<SuggestBadWordCB> cbLambda) {
+    public PagingResultBean<ElevateWord> selectPage(CBCall<ElevateWordCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<SuggestBadWord>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<ElevateWord>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<SuggestBadWordCB> cbLambda, EntityRowHandler<SuggestBadWord> entityLambda) {
+    public void selectCursor(CBCall<ElevateWordCB> cbLambda, EntityRowHandler<ElevateWord> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<SuggestBadWordCB> cbLambda, EntityRowHandler<List<SuggestBadWord>> entityLambda) {
+    public void selectBulk(CBCall<ElevateWordCB> cbLambda, EntityRowHandler<List<ElevateWord>> entityLambda) {
         delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
     }
 
     // ===================================================================================
     //                                                                              Update
     //                                                                              ======
-    public void insert(SuggestBadWord entity) {
+    public void insert(ElevateWord entity) {
         doInsert(entity, null);
     }
 
-    public void insert(SuggestBadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insert(ElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsert(entity, null);
     }
 
-    public void update(SuggestBadWord entity) {
+    public void update(ElevateWord entity) {
         doUpdate(entity, null);
     }
 
-    public void update(SuggestBadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void update(ElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doUpdate(entity, null);
     }
 
-    public void insertOrUpdate(SuggestBadWord entity) {
+    public void insertOrUpdate(ElevateWord entity) {
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void insertOrUpdate(SuggestBadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(ElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void delete(SuggestBadWord entity) {
+    public void delete(ElevateWord entity) {
         doDelete(entity, null);
     }
 
-    public void delete(SuggestBadWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
+    public void delete(ElevateWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<SuggestBadWordCB> cbLambda) {
+    public int queryDelete(CBCall<ElevateWordCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<SuggestBadWord> list) {
+    public int[] batchInsert(List<ElevateWord> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<ElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<SuggestBadWord> list) {
+    public int[] batchUpdate(List<ElevateWord> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<ElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<SuggestBadWord> list) {
+    public int[] batchDelete(List<ElevateWord> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<ElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java → src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java

@@ -21,9 +21,9 @@ import java.util.Map;
 import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordDbm;
-import org.codelibs.fess.es.config.cbean.SuggestElevateWordCB;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
+import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
+import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
 import org.dbflute.Entity;
 import org.dbflute.bhv.readable.CBCall;
 import org.dbflute.bhv.readable.EntityRowHandler;
@@ -40,7 +40,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<SuggestElevateWord, SuggestElevateWordCB> {
+public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior<ElevateWordToLabel, ElevateWordToLabelCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,32 +57,25 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
 
     @Override
     public String asEsIndexType() {
-        return "suggest_elevate_word";
+        return "elevate_word_to_label";
     }
 
     @Override
     public String asEsSearchType() {
-        return "suggest_elevate_word";
+        return "elevate_word_to_label";
     }
 
     @Override
-    public SuggestElevateWordDbm asDBMeta() {
-        return SuggestElevateWordDbm.getInstance();
+    public ElevateWordToLabelDbm asDBMeta() {
+        return ElevateWordToLabelDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends SuggestElevateWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends ElevateWordToLabel> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setBoost(DfTypeUtil.toFloat(source.get("boost")));
-            result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
-            result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setReading(DfTypeUtil.toString(source.get("reading")));
-            result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
-            result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
-            result.setTargetRole(DfTypeUtil.toString(source.get("targetRole")));
-            result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
-            result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
+            result.setElevateWordId(DfTypeUtil.toString(source.get("elevateWordId")));
+            result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
@@ -93,26 +86,26 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<SuggestElevateWordCB> cbLambda) {
+    public int selectCount(CBCall<ElevateWordToLabelCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestElevateWord> selectEntity(CBCall<SuggestElevateWordCB> cbLambda) {
+    public OptionalEntity<ElevateWordToLabel> selectEntity(CBCall<ElevateWordToLabelCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<SuggestElevateWord> facadeSelectEntity(SuggestElevateWordCB cb) {
+    protected OptionalEntity<ElevateWordToLabel> facadeSelectEntity(ElevateWordToLabelCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestElevateWord> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestElevateWordCB cb,
+    protected <ENTITY extends ElevateWordToLabel> OptionalEntity<ENTITY> doSelectOptionalEntity(ElevateWordToLabelCB cb,
             Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
     @Override
-    public SuggestElevateWordCB newConditionBean() {
-        return new SuggestElevateWordCB();
+    public ElevateWordToLabelCB newConditionBean() {
+        return new ElevateWordToLabelCB();
     }
 
     @Override
@@ -120,135 +113,135 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public SuggestElevateWord selectEntityWithDeletedCheck(CBCall<SuggestElevateWordCB> cbLambda) {
+    public ElevateWordToLabel selectEntityWithDeletedCheck(CBCall<ElevateWordToLabelCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<SuggestElevateWord> selectByPK(String id) {
+    public OptionalEntity<ElevateWordToLabel> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<SuggestElevateWord> facadeSelectByPK(String id) {
+    protected OptionalEntity<ElevateWordToLabel> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestElevateWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ElevateWordToLabel> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected SuggestElevateWordCB xprepareCBAsPK(String id) {
+    protected ElevateWordToLabelCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends SuggestElevateWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ElevateWordToLabel> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends SuggestElevateWord> typeOfSelectedEntity() {
-        return SuggestElevateWord.class;
+    protected Class<? extends ElevateWordToLabel> typeOfSelectedEntity() {
+        return ElevateWordToLabel.class;
     }
 
     @Override
-    protected Class<SuggestElevateWord> typeOfHandlingEntity() {
-        return SuggestElevateWord.class;
+    protected Class<ElevateWordToLabel> typeOfHandlingEntity() {
+        return ElevateWordToLabel.class;
     }
 
     @Override
-    protected Class<SuggestElevateWordCB> typeOfHandlingConditionBean() {
-        return SuggestElevateWordCB.class;
+    protected Class<ElevateWordToLabelCB> typeOfHandlingConditionBean() {
+        return ElevateWordToLabelCB.class;
     }
 
-    public ListResultBean<SuggestElevateWord> selectList(CBCall<SuggestElevateWordCB> cbLambda) {
+    public ListResultBean<ElevateWordToLabel> selectList(CBCall<ElevateWordToLabelCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<SuggestElevateWord> selectPage(CBCall<SuggestElevateWordCB> cbLambda) {
+    public PagingResultBean<ElevateWordToLabel> selectPage(CBCall<ElevateWordToLabelCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<SuggestElevateWord>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<ElevateWordToLabel>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<SuggestElevateWordCB> cbLambda, EntityRowHandler<SuggestElevateWord> entityLambda) {
+    public void selectCursor(CBCall<ElevateWordToLabelCB> cbLambda, EntityRowHandler<ElevateWordToLabel> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<SuggestElevateWordCB> cbLambda, EntityRowHandler<List<SuggestElevateWord>> entityLambda) {
+    public void selectBulk(CBCall<ElevateWordToLabelCB> cbLambda, EntityRowHandler<List<ElevateWordToLabel>> entityLambda) {
         delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
     }
 
     // ===================================================================================
     //                                                                              Update
     //                                                                              ======
-    public void insert(SuggestElevateWord entity) {
+    public void insert(ElevateWordToLabel entity) {
         doInsert(entity, null);
     }
 
-    public void insert(SuggestElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insert(ElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsert(entity, null);
     }
 
-    public void update(SuggestElevateWord entity) {
+    public void update(ElevateWordToLabel entity) {
         doUpdate(entity, null);
     }
 
-    public void update(SuggestElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void update(ElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doUpdate(entity, null);
     }
 
-    public void insertOrUpdate(SuggestElevateWord entity) {
+    public void insertOrUpdate(ElevateWordToLabel entity) {
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void insertOrUpdate(SuggestElevateWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(ElevateWordToLabel entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().indexOption(opLambda);
         }
         doInsertOrUpdate(entity, null, null);
     }
 
-    public void delete(SuggestElevateWord entity) {
+    public void delete(ElevateWordToLabel entity) {
         doDelete(entity, null);
     }
 
-    public void delete(SuggestElevateWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
+    public void delete(ElevateWordToLabel entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<SuggestElevateWordCB> cbLambda) {
+    public int queryDelete(CBCall<ElevateWordToLabelCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<SuggestElevateWord> list) {
+    public int[] batchInsert(List<ElevateWordToLabel> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<SuggestElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<ElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<SuggestElevateWord> list) {
+    public int[] batchUpdate(List<ElevateWordToLabel> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<SuggestElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<ElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<SuggestElevateWord> list) {
+    public int[] batchDelete(List<ElevateWordToLabel> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<SuggestElevateWord> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<ElevateWordToLabel> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 

src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java → src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java

@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestBadWordDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestBadWord extends EsAbstractEntity {
+public class BsBadWord extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -64,13 +64,13 @@ public class BsSuggestBadWord extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @Override
-    public SuggestBadWordDbm asDBMeta() {
-        return SuggestBadWordDbm.getInstance();
+    public BadWordDbm asDBMeta() {
+        return BadWordDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_bad_word";
+        return "bad_word";
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java → src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java

@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestElevateWord extends EsAbstractEntity {
+public class BsElevateWord extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -70,13 +70,13 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @Override
-    public SuggestElevateWordDbm asDBMeta() {
-        return SuggestElevateWordDbm.getInstance();
+    public ElevateWordDbm asDBMeta() {
+        return ElevateWordDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word";
+        return "elevate_word";
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java → src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java

@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordToLabelDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
+public class BsElevateWordToLabel extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -37,8 +37,8 @@ public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** suggestElevateWordId */
-    protected String suggestElevateWordId;
+    /** elevateWordId */
+    protected String elevateWordId;
 
     /** labelTypeId */
     protected String labelTypeId;
@@ -49,13 +49,13 @@ public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @Override
-    public SuggestElevateWordToLabelDbm asDBMeta() {
-        return SuggestElevateWordToLabelDbm.getInstance();
+    public ElevateWordToLabelDbm asDBMeta() {
+        return ElevateWordToLabelDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word_to_label";
+        return "elevate_word_to_label";
     }
 
     // ===================================================================================
@@ -64,8 +64,8 @@ public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> sourceMap = new HashMap<>();
-        if (suggestElevateWordId != null) {
-            sourceMap.put("suggestElevateWordId", suggestElevateWordId);
+        if (elevateWordId != null) {
+            sourceMap.put("elevateWordId", elevateWordId);
         }
         if (labelTypeId != null) {
             sourceMap.put("labelTypeId", labelTypeId);
@@ -79,7 +79,7 @@ public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
     @Override
     protected String doBuildColumnString(String dm) {
         StringBuilder sb = new StringBuilder();
-        sb.append(dm).append(suggestElevateWordId);
+        sb.append(dm).append(elevateWordId);
         sb.append(dm).append(labelTypeId);
         if (sb.length() > dm.length()) {
             sb.delete(0, dm.length());
@@ -91,14 +91,14 @@ public class BsSuggestElevateWordToLabel extends EsAbstractEntity {
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getSuggestElevateWordId() {
-        checkSpecifiedProperty("suggestElevateWordId");
-        return convertEmptyToNull(suggestElevateWordId);
+    public String getElevateWordId() {
+        checkSpecifiedProperty("elevateWordId");
+        return convertEmptyToNull(elevateWordId);
     }
 
-    public void setSuggestElevateWordId(String value) {
-        registerModifiedProperty("suggestElevateWordId");
-        this.suggestElevateWordId = value;
+    public void setElevateWordId(String value) {
+        registerModifiedProperty("elevateWordId");
+        this.elevateWordId = value;
     }
 
     public String getLabelTypeId() {

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java → src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.SuggestBadWord;
+import org.codelibs.fess.es.config.exentity.BadWord;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -32,19 +32,19 @@ import org.dbflute.util.DfTypeUtil;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestBadWordDbm extends AbstractDBMeta {
+public class BadWordDbm extends AbstractDBMeta {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
     // ===================================================================================
     //                                                                           Singleton
     //                                                                           =========
-    private static final SuggestBadWordDbm _instance = new SuggestBadWordDbm();
+    private static final BadWordDbm _instance = new BadWordDbm();
 
-    private SuggestBadWordDbm() {
+    private BadWordDbm() {
     }
 
-    public static SuggestBadWordDbm getInstance() {
+    public static BadWordDbm getInstance() {
         return _instance;
     }
 
@@ -79,20 +79,20 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedBy(),
-                (et, vl) -> ((SuggestBadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedTime(),
-                (et, vl) -> ((SuggestBadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getSuggestWord(),
-                (et, vl) -> ((SuggestBadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetLabel(),
-                (et, vl) -> ((SuggestBadWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetRole(),
-                (et, vl) -> ((SuggestBadWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getUpdatedBy(),
-                (et, vl) -> ((SuggestBadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getUpdatedTime(),
-                (et, vl) -> ((SuggestBadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et -> ((BadWord) et).getCreatedBy(), (et, vl) -> ((BadWord) et).setCreatedBy(DfTypeUtil.toString(vl)),
+                "createdBy");
+        setupEpg(_epgMap, et -> ((BadWord) et).getCreatedTime(), (et, vl) -> ((BadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)),
+                "createdTime");
+        setupEpg(_epgMap, et -> ((BadWord) et).getSuggestWord(), (et, vl) -> ((BadWord) et).setSuggestWord(DfTypeUtil.toString(vl)),
+                "suggestWord");
+        setupEpg(_epgMap, et -> ((BadWord) et).getTargetLabel(), (et, vl) -> ((BadWord) et).setTargetLabel(DfTypeUtil.toString(vl)),
+                "targetLabel");
+        setupEpg(_epgMap, et -> ((BadWord) et).getTargetRole(), (et, vl) -> ((BadWord) et).setTargetRole(DfTypeUtil.toString(vl)),
+                "targetRole");
+        setupEpg(_epgMap, et -> ((BadWord) et).getUpdatedBy(), (et, vl) -> ((BadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
+                "updatedBy");
+        setupEpg(_epgMap, et -> ((BadWord) et).getUpdatedTime(), (et, vl) -> ((BadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
+                "updatedTime");
     }
 
     @Override
@@ -103,9 +103,9 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                          Table Info
     //                                                                          ==========
-    protected final String _tableDbName = "suggest_bad_word";
-    protected final String _tableDispName = "suggest_bad_word";
-    protected final String _tablePropertyName = "SuggestBadWord";
+    protected final String _tableDbName = "bad_word";
+    protected final String _tableDispName = "bad_word";
+    protected final String _tablePropertyName = "BadWord";
 
     public String getTableDbName() {
         return _tableDbName;
@@ -207,17 +207,17 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.SuggestBadWord";
+        return "org.codelibs.fess.es.config.exentity.BadWord";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.SuggestBadWordCB";
+        return "org.codelibs.fess.es.config.cbean.BadWordCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.SuggestBadWordBhv";
+        return "org.codelibs.fess.es.config.exbhv.BadWordBhv";
     }
 
     // ===================================================================================
@@ -225,7 +225,7 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
     //                                                                         ===========
     @Override
     public Class<? extends Entity> getEntityType() {
-        return SuggestBadWord.class;
+        return BadWord.class;
     }
 
     // ===================================================================================
@@ -233,7 +233,7 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
     //                                                                     ===============
     @Override
     public Entity newEntity() {
-        return new SuggestBadWord();
+        return new BadWord();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java → src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -32,19 +32,19 @@ import org.dbflute.util.DfTypeUtil;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordDbm extends AbstractDBMeta {
+public class ElevateWordDbm extends AbstractDBMeta {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
     // ===================================================================================
     //                                                                           Singleton
     //                                                                           =========
-    private static final SuggestElevateWordDbm _instance = new SuggestElevateWordDbm();
+    private static final ElevateWordDbm _instance = new ElevateWordDbm();
 
-    private SuggestElevateWordDbm() {
+    private ElevateWordDbm() {
     }
 
-    public static SuggestElevateWordDbm getInstance() {
+    public static ElevateWordDbm getInstance() {
         return _instance;
     }
 
@@ -79,24 +79,23 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getBoost(),
-                (et, vl) -> ((SuggestElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedBy(),
-                (et, vl) -> ((SuggestElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedTime(),
-                (et, vl) -> ((SuggestElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getReading(),
-                (et, vl) -> ((SuggestElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getSuggestWord(),
-                (et, vl) -> ((SuggestElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getTargetLabel(),
-                (et, vl) -> ((SuggestElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getTargetRole(),
-                (et, vl) -> ((SuggestElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getUpdatedBy(),
-                (et, vl) -> ((SuggestElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getUpdatedTime(),
-                (et, vl) -> ((SuggestElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getBoost(), (et, vl) -> ((ElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getCreatedBy(), (et, vl) -> ((ElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)),
+                "createdBy");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getCreatedTime(), (et, vl) -> ((ElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)),
+                "createdTime");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getReading(), (et, vl) -> ((ElevateWord) et).setReading(DfTypeUtil.toString(vl)),
+                "reading");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getSuggestWord(),
+                (et, vl) -> ((ElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getTargetLabel(),
+                (et, vl) -> ((ElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getTargetRole(), (et, vl) -> ((ElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)),
+                "targetRole");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedBy(), (et, vl) -> ((ElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
+                "updatedBy");
+        setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedTime(), (et, vl) -> ((ElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
+                "updatedTime");
     }
 
     @Override
@@ -107,9 +106,9 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                          Table Info
     //                                                                          ==========
-    protected final String _tableDbName = "suggest_elevate_word";
-    protected final String _tableDispName = "suggest_elevate_word";
-    protected final String _tablePropertyName = "SuggestElevateWord";
+    protected final String _tableDbName = "elevate_word";
+    protected final String _tableDispName = "elevate_word";
+    protected final String _tablePropertyName = "ElevateWord";
 
     public String getTableDbName() {
         return _tableDbName;
@@ -225,17 +224,17 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.SuggestElevateWord";
+        return "org.codelibs.fess.es.config.exentity.ElevateWord";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.SuggestElevateWordCB";
+        return "org.codelibs.fess.es.config.cbean.ElevateWordCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv";
+        return "org.codelibs.fess.es.config.exbhv.ElevateWordBhv";
     }
 
     // ===================================================================================
@@ -243,7 +242,7 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
     //                                                                         ===========
     @Override
     public Class<? extends Entity> getEntityType() {
-        return SuggestElevateWord.class;
+        return ElevateWord.class;
     }
 
     // ===================================================================================
@@ -251,7 +250,7 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
     //                                                                     ===============
     @Override
     public Entity newEntity() {
-        return new SuggestElevateWord();
+        return new ElevateWord();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java → src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-import org.codelibs.fess.es.config.exentity.SuggestElevateWordToLabel;
+import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -32,19 +32,19 @@ import org.dbflute.util.DfTypeUtil;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
+public class ElevateWordToLabelDbm extends AbstractDBMeta {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
     // ===================================================================================
     //                                                                           Singleton
     //                                                                           =========
-    private static final SuggestElevateWordToLabelDbm _instance = new SuggestElevateWordToLabelDbm();
+    private static final ElevateWordToLabelDbm _instance = new ElevateWordToLabelDbm();
 
-    private SuggestElevateWordToLabelDbm() {
+    private ElevateWordToLabelDbm() {
     }
 
-    public static SuggestElevateWordToLabelDbm getInstance() {
+    public static ElevateWordToLabelDbm getInstance() {
         return _instance;
     }
 
@@ -79,10 +79,10 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((SuggestElevateWordToLabel) et).getSuggestElevateWordId(),
-                (et, vl) -> ((SuggestElevateWordToLabel) et).setSuggestElevateWordId(DfTypeUtil.toString(vl)), "suggestElevateWordId");
-        setupEpg(_epgMap, et -> ((SuggestElevateWordToLabel) et).getLabelTypeId(),
-                (et, vl) -> ((SuggestElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
+        setupEpg(_epgMap, et -> ((ElevateWordToLabel) et).getElevateWordId(),
+                (et, vl) -> ((ElevateWordToLabel) et).setElevateWordId(DfTypeUtil.toString(vl)), "elevateWordId");
+        setupEpg(_epgMap, et -> ((ElevateWordToLabel) et).getLabelTypeId(),
+                (et, vl) -> ((ElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
     }
 
     @Override
@@ -93,9 +93,9 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                          Table Info
     //                                                                          ==========
-    protected final String _tableDbName = "suggest_elevate_word_to_label";
-    protected final String _tableDispName = "suggest_elevate_word_to_label";
-    protected final String _tablePropertyName = "SuggestElevateWordToLabel";
+    protected final String _tableDbName = "elevate_word_to_label";
+    protected final String _tableDispName = "elevate_word_to_label";
+    protected final String _tablePropertyName = "ElevateWordToLabel";
 
     public String getTableDbName() {
         return _tableDbName;
@@ -119,13 +119,13 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnSuggestElevateWordId = cci("suggestElevateWordId", "suggestElevateWordId", null, null, String.class,
-            "suggestElevateWordId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId",
+            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnSuggestElevateWordId() {
-        return _columnSuggestElevateWordId;
+    public ColumnInfo columnElevateWordId() {
+        return _columnElevateWordId;
     }
 
     public ColumnInfo columnLabelTypeId() {
@@ -134,7 +134,7 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnSuggestElevateWordId());
+        ls.add(columnElevateWordId());
         ls.add(columnLabelTypeId());
         return ls;
     }
@@ -162,17 +162,17 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     //                                                                           =========
     @Override
     public String getEntityTypeName() {
-        return "org.codelibs.fess.es.config.exentity.SuggestElevateWordToLabel";
+        return "org.codelibs.fess.es.config.exentity.ElevateWordToLabel";
     }
 
     @Override
     public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.config.cbean.SuggestElevateWordToLabelCB";
+        return "org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB";
     }
 
     @Override
     public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.config.exbhv.SuggestElevateWordToLabelBhv";
+        return "org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv";
     }
 
     // ===================================================================================
@@ -180,7 +180,7 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     //                                                                         ===========
     @Override
     public Class<? extends Entity> getEntityType() {
-        return SuggestElevateWordToLabel.class;
+        return ElevateWordToLabel.class;
     }
 
     // ===================================================================================
@@ -188,7 +188,7 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta {
     //                                                                     ===============
     @Override
     public Entity newEntity() {
-        return new SuggestElevateWordToLabel();
+        return new ElevateWordToLabel();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/cbean/SuggestBadWordCB.java → src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsSuggestBadWordCB;
+import org.codelibs.fess.es.config.cbean.bs.BsBadWordCB;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestBadWordCB extends BsSuggestBadWordCB {
+public class BadWordCB extends BsBadWordCB {
 }

src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordToLabelCB.java → src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsSuggestElevateWordToLabelCB;
+import org.codelibs.fess.es.config.cbean.bs.BsElevateWordCB;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordToLabelCB extends BsSuggestElevateWordToLabelCB {
+public class ElevateWordCB extends BsElevateWordCB {
 }

src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordCB.java → src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean;
 
-import org.codelibs.fess.es.config.cbean.bs.BsSuggestElevateWordCB;
+import org.codelibs.fess.es.config.cbean.bs.BsElevateWordToLabelCB;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordCB extends BsSuggestElevateWordCB {
+public class ElevateWordToLabelCB extends BsElevateWordToLabelCB {
 }

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java → src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java

@@ -20,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestBadWordDbm;
-import org.codelibs.fess.es.config.cbean.SuggestBadWordCB;
-import org.codelibs.fess.es.config.cbean.cq.SuggestBadWordCQ;
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestBadWordCQ;
+import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
+import org.codelibs.fess.es.config.cbean.BadWordCB;
+import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
@@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestBadWordCB extends EsAbstractConditionBean {
+public class BsBadWordCB extends EsAbstractConditionBean {
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected BsSuggestBadWordCQ _conditionQuery;
+    protected BsBadWordCQ _conditionQuery;
     protected HpSpecification _specification;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
     @Override
-    public SuggestBadWordDbm asDBMeta() {
-        return SuggestBadWordDbm.getInstance();
+    public BadWordDbm asDBMeta() {
+        return BadWordDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_bad_word";
+        return "bad_word";
     }
 
     @Override
@@ -66,11 +66,11 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                         Primary Key
     //                                                                         ===========
-    public SuggestBadWordCB acceptPK(String id) {
+    public BadWordCB acceptPK(String id) {
         assertObjectNotNull("id", id);
-        BsSuggestBadWordCB cb = this;
+        BsBadWordCB cb = this;
         cb.query().docMeta().setId_Equal(id);
-        return (SuggestBadWordCB) this;
+        return (BadWordCB) this;
     }
 
     @Override
@@ -114,20 +114,20 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
-    public BsSuggestBadWordCQ query() {
+    public BsBadWordCQ query() {
         assertQueryPurpose();
         return doGetConditionQuery();
     }
 
-    protected BsSuggestBadWordCQ doGetConditionQuery() {
+    protected BsBadWordCQ doGetConditionQuery() {
         if (_conditionQuery == null) {
             _conditionQuery = createLocalCQ();
         }
         return _conditionQuery;
     }
 
-    protected BsSuggestBadWordCQ createLocalCQ() {
-        return new SuggestBadWordCQ();
+    protected BsBadWordCQ createLocalCQ() {
+        return new BadWordCQ();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java → src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java

@@ -20,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordDbm;
-import org.codelibs.fess.es.config.cbean.SuggestElevateWordCB;
-import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordCQ;
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestElevateWordCQ;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
+import org.codelibs.fess.es.config.cbean.ElevateWordCB;
+import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
@@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
+public class BsElevateWordCB extends EsAbstractConditionBean {
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected BsSuggestElevateWordCQ _conditionQuery;
+    protected BsElevateWordCQ _conditionQuery;
     protected HpSpecification _specification;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
     @Override
-    public SuggestElevateWordDbm asDBMeta() {
-        return SuggestElevateWordDbm.getInstance();
+    public ElevateWordDbm asDBMeta() {
+        return ElevateWordDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word";
+        return "elevate_word";
     }
 
     @Override
@@ -66,11 +66,11 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                         Primary Key
     //                                                                         ===========
-    public SuggestElevateWordCB acceptPK(String id) {
+    public ElevateWordCB acceptPK(String id) {
         assertObjectNotNull("id", id);
-        BsSuggestElevateWordCB cb = this;
+        BsElevateWordCB cb = this;
         cb.query().docMeta().setId_Equal(id);
-        return (SuggestElevateWordCB) this;
+        return (ElevateWordCB) this;
     }
 
     @Override
@@ -114,20 +114,20 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
-    public BsSuggestElevateWordCQ query() {
+    public BsElevateWordCQ query() {
         assertQueryPurpose();
         return doGetConditionQuery();
     }
 
-    protected BsSuggestElevateWordCQ doGetConditionQuery() {
+    protected BsElevateWordCQ doGetConditionQuery() {
         if (_conditionQuery == null) {
             _conditionQuery = createLocalCQ();
         }
         return _conditionQuery;
     }
 
-    protected BsSuggestElevateWordCQ createLocalCQ() {
-        return new SuggestElevateWordCQ();
+    protected BsElevateWordCQ createLocalCQ() {
+        return new ElevateWordCQ();
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java → src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java

@@ -20,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
-import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordToLabelDbm;
-import org.codelibs.fess.es.config.cbean.SuggestElevateWordToLabelCB;
-import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordToLabelCQ;
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestElevateWordToLabelCQ;
+import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
+import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
+import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
 import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
@@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean {
+public class BsElevateWordToLabelCB extends EsAbstractConditionBean {
 
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected BsSuggestElevateWordToLabelCQ _conditionQuery;
+    protected BsElevateWordToLabelCQ _conditionQuery;
     protected HpSpecification _specification;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
     @Override
-    public SuggestElevateWordToLabelDbm asDBMeta() {
-        return SuggestElevateWordToLabelDbm.getInstance();
+    public ElevateWordToLabelDbm asDBMeta() {
+        return ElevateWordToLabelDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word_to_label";
+        return "elevate_word_to_label";
     }
 
     @Override
@@ -66,11 +66,11 @@ public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                         Primary Key
     //                                                                         ===========
-    public SuggestElevateWordToLabelCB acceptPK(String id) {
+    public ElevateWordToLabelCB acceptPK(String id) {
         assertObjectNotNull("id", id);
-        BsSuggestElevateWordToLabelCB cb = this;
+        BsElevateWordToLabelCB cb = this;
         cb.query().docMeta().setId_Equal(id);
-        return (SuggestElevateWordToLabelCB) this;
+        return (ElevateWordToLabelCB) this;
     }
 
     @Override
@@ -114,20 +114,20 @@ public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
-    public BsSuggestElevateWordToLabelCQ query() {
+    public BsElevateWordToLabelCQ query() {
         assertQueryPurpose();
         return doGetConditionQuery();
     }
 
-    protected BsSuggestElevateWordToLabelCQ doGetConditionQuery() {
+    protected BsElevateWordToLabelCQ doGetConditionQuery() {
         if (_conditionQuery == null) {
             _conditionQuery = createLocalCQ();
         }
         return _conditionQuery;
     }
 
-    protected BsSuggestElevateWordToLabelCQ createLocalCQ() {
-        return new SuggestElevateWordToLabelCQ();
+    protected BsElevateWordToLabelCQ createLocalCQ() {
+        return new ElevateWordToLabelCQ();
     }
 
     // ===================================================================================
@@ -158,8 +158,8 @@ public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean {
             doColumn("_id");
         }
 
-        public void columnSuggestElevateWordId() {
-            doColumn("suggestElevateWordId");
+        public void columnElevateWordId() {
+            doColumn("elevateWordId");
         }
 
         public void columnLabelTypeId() {

src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestBadWordCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestBadWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestBadWordCQ extends BsSuggestBadWordCQ {
+public class BadWordCQ extends BsBadWordCQ {
 }

src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordToLabelCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestElevateWordToLabelCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordToLabelCQ extends BsSuggestElevateWordToLabelCQ {
+public class ElevateWordCQ extends BsElevateWordCQ {
 }

src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.es.config.cbean.cq;
 
-import org.codelibs.fess.es.config.cbean.cq.bs.BsSuggestElevateWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 
 /**
  * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordCQ extends BsSuggestElevateWordCQ {
+public class ElevateWordToLabelCQ extends BsElevateWordToLabelCQ {
 }

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.SuggestBadWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -36,7 +36,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
+public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
@@ -45,33 +45,33 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
     //                                                                       =============
     @Override
     public String asTableDbName() {
-        return "suggest_bad_word";
+        return "bad_word";
     }
 
     @Override
     public String xgetAliasName() {
-        return "suggest_bad_word";
+        return "bad_word";
     }
 
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCQ> filteredLambda) {
+    public void filtered(FilteredCall<BadWordCQ, BadWordCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+    public void filtered(FilteredCall<BadWordCQ, BadWordCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
         bool((must, should, mustNot, filter) -> {
             filteredLambda.callback(must, filter);
         }, opLambda);
     }
 
-    public void not(OperatorCall<SuggestBadWordCQ> notLambda) {
+    public void not(OperatorCall<BadWordCQ> notLambda) {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<SuggestBadWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        SuggestBadWordCQ notQuery = new SuggestBadWordCQ();
+    public void not(OperatorCall<BadWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        BadWordCQ notQuery = new BadWordCQ();
         notLambda.callback(notQuery);
         if (notQuery.hasQueries()) {
             if (notQuery.getQueryBuilderList().size() > 1) {
@@ -85,15 +85,15 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public void bool(BoolCall<SuggestBadWordCQ> boolLambda) {
+    public void bool(BoolCall<BadWordCQ> boolLambda) {
         bool(boolLambda, null);
     }
 
-    public void bool(BoolCall<SuggestBadWordCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        SuggestBadWordCQ mustQuery = new SuggestBadWordCQ();
-        SuggestBadWordCQ shouldQuery = new SuggestBadWordCQ();
-        SuggestBadWordCQ mustNotQuery = new SuggestBadWordCQ();
-        SuggestBadWordCQ filterQuery = new SuggestBadWordCQ();
+    public void bool(BoolCall<BadWordCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        BadWordCQ mustQuery = new BadWordCQ();
+        BadWordCQ shouldQuery = new BadWordCQ();
+        BadWordCQ mustNotQuery = new BadWordCQ();
+        BadWordCQ filterQuery = new BadWordCQ();
         boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
         if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
             BoolQueryBuilder builder =
@@ -165,12 +165,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         setId_Terms(idList, opLambda);
     }
 
-    public BsSuggestBadWordCQ addOrderBy_Id_Asc() {
+    public BsBadWordCQ addOrderBy_Id_Asc() {
         regOBA("_id");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_Id_Desc() {
+    public BsBadWordCQ addOrderBy_Id_Desc() {
         regOBD("_id");
         return this;
     }
@@ -331,12 +331,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_CreatedBy_Asc() {
+    public BsBadWordCQ addOrderBy_CreatedBy_Asc() {
         regOBA("createdBy");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_CreatedBy_Desc() {
+    public BsBadWordCQ addOrderBy_CreatedBy_Desc() {
         regOBD("createdBy");
         return this;
     }
@@ -486,12 +486,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_CreatedTime_Asc() {
+    public BsBadWordCQ addOrderBy_CreatedTime_Asc() {
         regOBA("createdTime");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_CreatedTime_Desc() {
+    public BsBadWordCQ addOrderBy_CreatedTime_Desc() {
         regOBD("createdTime");
         return this;
     }
@@ -652,12 +652,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_SuggestWord_Asc() {
+    public BsBadWordCQ addOrderBy_SuggestWord_Asc() {
         regOBA("suggestWord");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_SuggestWord_Desc() {
+    public BsBadWordCQ addOrderBy_SuggestWord_Desc() {
         regOBD("suggestWord");
         return this;
     }
@@ -818,12 +818,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_TargetLabel_Asc() {
+    public BsBadWordCQ addOrderBy_TargetLabel_Asc() {
         regOBA("targetLabel");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_TargetLabel_Desc() {
+    public BsBadWordCQ addOrderBy_TargetLabel_Desc() {
         regOBD("targetLabel");
         return this;
     }
@@ -984,12 +984,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_TargetRole_Asc() {
+    public BsBadWordCQ addOrderBy_TargetRole_Asc() {
         regOBA("targetRole");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_TargetRole_Desc() {
+    public BsBadWordCQ addOrderBy_TargetRole_Desc() {
         regOBD("targetRole");
         return this;
     }
@@ -1150,12 +1150,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_UpdatedBy_Asc() {
+    public BsBadWordCQ addOrderBy_UpdatedBy_Asc() {
         regOBA("updatedBy");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_UpdatedBy_Desc() {
+    public BsBadWordCQ addOrderBy_UpdatedBy_Desc() {
         regOBD("updatedBy");
         return this;
     }
@@ -1305,12 +1305,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestBadWordCQ addOrderBy_UpdatedTime_Asc() {
+    public BsBadWordCQ addOrderBy_UpdatedTime_Asc() {
         regOBA("updatedTime");
         return this;
     }
 
-    public BsSuggestBadWordCQ addOrderBy_UpdatedTime_Desc() {
+    public BsBadWordCQ addOrderBy_UpdatedTime_Desc() {
         regOBD("updatedTime");
         return this;
     }

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordCQ;
+import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -36,7 +36,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
+public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
@@ -45,34 +45,33 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
     //                                                                       =============
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word";
+        return "elevate_word";
     }
 
     @Override
     public String xgetAliasName() {
-        return "suggest_elevate_word";
+        return "elevate_word";
     }
 
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCQ> filteredLambda) {
+    public void filtered(FilteredCall<ElevateWordCQ, ElevateWordCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCQ> filteredLambda,
-            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+    public void filtered(FilteredCall<ElevateWordCQ, ElevateWordCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
         bool((must, should, mustNot, filter) -> {
             filteredLambda.callback(must, filter);
         }, opLambda);
     }
 
-    public void not(OperatorCall<SuggestElevateWordCQ> notLambda) {
+    public void not(OperatorCall<ElevateWordCQ> notLambda) {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<SuggestElevateWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        SuggestElevateWordCQ notQuery = new SuggestElevateWordCQ();
+    public void not(OperatorCall<ElevateWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        ElevateWordCQ notQuery = new ElevateWordCQ();
         notLambda.callback(notQuery);
         if (notQuery.hasQueries()) {
             if (notQuery.getQueryBuilderList().size() > 1) {
@@ -86,15 +85,15 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public void bool(BoolCall<SuggestElevateWordCQ> boolLambda) {
+    public void bool(BoolCall<ElevateWordCQ> boolLambda) {
         bool(boolLambda, null);
     }
 
-    public void bool(BoolCall<SuggestElevateWordCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        SuggestElevateWordCQ mustQuery = new SuggestElevateWordCQ();
-        SuggestElevateWordCQ shouldQuery = new SuggestElevateWordCQ();
-        SuggestElevateWordCQ mustNotQuery = new SuggestElevateWordCQ();
-        SuggestElevateWordCQ filterQuery = new SuggestElevateWordCQ();
+    public void bool(BoolCall<ElevateWordCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        ElevateWordCQ mustQuery = new ElevateWordCQ();
+        ElevateWordCQ shouldQuery = new ElevateWordCQ();
+        ElevateWordCQ mustNotQuery = new ElevateWordCQ();
+        ElevateWordCQ filterQuery = new ElevateWordCQ();
         boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
         if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
             BoolQueryBuilder builder =
@@ -166,12 +165,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         setId_Terms(idList, opLambda);
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Id_Asc() {
+    public BsElevateWordCQ addOrderBy_Id_Asc() {
         regOBA("_id");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Id_Desc() {
+    public BsElevateWordCQ addOrderBy_Id_Desc() {
         regOBD("_id");
         return this;
     }
@@ -321,12 +320,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Boost_Asc() {
+    public BsElevateWordCQ addOrderBy_Boost_Asc() {
         regOBA("boost");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Boost_Desc() {
+    public BsElevateWordCQ addOrderBy_Boost_Desc() {
         regOBD("boost");
         return this;
     }
@@ -487,12 +486,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_CreatedBy_Asc() {
+    public BsElevateWordCQ addOrderBy_CreatedBy_Asc() {
         regOBA("createdBy");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_CreatedBy_Desc() {
+    public BsElevateWordCQ addOrderBy_CreatedBy_Desc() {
         regOBD("createdBy");
         return this;
     }
@@ -642,12 +641,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_CreatedTime_Asc() {
+    public BsElevateWordCQ addOrderBy_CreatedTime_Asc() {
         regOBA("createdTime");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_CreatedTime_Desc() {
+    public BsElevateWordCQ addOrderBy_CreatedTime_Desc() {
         regOBD("createdTime");
         return this;
     }
@@ -808,12 +807,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Reading_Asc() {
+    public BsElevateWordCQ addOrderBy_Reading_Asc() {
         regOBA("reading");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Reading_Desc() {
+    public BsElevateWordCQ addOrderBy_Reading_Desc() {
         regOBD("reading");
         return this;
     }
@@ -974,12 +973,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_SuggestWord_Asc() {
+    public BsElevateWordCQ addOrderBy_SuggestWord_Asc() {
         regOBA("suggestWord");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_SuggestWord_Desc() {
+    public BsElevateWordCQ addOrderBy_SuggestWord_Desc() {
         regOBD("suggestWord");
         return this;
     }
@@ -1140,12 +1139,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_TargetLabel_Asc() {
+    public BsElevateWordCQ addOrderBy_TargetLabel_Asc() {
         regOBA("targetLabel");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_TargetLabel_Desc() {
+    public BsElevateWordCQ addOrderBy_TargetLabel_Desc() {
         regOBD("targetLabel");
         return this;
     }
@@ -1306,12 +1305,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_TargetRole_Asc() {
+    public BsElevateWordCQ addOrderBy_TargetRole_Asc() {
         regOBA("targetRole");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_TargetRole_Desc() {
+    public BsElevateWordCQ addOrderBy_TargetRole_Desc() {
         regOBD("targetRole");
         return this;
     }
@@ -1472,12 +1471,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_UpdatedBy_Asc() {
+    public BsElevateWordCQ addOrderBy_UpdatedBy_Asc() {
         regOBA("updatedBy");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_UpdatedBy_Desc() {
+    public BsElevateWordCQ addOrderBy_UpdatedBy_Desc() {
         regOBD("updatedBy");
         return this;
     }
@@ -1627,12 +1626,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_UpdatedTime_Asc() {
+    public BsElevateWordCQ addOrderBy_UpdatedTime_Asc() {
         regOBA("updatedTime");
         return this;
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_UpdatedTime_Desc() {
+    public BsElevateWordCQ addOrderBy_UpdatedTime_Desc() {
         regOBD("updatedTime");
         return this;
     }

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java → src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordToLabelCQ;
+import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
 import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -36,7 +36,7 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 /**
  * @author ESFlute (using FreeGen)
  */
-public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQuery {
+public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
 
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
@@ -45,34 +45,34 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ
     //                                                                       =============
     @Override
     public String asTableDbName() {
-        return "suggest_elevate_word_to_label";
+        return "elevate_word_to_label";
     }
 
     @Override
     public String xgetAliasName() {
-        return "suggest_elevate_word_to_label";
+        return "elevate_word_to_label";
     }
 
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SuggestElevateWordToLabelCQ, SuggestElevateWordToLabelCQ> filteredLambda) {
+    public void filtered(FilteredCall<ElevateWordToLabelCQ, ElevateWordToLabelCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SuggestElevateWordToLabelCQ, SuggestElevateWordToLabelCQ> filteredLambda,
+    public void filtered(FilteredCall<ElevateWordToLabelCQ, ElevateWordToLabelCQ> filteredLambda,
             ConditionOptionCall<BoolQueryBuilder> opLambda) {
         bool((must, should, mustNot, filter) -> {
             filteredLambda.callback(must, filter);
         }, opLambda);
     }
 
-    public void not(OperatorCall<SuggestElevateWordToLabelCQ> notLambda) {
+    public void not(OperatorCall<ElevateWordToLabelCQ> notLambda) {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<SuggestElevateWordToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        SuggestElevateWordToLabelCQ notQuery = new SuggestElevateWordToLabelCQ();
+    public void not(OperatorCall<ElevateWordToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        ElevateWordToLabelCQ notQuery = new ElevateWordToLabelCQ();
         notLambda.callback(notQuery);
         if (notQuery.hasQueries()) {
             if (notQuery.getQueryBuilderList().size() > 1) {
@@ -86,15 +86,15 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ
         }
     }
 
-    public void bool(BoolCall<SuggestElevateWordToLabelCQ> boolLambda) {
+    public void bool(BoolCall<ElevateWordToLabelCQ> boolLambda) {
         bool(boolLambda, null);
     }
 
-    public void bool(BoolCall<SuggestElevateWordToLabelCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        SuggestElevateWordToLabelCQ mustQuery = new SuggestElevateWordToLabelCQ();
-        SuggestElevateWordToLabelCQ shouldQuery = new SuggestElevateWordToLabelCQ();
-        SuggestElevateWordToLabelCQ mustNotQuery = new SuggestElevateWordToLabelCQ();
-        SuggestElevateWordToLabelCQ filterQuery = new SuggestElevateWordToLabelCQ();
+    public void bool(BoolCall<ElevateWordToLabelCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        ElevateWordToLabelCQ mustQuery = new ElevateWordToLabelCQ();
+        ElevateWordToLabelCQ shouldQuery = new ElevateWordToLabelCQ();
+        ElevateWordToLabelCQ mustNotQuery = new ElevateWordToLabelCQ();
+        ElevateWordToLabelCQ filterQuery = new ElevateWordToLabelCQ();
         boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
         if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
             BoolQueryBuilder builder =
@@ -166,179 +166,179 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ
         setId_Terms(idList, opLambda);
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_Id_Asc() {
+    public BsElevateWordToLabelCQ addOrderBy_Id_Asc() {
         regOBA("_id");
         return this;
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_Id_Desc() {
+    public BsElevateWordToLabelCQ addOrderBy_Id_Desc() {
         regOBD("_id");
         return this;
     }
 
-    public void setSuggestElevateWordId_Equal(String suggestElevateWordId) {
-        setSuggestElevateWordId_Term(suggestElevateWordId, null);
+    public void setElevateWordId_Equal(String elevateWordId) {
+        setElevateWordId_Term(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_Equal(String suggestElevateWordId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setSuggestElevateWordId_Term(suggestElevateWordId, opLambda);
+    public void setElevateWordId_Equal(String elevateWordId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setElevateWordId_Term(elevateWordId, opLambda);
     }
 
-    public void setSuggestElevateWordId_Term(String suggestElevateWordId) {
-        setSuggestElevateWordId_Term(suggestElevateWordId, null);
+    public void setElevateWordId_Term(String elevateWordId) {
+        setElevateWordId_Term(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_Term(String suggestElevateWordId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_Term(String elevateWordId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_NotEqual(String suggestElevateWordId) {
-        setSuggestElevateWordId_NotTerm(suggestElevateWordId, null);
+    public void setElevateWordId_NotEqual(String elevateWordId) {
+        setElevateWordId_NotTerm(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_NotEqual(String suggestElevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSuggestElevateWordId_NotTerm(suggestElevateWordId, opLambda);
+    public void setElevateWordId_NotEqual(String elevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setElevateWordId_NotTerm(elevateWordId, opLambda);
     }
 
-    public void setSuggestElevateWordId_NotTerm(String suggestElevateWordId) {
-        setSuggestElevateWordId_NotTerm(suggestElevateWordId, null);
+    public void setElevateWordId_NotTerm(String elevateWordId) {
+        setElevateWordId_NotTerm(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_NotTerm(String suggestElevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestElevateWordId", suggestElevateWordId));
+    public void setElevateWordId_NotTerm(String elevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("elevateWordId", elevateWordId));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_Terms(Collection<String> suggestElevateWordIdList) {
-        setSuggestElevateWordId_Terms(suggestElevateWordIdList, null);
+    public void setElevateWordId_Terms(Collection<String> elevateWordIdList) {
+        setElevateWordId_Terms(elevateWordIdList, null);
     }
 
-    public void setSuggestElevateWordId_Terms(Collection<String> suggestElevateWordIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("suggestElevateWordId", suggestElevateWordIdList);
+    public void setElevateWordId_Terms(Collection<String> elevateWordIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("elevateWordId", elevateWordIdList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_InScope(Collection<String> suggestElevateWordIdList) {
-        setSuggestElevateWordId_Terms(suggestElevateWordIdList, null);
+    public void setElevateWordId_InScope(Collection<String> elevateWordIdList) {
+        setElevateWordId_Terms(elevateWordIdList, null);
     }
 
-    public void setSuggestElevateWordId_InScope(Collection<String> suggestElevateWordIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setSuggestElevateWordId_Terms(suggestElevateWordIdList, opLambda);
+    public void setElevateWordId_InScope(Collection<String> elevateWordIdList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setElevateWordId_Terms(elevateWordIdList, opLambda);
     }
 
-    public void setSuggestElevateWordId_Match(String suggestElevateWordId) {
-        setSuggestElevateWordId_Match(suggestElevateWordId, null);
+    public void setElevateWordId_Match(String elevateWordId) {
+        setElevateWordId_Match(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_Match(String suggestElevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_Match(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_MatchPhrase(String suggestElevateWordId) {
-        setSuggestElevateWordId_MatchPhrase(suggestElevateWordId, null);
+    public void setElevateWordId_MatchPhrase(String elevateWordId) {
+        setElevateWordId_MatchPhrase(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_MatchPhrase(String suggestElevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_MatchPhrase(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhraseQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_MatchPhrasePrefix(String suggestElevateWordId) {
-        setSuggestElevateWordId_MatchPhrasePrefix(suggestElevateWordId, null);
+    public void setElevateWordId_MatchPhrasePrefix(String elevateWordId) {
+        setElevateWordId_MatchPhrasePrefix(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_MatchPhrasePrefix(String suggestElevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_MatchPhrasePrefix(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhrasePrefixQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_Fuzzy(String suggestElevateWordId) {
-        setSuggestElevateWordId_Fuzzy(suggestElevateWordId, null);
+    public void setElevateWordId_Fuzzy(String elevateWordId) {
+        setElevateWordId_Fuzzy(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_Fuzzy(String suggestElevateWordId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_Fuzzy(String elevateWordId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
+        FuzzyQueryBuilder builder = regFuzzyQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_Prefix(String suggestElevateWordId) {
-        setSuggestElevateWordId_Prefix(suggestElevateWordId, null);
+    public void setElevateWordId_Prefix(String elevateWordId) {
+        setElevateWordId_Prefix(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_Prefix(String suggestElevateWordId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("suggestElevateWordId", suggestElevateWordId);
+    public void setElevateWordId_Prefix(String elevateWordId, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_GreaterThan(String suggestElevateWordId) {
-        setSuggestElevateWordId_GreaterThan(suggestElevateWordId, null);
+    public void setElevateWordId_GreaterThan(String elevateWordId) {
+        setElevateWordId_GreaterThan(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_GreaterThan(String suggestElevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_GREATER_THAN, suggestElevateWordId);
+    public void setElevateWordId_GreaterThan(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_THAN, elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_LessThan(String suggestElevateWordId) {
-        setSuggestElevateWordId_LessThan(suggestElevateWordId, null);
+    public void setElevateWordId_LessThan(String elevateWordId) {
+        setElevateWordId_LessThan(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_LessThan(String suggestElevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_LESS_THAN, suggestElevateWordId);
+    public void setElevateWordId_LessThan(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_THAN, elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_GreaterEqual(String suggestElevateWordId) {
-        setSuggestElevateWordId_GreaterEqual(suggestElevateWordId, null);
+    public void setElevateWordId_GreaterEqual(String elevateWordId) {
+        setElevateWordId_GreaterEqual(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_GreaterEqual(String suggestElevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_GREATER_EQUAL, suggestElevateWordId);
+    public void setElevateWordId_GreaterEqual(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_EQUAL, elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setSuggestElevateWordId_LessEqual(String suggestElevateWordId) {
-        setSuggestElevateWordId_LessEqual(suggestElevateWordId, null);
+    public void setElevateWordId_LessEqual(String elevateWordId) {
+        setElevateWordId_LessEqual(elevateWordId, null);
     }
 
-    public void setSuggestElevateWordId_LessEqual(String suggestElevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_LESS_EQUAL, suggestElevateWordId);
+    public void setElevateWordId_LessEqual(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_EQUAL, elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_SuggestElevateWordId_Asc() {
-        regOBA("suggestElevateWordId");
+    public BsElevateWordToLabelCQ addOrderBy_ElevateWordId_Asc() {
+        regOBA("elevateWordId");
         return this;
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_SuggestElevateWordId_Desc() {
-        regOBD("suggestElevateWordId");
+    public BsElevateWordToLabelCQ addOrderBy_ElevateWordId_Desc() {
+        regOBD("elevateWordId");
         return this;
     }
 
@@ -498,12 +498,12 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ
         }
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_LabelTypeId_Asc() {
+    public BsElevateWordToLabelCQ addOrderBy_LabelTypeId_Asc() {
         regOBA("labelTypeId");
         return this;
     }
 
-    public BsSuggestElevateWordToLabelCQ addOrderBy_LabelTypeId_Desc() {
+    public BsElevateWordToLabelCQ addOrderBy_LabelTypeId_Desc() {
         regOBD("labelTypeId");
         return this;
     }

src/main/java/org/codelibs/fess/es/config/exbhv/SuggestBadWordBhv.java → src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.es.config.exbhv;
 
-import org.codelibs.fess.es.config.bsbhv.BsSuggestBadWordBhv;
+import org.codelibs.fess.es.config.bsbhv.BsBadWordBhv;
 
 /**
  * @author FreeGen
  */
-public class SuggestBadWordBhv extends BsSuggestBadWordBhv {
+public class BadWordBhv extends BsBadWordBhv {
 
 }

src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordToLabelBhv.java → src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.es.config.exbhv;
 
-import org.codelibs.fess.es.config.bsbhv.BsSuggestElevateWordToLabelBhv;
+import org.codelibs.fess.es.config.bsbhv.BsElevateWordBhv;
 
 /**
  * @author FreeGen
  */
-public class SuggestElevateWordToLabelBhv extends BsSuggestElevateWordToLabelBhv {
+public class ElevateWordBhv extends BsElevateWordBhv {
 
 }

src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordBhv.java → src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.es.config.exbhv;
 
-import org.codelibs.fess.es.config.bsbhv.BsSuggestElevateWordBhv;
+import org.codelibs.fess.es.config.bsbhv.BsElevateWordToLabelBhv;
 
 /**
  * @author FreeGen
  */
-public class SuggestElevateWordBhv extends BsSuggestElevateWordBhv {
+public class ElevateWordToLabelBhv extends BsElevateWordToLabelBhv {
 
 }

src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java → src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.es.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsSuggestBadWord;
+import org.codelibs.fess.es.config.bsentity.BsBadWord;
 
 /**
- * @author FreeGen
+ * @author ESFlute (using FreeGen)
  */
-public class SuggestBadWord extends BsSuggestBadWord {
+public class BadWord extends BsBadWord {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java → src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java

@@ -20,16 +20,16 @@ import java.util.Collections;
 import java.util.List;
 
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.es.config.bsentity.BsSuggestElevateWord;
+import org.codelibs.fess.es.config.bsentity.BsElevateWord;
 import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
 import org.codelibs.fess.es.config.exbhv.WebConfigToLabelBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 
 /**
- * @author FreeGen
+ * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWord extends BsSuggestElevateWord {
+public class ElevateWord extends BsElevateWord {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWordToLabel.java → src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.es.config.exentity;
 
-import org.codelibs.fess.es.config.bsentity.BsSuggestElevateWordToLabel;
+import org.codelibs.fess.es.config.bsentity.BsElevateWordToLabel;
 
 /**
- * @author FreeGen
+ * @author ESFlute (using FreeGen)
  */
-public class SuggestElevateWordToLabel extends BsSuggestElevateWordToLabel {
+public class ElevateWordToLabel extends BsElevateWordToLabel {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/org/codelibs/fess/helper/SuggestHelper.java

@@ -29,16 +29,15 @@ import javax.annotation.Resource;
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.es.client.FessEsClient;
-import org.codelibs.fess.es.config.exbhv.SuggestBadWordBhv;
-import org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv;
-import org.codelibs.fess.es.config.exentity.SuggestBadWord;
-import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
+import org.codelibs.fess.es.config.exbhv.BadWordBhv;
+import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.es.config.exentity.BadWord;
+import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.es.log.exentity.SearchFieldLog;
 import org.codelibs.fess.es.log.exentity.SearchLog;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.suggest.Suggester;
 import org.codelibs.fess.suggest.constants.FieldNames;
-import org.codelibs.fess.suggest.entity.ElevateWord;
 import org.codelibs.fess.suggest.entity.SuggestItem;
 import org.codelibs.fess.suggest.index.contents.document.DocumentReader;
 import org.codelibs.fess.suggest.index.contents.document.ESSourceReader;
@@ -54,10 +53,10 @@ public class SuggestHelper {
     private static final Logger logger = LoggerFactory.getLogger(SuggestHelper.class);
 
     @Resource
-    protected SuggestElevateWordBhv suggestElevateWordBhv;
+    protected ElevateWordBhv elevateWordBhv;
 
     @Resource
-    protected SuggestBadWordBhv suggestBadWordBhv;
+    protected BadWordBhv badWordBhv;
 
     @Resource
     protected FessEsClient fessEsClient;
@@ -171,11 +170,11 @@ public class SuggestHelper {
     public void storeAllElevateWords() {
         deleteAllBadWords();
 
-        final List<SuggestElevateWord> list = suggestElevateWordBhv.selectList(cb -> {
+        final List<ElevateWord> list = elevateWordBhv.selectList(cb -> {
             cb.query().matchAll();
         });
 
-        for (final SuggestElevateWord elevateWord : list) {
+        for (final ElevateWord elevateWord : list) {
             addElevateWord(elevateWord.getSuggestWord(), elevateWord.getReading(), elevateWord.getLabelTypeValues(),
                     elevateWord.getTargetRole(), elevateWord.getBoost(), false);
         }
@@ -183,11 +182,11 @@ public class SuggestHelper {
     }
 
     public void deleteAllElevateWord() {
-        final List<SuggestElevateWord> list = suggestElevateWordBhv.selectList(cb -> {
+        final List<ElevateWord> list = elevateWordBhv.selectList(cb -> {
             cb.query().matchAll();
         });
 
-        for (final SuggestElevateWord elevateWord : list) {
+        for (final ElevateWord elevateWord : list) {
             suggester.indexer().deleteElevateWord(elevateWord.getSuggestWord());
         }
         suggester.refresh();
@@ -217,7 +216,8 @@ public class SuggestHelper {
         }
 
         suggester.indexer().addElevateWord(
-                new ElevateWord(word, boost, Collections.singletonList(reading), Arrays.asList(contentFieldNames), labelList, roleList));
+                new org.codelibs.fess.suggest.entity.ElevateWord(word, boost, Collections.singletonList(reading), Arrays
+                        .asList(contentFieldNames), labelList, roleList));
     }
 
     public void deleteAllBadWords() {
@@ -226,11 +226,11 @@ public class SuggestHelper {
 
     public void storeAllBadWords() {
         deleteAllBadWords();
-        final List<SuggestBadWord> list = suggestBadWordBhv.selectList(cb -> {
+        final List<BadWord> list = badWordBhv.selectList(cb -> {
             cb.query().matchAll();
         });
-        for (final SuggestBadWord suggestBadWord : list) {
-            final String word = suggestBadWord.getSuggestWord();
+        for (final BadWord badWord : list) {
+            final String word = badWord.getSuggestWord();
             suggester.indexer().addBadWord(word);
         }
     }

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -504,10 +504,10 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_USER_DICT_FILE = "{labels.userDictFile}";
 
     /** The key of the message: Additional Word File */
-    public static final String LABELS_SUGGEST_ELEVATE_WORD_FILE = "{labels.suggestElevateWordFile}";
+    public static final String LABELS_SUGGEST_ELEVATE_WORD_FILE = "{labels.elevateWordFile}";
 
     /** The key of the message: Bad Word File */
-    public static final String LABELS_SUGGEST_BAD_WORD_FILE = "{labels.suggestBadWordFile}";
+    public static final String LABELS_BAD_WORD_FILE = "{labels.badWordFile}";
 
     /** The key of the message: System */
     public static final String LABELS_menu_system = "{labels.menu_system}";
@@ -585,10 +585,10 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_menu_suggest = "{labels.menu_suggest}";
 
     /** The key of the message: Additional Word */
-    public static final String LABELS_menu_suggest_elevate_word = "{labels.menu_suggest_elevate_word}";
+    public static final String LABELS_menu_elevate_word = "{labels.menu_elevate_word}";
 
     /** The key of the message: Bad Word */
-    public static final String LABELS_menu_suggest_bad_word = "{labels.menu_suggest_bad_word}";
+    public static final String LABELS_menu_bad_word = "{labels.menu_bad_word}";
 
     /** The key of the message: System Info */
     public static final String LABELS_menu_system_log = "{labels.menu_system_log}";
@@ -1783,97 +1783,97 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_boost_document_rule_sort_order = "{labels.boost_document_rule_sort_order}";
 
     /** The key of the message: Additional Word */
-    public static final String LABELS_suggest_elevate_word_configuration = "{labels.suggest_elevate_word_configuration}";
+    public static final String LABELS_elevate_word_configuration = "{labels.elevate_word_configuration}";
 
     /** The key of the message: Additional Word */
-    public static final String LABELS_suggest_elevate_word_title_details = "{labels.suggest_elevate_word_title_details}";
+    public static final String LABELS_elevate_word_title_details = "{labels.elevate_word_title_details}";
 
     /** The key of the message: List */
-    public static final String LABELS_suggest_elevate_word_link_list = "{labels.suggest_elevate_word_link_list}";
+    public static final String LABELS_elevate_word_link_list = "{labels.elevate_word_link_list}";
 
     /** The key of the message: Create New */
-    public static final String LABELS_suggest_elevate_word_link_create = "{labels.suggest_elevate_word_link_create}";
+    public static final String LABELS_elevate_word_link_create = "{labels.elevate_word_link_create}";
 
     /** The key of the message: Edit */
-    public static final String LABELS_suggest_elevate_word_link_edit = "{labels.suggest_elevate_word_link_edit}";
+    public static final String LABELS_elevate_word_link_edit = "{labels.elevate_word_link_edit}";
 
     /** The key of the message: Delete */
-    public static final String LABELS_suggest_elevate_word_link_delete = "{labels.suggest_elevate_word_link_delete}";
+    public static final String LABELS_elevate_word_link_delete = "{labels.elevate_word_link_delete}";
 
     /** The key of the message: Details */
-    public static final String LABELS_suggest_elevate_word_link_details = "{labels.suggest_elevate_word_link_details}";
+    public static final String LABELS_elevate_word_link_details = "{labels.elevate_word_link_details}";
 
     /** The key of the message: Download */
-    public static final String LABELS_suggest_elevate_word_link_download = "{labels.suggest_elevate_word_link_download}";
+    public static final String LABELS_elevate_word_link_download = "{labels.elevate_word_link_download}";
 
     /** The key of the message: Upload */
-    public static final String LABELS_suggest_elevate_word_link_upload = "{labels.suggest_elevate_word_link_upload}";
+    public static final String LABELS_elevate_word_link_upload = "{labels.elevate_word_link_upload}";
 
     /** The key of the message: Download */
-    public static final String LABELS_suggest_elevate_word_button_download = "{labels.suggest_elevate_word_button_download}";
+    public static final String LABELS_elevate_word_button_download = "{labels.elevate_word_button_download}";
 
     /** The key of the message: Upload */
-    public static final String LABELS_suggest_elevate_word_button_upload = "{labels.suggest_elevate_word_button_upload}";
+    public static final String LABELS_elevate_word_button_upload = "{labels.elevate_word_button_upload}";
 
     /** The key of the message: Word */
-    public static final String LABELS_suggest_elevate_word_list_suggest_word = "{labels.suggest_elevate_word_list_suggest_word}";
+    public static final String LABELS_elevate_word_list_suggest_word = "{labels.elevate_word_list_suggest_word}";
 
     /** The key of the message: Word */
-    public static final String LABELS_suggest_elevate_word_suggest_word = "{labels.suggest_elevate_word_suggest_word}";
+    public static final String LABELS_elevate_word_suggest_word = "{labels.elevate_word_suggest_word}";
 
     /** The key of the message: Reading */
-    public static final String LABELS_suggest_elevate_word_reading = "{labels.suggest_elevate_word_reading}";
+    public static final String LABELS_elevate_word_reading = "{labels.elevate_word_reading}";
 
     /** The key of the message: Role */
-    public static final String LABELS_suggest_elevate_word_target_role = "{labels.suggest_elevate_word_target_role}";
+    public static final String LABELS_elevate_word_target_role = "{labels.elevate_word_target_role}";
 
     /** The key of the message: Boost */
-    public static final String LABELS_suggest_elevate_word_boost = "{labels.suggest_elevate_word_boost}";
+    public static final String LABELS_elevate_word_boost = "{labels.elevate_word_boost}";
 
     /** The key of the message: Additional Word File */
-    public static final String LABELS_suggest_elevate_word_file = "{labels.suggest_elevate_word_file}";
+    public static final String LABELS_elevate_word_file = "{labels.elevate_word_file}";
 
     /** The key of the message: Bad Word */
-    public static final String LABELS_suggest_bad_word_configuration = "{labels.suggest_bad_word_configuration}";
+    public static final String LABELS_bad_word_configuration = "{labels.bad_word_configuration}";
 
     /** The key of the message: Bad Word */
-    public static final String LABELS_suggest_bad_word_title_details = "{labels.suggest_bad_word_title_details}";
+    public static final String LABELS_bad_word_title_details = "{labels.bad_word_title_details}";
 
     /** The key of the message: List */
-    public static final String LABELS_suggest_bad_word_link_list = "{labels.suggest_bad_word_link_list}";
+    public static final String LABELS_bad_word_link_list = "{labels.bad_word_link_list}";
 
     /** The key of the message: Create New */
-    public static final String LABELS_suggest_bad_word_link_create = "{labels.suggest_bad_word_link_create}";
+    public static final String LABELS_bad_word_link_create = "{labels.bad_word_link_create}";
 
     /** The key of the message: Edit */
-    public static final String LABELS_suggest_bad_word_link_edit = "{labels.suggest_bad_word_link_edit}";
+    public static final String LABELS_bad_word_link_edit = "{labels.bad_word_link_edit}";
 
     /** The key of the message: Delete */
-    public static final String LABELS_suggest_bad_word_link_delete = "{labels.suggest_bad_word_link_delete}";
+    public static final String LABELS_bad_word_link_delete = "{labels.bad_word_link_delete}";
 
     /** The key of the message: Details */
-    public static final String LABELS_suggest_bad_word_link_details = "{labels.suggest_bad_word_link_details}";
+    public static final String LABELS_bad_word_link_details = "{labels.bad_word_link_details}";
 
     /** The key of the message: Download */
-    public static final String LABELS_suggest_bad_word_link_download = "{labels.suggest_bad_word_link_download}";
+    public static final String LABELS_bad_word_link_download = "{labels.bad_word_link_download}";
 
     /** The key of the message: Upload */
-    public static final String LABELS_suggest_bad_word_link_upload = "{labels.suggest_bad_word_link_upload}";
+    public static final String LABELS_bad_word_link_upload = "{labels.bad_word_link_upload}";
 
     /** The key of the message: Download */
-    public static final String LABELS_suggest_bad_word_button_download = "{labels.suggest_bad_word_button_download}";
+    public static final String LABELS_bad_word_button_download = "{labels.bad_word_button_download}";
 
     /** The key of the message: Upload */
-    public static final String LABELS_suggest_bad_word_button_upload = "{labels.suggest_bad_word_button_upload}";
+    public static final String LABELS_bad_word_button_upload = "{labels.bad_word_button_upload}";
 
     /** The key of the message: Bad Word */
-    public static final String LABELS_suggest_bad_word_list_suggest_word = "{labels.suggest_bad_word_list_suggest_word}";
+    public static final String LABELS_bad_word_list_suggest_word = "{labels.bad_word_list_suggest_word}";
 
     /** The key of the message: Bad Word */
-    public static final String LABELS_suggest_bad_word_suggest_word = "{labels.suggest_bad_word_suggest_word}";
+    public static final String LABELS_bad_word_suggest_word = "{labels.bad_word_suggest_word}";
 
     /** The key of the message: Bad Word File */
-    public static final String LABELS_suggest_bad_word_file = "{labels.suggest_bad_word_file}";
+    public static final String LABELS_bad_word_file = "{labels.bad_word_file}";
 
     /** The key of the message: User */
     public static final String LABELS_user_configuration = "{labels.user_configuration}";

src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java

@@ -327,10 +327,10 @@ public class FessMessages extends FessLabels {
     public static final String SUCCESS_upload_kuromoji_file = "{success.upload_kuromoji_file}";
 
     /** The key of the message: Uploaded Additional Word file. */
-    public static final String SUCCESS_upload_suggest_elevate_word = "{success.upload_suggest_elevate_word}";
+    public static final String SUCCESS_upload_elevate_word = "{success.upload_elevate_word}";
 
     /** The key of the message: Uploaded Bad Word file. */
-    public static final String SUCCESS_upload_suggest_bad_word = "{success.upload_suggest_bad_word}";
+    public static final String SUCCESS_upload_bad_word = "{success.upload_bad_word}";
 
     /** The key of the message: Created data. */
     public static final String SUCCESS_crud_create_crud_table = "{success.crud_create_crud_table}";
@@ -1820,30 +1820,30 @@ public class FessMessages extends FessLabels {
     }
 
     /**
-     * Add the created action message for the key 'success.upload_suggest_elevate_word' with parameters.
+     * Add the created action message for the key 'success.upload_elevate_word' with parameters.
      * <pre>
      * message: Uploaded Additional Word file.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addSuccessUploadSuggestElevateWord(String property) {
+    public FessMessages addSuccessUploadElevateWord(String property) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(SUCCESS_upload_suggest_elevate_word));
+        add(property, new ActionMessage(SUCCESS_upload_elevate_word));
         return this;
     }
 
     /**
-     * Add the created action message for the key 'success.upload_suggest_bad_word' with parameters.
+     * Add the created action message for the key 'success.upload_bad_word' with parameters.
      * <pre>
      * message: Uploaded Bad Word file.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addSuccessUploadSuggestBadWord(String property) {
+    public FessMessages addSuccessUploadBadWord(String property) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(SUCCESS_upload_suggest_bad_word));
+        add(property, new ActionMessage(SUCCESS_upload_bad_word));
         return this;
     }
 

src/main/resources/esclient.xml

@@ -88,13 +88,13 @@
 			<arg>".fess_config/scheduled_job"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/suggest_bad_word"</arg>
+			<arg>".fess_config/bad_word"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/suggest_elevate_word"</arg>
+			<arg>".fess_config/elevate_word"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
-			<arg>".fess_config/suggest_elevate_word_to_label"</arg>
+			<arg>".fess_config/elevate_word_to_label"</arg>
 		</postConstruct>
 		<postConstruct name="addIndexConfig">
 			<arg>".fess_config/web_authentication"</arg>

src/main/resources/esflute_config.xml

@@ -25,9 +25,9 @@
     <component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
     <component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>
     <component name="scheduledJobBhv" class="org.codelibs.fess.es.config.exbhv.ScheduledJobBhv"/>
-    <component name="suggestBadWordBhv" class="org.codelibs.fess.es.config.exbhv.SuggestBadWordBhv"/>
-    <component name="suggestElevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.SuggestElevateWordToLabelBhv"/>
-    <component name="suggestElevateWordBhv" class="org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv"/>
+    <component name="badWordBhv" class="org.codelibs.fess.es.config.exbhv.BadWordBhv"/>
+    <component name="elevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv"/>
+    <component name="elevateWordBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordBhv"/>
     <component name="webAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv"/>
     <component name="webConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToLabelBhv"/>
     <component name="webConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv"/>

src/main/resources/fess_indices/.fess_config/suggest_bad_word.json → src/main/resources/fess_indices/.fess_config/bad_word.json

@@ -1,5 +1,5 @@
 {
-  "suggest_bad_word": {
+  "bad_word": {
     "_source": {
       "enabled": true
     },

src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json → src/main/resources/fess_indices/.fess_config/elevate_word.json

@@ -1,5 +1,5 @@
 {
-  "suggest_elevate_word": {
+  "elevate_word": {
     "_source": {
       "enabled": true
     },

src/main/resources/fess_indices/.fess_config/suggest_elevate_word_to_label.json → src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json

@@ -1,5 +1,5 @@
 {
-  "suggest_elevate_word_to_label": {
+  "elevate_word_to_label": {
     "_source": {
       "enabled": true
     },
@@ -7,7 +7,7 @@
       "enabled": false
     },
     "properties": {
-      "suggestElevateWordId": {
+      "elevateWordId": {
         "type": "string",
         "index": "not_analyzed"
       },

src/main/resources/fess_label.properties

@@ -160,8 +160,8 @@ labels.target=Target
 labels.token=Token
 labels.synonymFile=Synonym File
 labels.userDictFile=Kuromoji File
-labels.suggestElevateWordFile=Additional Word File
-labels.suggestBadWordFile=Bad Word File
+labels.elevateWordFile=Additional Word File
+labels.badWordFile=Bad Word File
 
 labels.menu_system=System
 labels.menu_wizard=Wizard
@@ -188,8 +188,8 @@ labels.menu_user=User
 labels.menu_role=Role
 labels.menu_group=Group
 labels.menu_suggest=Suggest
-labels.menu_suggest_elevate_word=Additional Word
-labels.menu_suggest_bad_word=Bad Word
+labels.menu_elevate_word=Additional Word
+labels.menu_bad_word=Bad Word
 labels.menu_system_log=System Info
 labels.menu_system_info=Config Info
 labels.menu_crawling_info=Crawling Info
@@ -591,37 +591,37 @@ labels.boost_document_rule_list_url_expr=Condition
 labels.boost_document_rule_url_expr=Condition
 labels.boost_document_rule_boost_expr=Boost Expr
 labels.boost_document_rule_sort_order=Sort Order
-labels.suggest_elevate_word_configuration=Additional Word
-labels.suggest_elevate_word_title_details=Additional Word
-labels.suggest_elevate_word_link_list=List
-labels.suggest_elevate_word_link_create=Create New
-labels.suggest_elevate_word_link_edit=Edit
-labels.suggest_elevate_word_link_delete=Delete
-labels.suggest_elevate_word_link_details=Details
-labels.suggest_elevate_word_link_download=Download
-labels.suggest_elevate_word_link_upload=Upload
-labels.suggest_elevate_word_button_download=Download
-labels.suggest_elevate_word_button_upload=Upload
-labels.suggest_elevate_word_list_suggest_word=Word
-labels.suggest_elevate_word_suggest_word=Word
-labels.suggest_elevate_word_reading=Reading
-labels.suggest_elevate_word_target_role=Role
-labels.suggest_elevate_word_boost=Boost
-labels.suggest_elevate_word_file=Additional Word File
-labels.suggest_bad_word_configuration=Bad Word
-labels.suggest_bad_word_title_details=Bad Word
-labels.suggest_bad_word_link_list=List
-labels.suggest_bad_word_link_create=Create New
-labels.suggest_bad_word_link_edit=Edit
-labels.suggest_bad_word_link_delete=Delete
-labels.suggest_bad_word_link_details=Details
-labels.suggest_bad_word_link_download=Download
-labels.suggest_bad_word_link_upload=Upload
-labels.suggest_bad_word_button_download=Download
-labels.suggest_bad_word_button_upload=Upload
-labels.suggest_bad_word_list_suggest_word=Bad Word
-labels.suggest_bad_word_suggest_word=Bad Word
-labels.suggest_bad_word_file=Bad Word File
+labels.elevate_word_configuration=Additional Word
+labels.elevate_word_title_details=Additional Word
+labels.elevate_word_link_list=List
+labels.elevate_word_link_create=Create New
+labels.elevate_word_link_edit=Edit
+labels.elevate_word_link_delete=Delete
+labels.elevate_word_link_details=Details
+labels.elevate_word_link_download=Download
+labels.elevate_word_link_upload=Upload
+labels.elevate_word_button_download=Download
+labels.elevate_word_button_upload=Upload
+labels.elevate_word_list_suggest_word=Word
+labels.elevate_word_suggest_word=Word
+labels.elevate_word_reading=Reading
+labels.elevate_word_target_role=Role
+labels.elevate_word_boost=Boost
+labels.elevate_word_file=Additional Word File
+labels.bad_word_configuration=Bad Word
+labels.bad_word_title_details=Bad Word
+labels.bad_word_link_list=List
+labels.bad_word_link_create=Create New
+labels.bad_word_link_edit=Edit
+labels.bad_word_link_delete=Delete
+labels.bad_word_link_details=Details
+labels.bad_word_link_download=Download
+labels.bad_word_link_upload=Upload
+labels.bad_word_button_download=Download
+labels.bad_word_button_upload=Upload
+labels.bad_word_list_suggest_word=Bad Word
+labels.bad_word_suggest_word=Bad Word
+labels.bad_word_file=Bad Word File
 labels.user_configuration=User
 labels.user_list_name=Name
 labels.user_name=Name

src/main/resources/fess_message.properties

@@ -133,8 +133,8 @@ success.job_started=Started job {0}.
 success.job_stopped=Stopped job {0}.
 success.upload_synonym_file=Uploaded Synonym file.
 success.upload_kuromoji_file=Uploaded Kuromoji file.
-success.upload_suggest_elevate_word=Uploaded Additional Word file.
-success.upload_suggest_bad_word=Uploaded Bad Word file.
+success.upload_elevate_word=Uploaded Additional Word file.
+success.upload_bad_word=Uploaded Bad Word file.
 
 success.crud_create_crud_table=Created data.
 success.crud_update_crud_table=Updated data.

src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
+		key="labels.bad_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,16 +11,16 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
+			<jsp:param name="menuType" value="badWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_bad_word_configuration" />
+					<la:message key="labels.bad_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/badword">
-							<la:message key="labels.suggest_bad_word_link_list" />
+							<la:message key="labels.bad_word_link_list" />
 						</la:link></li>
 				</ol>
 			</section>
@@ -30,26 +30,26 @@
 						<div class="box box-primary">
 							<div class="box-header with-border">
 								<h3 class="box-title">
-									<la:message key="labels.suggest_bad_word_link_list" />
+									<la:message key="labels.bad_word_link_list" />
 								</h3>
 								<div class="btn-group pull-right">
 									<la:link href="/admin/badword"
 										styleClass="btn btn-default btn-xs">
 										<i class="fa fa-th-list"></i>
-										<la:message key="labels.suggest_bad_word_link_list" />
+										<la:message key="labels.bad_word_link_list" />
 									</la:link>
 									<la:link href="createnew" styleClass="btn btn-success btn-xs">
 										<i class="fa fa-plus"></i>
-										<la:message key="labels.suggest_bad_word_link_create" />
+										<la:message key="labels.bad_word_link_create" />
 									</la:link>
 									<la:link href="downloadpage"
 										styleClass="btn btn-primary btn-xs">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_bad_word_link_download" />
+										<la:message key="labels.bad_word_link_download" />
 									</la:link>
 									<la:link href="uploadpage" styleClass="btn btn-success btn-xs">
 										<i class="fa fa-upload"></i>
-										<la:message key="labels.suggest_bad_word_link_upload" />
+										<la:message key="labels.bad_word_link_upload" />
 									</la:link>
 								</div>
 							</div>
@@ -63,7 +63,7 @@
 									<la:errors />
 								</div>
 								<%-- List --%>
-								<c:if test="${suggestBadWordPager.allRecordCount == 0}">
+								<c:if test="${badWordPager.allRecordCount == 0}">
 									<div class="row top10">
 										<div class="col-sm-12">
 											<i class="fa fa-info-circle text-light-blue"></i>
@@ -71,19 +71,19 @@
 										</div>
 									</div>
 								</c:if>
-								<c:if test="${suggestBadWordPager.allRecordCount > 0}">
+								<c:if test="${badWordPager.allRecordCount > 0}">
 									<div class="row">
 										<div class="col-sm-12">
 											<table class="table table-bordered table-striped">
 												<thead>
 													<tr>
 														<th><la:message
-																key="labels.suggest_bad_word_list_suggest_word" /></th>
+																key="labels.bad_word_list_suggest_word" /></th>
 													</tr>
 												</thead>
 												<tbody>
 													<c:forEach var="data" varStatus="s"
-														items="${suggestBadWordItems}">
+														items="${badWordItems}">
 														<tr
 															data-href="${contextPath}/admin/badword/details/4/${f:u(data.id)}">
 															<td>${f:h(data.suggestWord)}</td>
@@ -93,7 +93,7 @@
 											</table>
 										</div>
 									</div>
-									<c:set var="pager" value="${suggestBadWordPager}"
+									<c:set var="pager" value="${badWordPager}"
 										scope="request" />
 									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
+		key="labels.bad_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
+			<jsp:param name="menuType" value="badWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_bad_word_title_details" />
+					<la:message key="labels.bad_word_title_details" />
 				</h1>
 				<ol class="breadcrumb">
 					<li><la:link href="list">
-							<la:message key="labels.suggest_bad_word_link_list" />
+							<la:message key="labels.bad_word_link_list" />
 						</la:link></li>
 					<li class="active"><la:message
-							key="labels.suggest_bad_word_link_details" /></li>
+							key="labels.bad_word_link_details" /></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -43,43 +43,43 @@
 									<h3 class="box-title">
 										<c:if test="${crudMode == 1}">
 											<la:message
-												key="labels.suggest_bad_word_link_create" />
+												key="labels.bad_word_link_create" />
 										</c:if>
 										<c:if test="${crudMode == 2}">
-											<la:message key="labels.suggest_bad_word_link_edit" />
+											<la:message key="labels.bad_word_link_edit" />
 										</c:if>
 										<c:if test="${crudMode == 3}">
 											<la:message
-												key="labels.suggest_bad_word_link_delete" />
+												key="labels.bad_word_link_delete" />
 										</c:if>
 										<c:if test="${crudMode == 4}">
 											<la:message
-												key="labels.suggest_bad_word_link_details" />
+												key="labels.bad_word_link_details" />
 										</c:if>
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/badword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_bad_word_link_list" />
+											<la:message key="labels.bad_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_create" />
+												key="labels.bad_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_download" />
+												key="labels.bad_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_upload" />
+												key="labels.bad_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -97,7 +97,7 @@
 										<tbody>
 											<tr>
 												<th class="col-xs-2"><la:message
-														key="labels.suggest_bad_word_suggest_word" /></th>
+														key="labels.bad_word_suggest_word" /></th>
 												<td>${f:h(suggestWord)}<la:hidden
 														property="suggestWord" /></td>
 											</tr>

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
+		key="labels.bad_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
+			<jsp:param name="menuType" value="badWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_bad_word_configuration" />
+					<la:message key="labels.bad_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/badword">
-							<la:message key="labels.suggest_bad_word_link_list" />
+							<la:message key="labels.bad_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
-								key="labels.suggest_bad_word_link_download" /></a></li>
+								key="labels.bad_word_link_download" /></a></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -33,28 +33,28 @@
 							<div class="box box-primary">
 								<div class="box-header with-border">
 									<h3 class="box-title">
-										<la:message key="labels.suggest_bad_word_link_download" />
+										<la:message key="labels.bad_word_link_download" />
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/badword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_bad_word_link_list" />
+											<la:message key="labels.bad_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
-											<la:message key="labels.suggest_bad_word_link_create" />
+											<la:message key="labels.bad_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
-											<la:message key="labels.suggest_bad_word_link_download" />
+											<la:message key="labels.bad_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
-											<la:message key="labels.suggest_bad_word_link_upload" />
+											<la:message key="labels.bad_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -69,15 +69,15 @@
 									</div>
 									<div class="form-group">
 										<label for="name" class="col-sm-12 control-label"><la:message
-												key="labels.suggest_bad_word_file" /></label>
+												key="labels.bad_word_file" /></label>
 									</div>
 								</div>
 								<!-- /.box-body -->
 								<div class="box-footer">
 									<button type="submit" class="btn btn-primary" name="download"
-										value="<la:message key="labels.suggest_bad_word_button_download" />">
+										value="<la:message key="labels.bad_word_button_download" />">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_bad_word_button_download" />
+										<la:message key="labels.bad_word_button_download" />
 									</button>
 								</div>
 								<!-- /.box-footer -->

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
+		key="labels.bad_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,24 +11,24 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
+			<jsp:param name="menuType" value="badWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_bad_word_title_details" />
+					<la:message key="labels.bad_word_title_details" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/badword">
-							<la:message key="labels.suggest_bad_word_link_list" />
+							<la:message key="labels.bad_word_link_list" />
 						</la:link></li>
 					<c:if test="${crudMode == 1}">
 						<li class="active"><la:message
-								key="labels.suggest_bad_word_link_create" /></li>
+								key="labels.bad_word_link_create" /></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
 						<li class="active"><la:message
-								key="labels.suggest_bad_word_link_edit" /></li>
+								key="labels.bad_word_link_edit" /></li>
 					</c:if>
 				</ol>
 			</section>
@@ -49,35 +49,35 @@
 									<h3 class="box-title">
 										<c:if test="${crudMode == 1}">
 											<la:message
-												key="labels.suggest_bad_word_link_create" />
+												key="labels.bad_word_link_create" />
 										</c:if>
 										<c:if test="${crudMode == 2}">
-											<la:message key="labels.suggest_bad_word_link_edit" />
+											<la:message key="labels.bad_word_link_edit" />
 										</c:if>
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/badword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_bad_word_link_list" />
+											<la:message key="labels.bad_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_create" />
+												key="labels.bad_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_download" />
+												key="labels.bad_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
 											<la:message
-												key="labels.suggest_bad_word_link_upload" />
+												key="labels.bad_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -91,7 +91,7 @@
 									</div>
 									<div class="form-group">
 										<label for="word" class="col-sm-3 control-label"><la:message
-												key="labels.suggest_bad_word_suggest_word" /></label>
+												key="labels.bad_word_suggest_word" /></label>
 										<div class="col-sm-9">
 											<la:errors property="suggestWord" />
 											<la:text property="suggestWord" styleClass="form-control" />

src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
+		key="labels.bad_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
+			<jsp:param name="menuType" value="badWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_bad_word_configuration" />
+					<la:message key="labels.bad_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/badword">
-							<la:message key="labels.suggest_bad_word_link_list" />
+							<la:message key="labels.bad_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
-								key="labels.suggest_bad_word_link_upload" /></a></li>
+								key="labels.bad_word_link_upload" /></a></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -32,28 +32,28 @@
 						<div class="box box-primary">
 							<div class="box-header with-border">
 								<h3 class="box-title">
-									<la:message key="labels.suggest_bad_word_link_download" />
+									<la:message key="labels.bad_word_link_download" />
 								</h3>
 								<div class="btn-group pull-right">
 									<la:link href="/admin/badword"
 										styleClass="btn btn-default btn-xs">
 										<i class="fa fa-th-list"></i>
-										<la:message key="labels.suggest_bad_word_link_list" />
+										<la:message key="labels.bad_word_link_list" />
 									</la:link>
 									<la:link href="../createnew"
 										styleClass="btn btn-success btn-xs">
 										<i class="fa fa-plus"></i>
-										<la:message key="labels.suggest_bad_word_link_create" />
+										<la:message key="labels.bad_word_link_create" />
 									</la:link>
 									<la:link href="../downloadpage"
 										styleClass="btn btn-primary btn-xs">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_bad_word_link_download" />
+										<la:message key="labels.bad_word_link_download" />
 									</la:link>
 									<la:link href="../uploadpage"
 										styleClass="btn btn-success btn-xs">
 										<i class="fa fa-upload"></i>
-										<la:message key="labels.suggest_bad_word_link_upload" />
+										<la:message key="labels.bad_word_link_upload" />
 									</la:link>
 								</div>
 							</div>
@@ -71,17 +71,17 @@
 										<tbody>
 											<tr>
 												<th class="col-sm-3"><la:message
-														key="labels.suggest_bad_word_file" /></th>
-												<td><input type="file" name="suggestBadWordFile" /></td>
+														key="labels.bad_word_file" /></th>
+												<td><input type="file" name="badWordFile" /></td>
 											</tr>
 										</tbody>
 										<tfoot>
 											<tr>
 												<td colspan="2">
 													<button type="submit" class="btn btn-success" name="upload"
-														value="<la:message key="labels.suggest_bad_word_button_upload" />">
+														value="<la:message key="labels.bad_word_button_upload" />">
 														<i class="fa fa-upload"></i>
-														<la:message key="labels.suggest_bad_word_button_upload" />
+														<la:message key="labels.bad_word_button_upload" />
 													</button>
 												</td>
 											</tr>

src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_elevate_word_configuration" /></title>
+		key="labels.elevate_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,16 +11,16 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestElevateWord" />
+			<jsp:param name="menuType" value="elevateWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_elevate_word_configuration" />
+					<la:message key="labels.elevate_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/elevateword">
-							<la:message key="labels.suggest_elevate_word_link_list" />
+							<la:message key="labels.elevate_word_link_list" />
 						</la:link></li>
 				</ol>
 			</section>
@@ -30,26 +30,26 @@
 						<div class="box box-primary">
 							<div class="box-header with-border">
 								<h3 class="box-title">
-									<la:message key="labels.suggest_elevate_word_link_list" />
+									<la:message key="labels.elevate_word_link_list" />
 								</h3>
 								<div class="btn-group pull-right">
 									<la:link href="/admin/elevateword"
 										styleClass="btn btn-default btn-xs">
 										<i class="fa fa-th-list"></i>
-										<la:message key="labels.suggest_elevate_word_link_list" />
+										<la:message key="labels.elevate_word_link_list" />
 									</la:link>
 									<la:link href="createnew" styleClass="btn btn-success btn-xs">
 										<i class="fa fa-plus"></i>
-										<la:message key="labels.suggest_elevate_word_link_create" />
+										<la:message key="labels.elevate_word_link_create" />
 									</la:link>
 									<la:link href="downloadpage"
 										styleClass="btn btn-primary btn-xs">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_elevate_word_link_download" />
+										<la:message key="labels.elevate_word_link_download" />
 									</la:link>
 									<la:link href="uploadpage" styleClass="btn btn-success btn-xs">
 										<i class="fa fa-upload"></i>
-										<la:message key="labels.suggest_elevate_word_link_upload" />
+										<la:message key="labels.elevate_word_link_upload" />
 									</la:link>
 								</div>
 							</div>
@@ -63,7 +63,7 @@
 									<la:errors />
 								</div>
 								<%-- List --%>
-								<c:if test="${suggestElevateWordPager.allRecordCount == 0}">
+								<c:if test="${elevateWordPager.allRecordCount == 0}">
 									<div class="row top10">
 										<div class="col-sm-12">
 											<i class="fa fa-info-circle text-light-blue"></i>
@@ -71,19 +71,19 @@
 										</div>
 									</div>
 								</c:if>
-								<c:if test="${suggestElevateWordPager.allRecordCount > 0}">
+								<c:if test="${elevateWordPager.allRecordCount > 0}">
 									<div class="row">
 										<div class="col-sm-12">
 											<table class="table table-bordered table-striped">
 												<thead>
 													<tr>
 														<th><la:message
-																key="labels.suggest_elevate_word_list_suggest_word" /></th>
+																key="labels.elevate_word_list_suggest_word" /></th>
 													</tr>
 												</thead>
 												<tbody>
 													<c:forEach var="data" varStatus="s"
-														items="${suggestElevateWordItems}">
+														items="${elevateWordItems}">
 														<tr
 															data-href="${contextPath}/admin/elevateword/details/4/${f:u(data.id)}">
 															<td>${f:h(data.suggestWord)}</td>
@@ -93,7 +93,7 @@
 											</table>
 										</div>
 									</div>
-									<c:set var="pager" value="${suggestElevateWordPager}"
+									<c:set var="pager" value="${elevateWordPager}"
 										scope="request" />
 									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>

src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_elevate_word_configuration" /></title>
+		key="labels.elevate_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestElevateWord" />
+			<jsp:param name="menuType" value="elevateWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_elevate_word_title_details" />
+					<la:message key="labels.elevate_word_title_details" />
 				</h1>
 				<ol class="breadcrumb">
 					<li><la:link href="list">
-							<la:message key="labels.suggest_elevate_word_link_list" />
+							<la:message key="labels.elevate_word_link_list" />
 						</la:link></li>
 					<li class="active"><la:message
-							key="labels.suggest_elevate_word_link_details" /></li>
+							key="labels.elevate_word_link_details" /></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -42,38 +42,38 @@
 								<div class="box-header with-border">
 									<h3 class="box-title">
 										<c:if test="${crudMode == 1}">
-											<la:message key="labels.suggest_elevate_word_link_create" />
+											<la:message key="labels.elevate_word_link_create" />
 										</c:if>
 										<c:if test="${crudMode == 2}">
-											<la:message key="labels.suggest_elevate_word_link_edit" />
+											<la:message key="labels.elevate_word_link_edit" />
 										</c:if>
 										<c:if test="${crudMode == 3}">
-											<la:message key="labels.suggest_elevate_word_link_delete" />
+											<la:message key="labels.elevate_word_link_delete" />
 										</c:if>
 										<c:if test="${crudMode == 4}">
-											<la:message key="labels.suggest_elevate_word_link_details" />
+											<la:message key="labels.elevate_word_link_details" />
 										</c:if>
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/elevateword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_elevate_word_link_list" />
+											<la:message key="labels.elevate_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
-											<la:message key="labels.suggest_elevate_word_link_create" />
+											<la:message key="labels.elevate_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
-											<la:message key="labels.suggest_elevate_word_link_download" />
+											<la:message key="labels.elevate_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
-											<la:message key="labels.suggest_elevate_word_link_upload" />
+											<la:message key="labels.elevate_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -91,18 +91,18 @@
 										<tbody>
 											<tr>
 												<th class="col-xs-2"><la:message
-														key="labels.suggest_elevate_word_suggest_word" /></th>
+														key="labels.elevate_word_suggest_word" /></th>
 												<td>${f:h(suggestWord)}<la:hidden
 														property="suggestWord" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.suggest_elevate_word_reading" /></th>
+														key="labels.elevate_word_reading" /></th>
 												<td>${f:h(reading)}<la:hidden property="reading" /></td>
 											</tr>
 											<tr>
 												<th><la:message
-														key="labels.suggest_elevate_word_target_role" /></th>
+														key="labels.elevate_word_target_role" /></th>
 												<td>${f:h(targetRole)}<la:hidden property="targetRole" /></td>
 											</tr>
 											<tr>
@@ -118,7 +118,7 @@
 													</c:forEach></td>
 											</tr>
 											<tr>
-												<th><la:message key="labels.suggest_elevate_word_boost" /></th>
+												<th><la:message key="labels.elevate_word_boost" /></th>
 												<td>${f:h(boost)}<la:hidden property="boost" /></td>
 											</tr>
 										</tbody>

src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_elevate_word_configuration" /></title>
+		key="labels.elevate_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestElevateWord" />
+			<jsp:param name="menuType" value="elevateWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_elevate_word_configuration" />
+					<la:message key="labels.elevate_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/elevateword">
-							<la:message key="labels.suggest_elevate_word_link_list" />
+							<la:message key="labels.elevate_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
-								key="labels.suggest_elevate_word_link_download" /></a></li>
+								key="labels.elevate_word_link_download" /></a></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -34,28 +34,28 @@
 								<%-- Box Header --%>
 								<div class="box-header with-border">
 									<h3 class="box-title">
-										<la:message key="labels.suggest_elevate_word_link_download" />
+										<la:message key="labels.elevate_word_link_download" />
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/elevateword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_elevate_word_link_list" />
+											<la:message key="labels.elevate_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
-											<la:message key="labels.suggest_elevate_word_link_create" />
+											<la:message key="labels.elevate_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
-											<la:message key="labels.suggest_elevate_word_link_download" />
+											<la:message key="labels.elevate_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
-											<la:message key="labels.suggest_elevate_word_link_upload" />
+											<la:message key="labels.elevate_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -70,15 +70,15 @@
 									</div>
 									<div class="form-group">
 										<label for="name" class="col-sm-12 control-label"><la:message
-												key="labels.suggest_elevate_word_file" /></label>
+												key="labels.elevate_word_file" /></label>
 									</div>
 								</div>
 								<!-- /.box-body -->
 								<div class="box-footer">
 									<button type="submit" class="btn btn-primary" name="download"
-										value="<la:message key="labels.suggest_elevate_word_button_download" />">
+										value="<la:message key="labels.elevate_word_button_download" />">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_elevate_word_button_download" />
+										<la:message key="labels.elevate_word_button_download" />
 									</button>
 								</div>
 								<!-- /.box-footer -->

src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_elevate_word_configuration" /></title>
+		key="labels.elevate_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,24 +11,24 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestElevateWord" />
+			<jsp:param name="menuType" value="elevateWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_elevate_word_title_details" />
+					<la:message key="labels.elevate_word_title_details" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/elevateword">
-							<la:message key="labels.suggest_elevate_word_link_list" />
+							<la:message key="labels.elevate_word_link_list" />
 						</la:link></li>
 					<c:if test="${crudMode == 1}">
 						<li class="active"><la:message
-								key="labels.suggest_elevate_word_link_create" /></li>
+								key="labels.elevate_word_link_create" /></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
 						<li class="active"><la:message
-								key="labels.suggest_elevate_word_link_edit" /></li>
+								key="labels.elevate_word_link_edit" /></li>
 					</c:if>
 				</ol>
 			</section>
@@ -48,32 +48,32 @@
 								<div class="box-header with-border">
 									<h3 class="box-title">
 										<c:if test="${crudMode == 1}">
-											<la:message key="labels.suggest_elevate_word_link_create" />
+											<la:message key="labels.elevate_word_link_create" />
 										</c:if>
 										<c:if test="${crudMode == 2}">
-											<la:message key="labels.suggest_elevate_word_link_edit" />
+											<la:message key="labels.elevate_word_link_edit" />
 										</c:if>
 									</h3>
 									<div class="btn-group pull-right">
 										<la:link href="/admin/elevateword"
 											styleClass="btn btn-default btn-xs">
 											<i class="fa fa-th-list"></i>
-											<la:message key="labels.suggest_elevate_word_link_list" />
+											<la:message key="labels.elevate_word_link_list" />
 										</la:link>
 										<la:link href="../createnew"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-plus"></i>
-											<la:message key="labels.suggest_elevate_word_link_create" />
+											<la:message key="labels.elevate_word_link_create" />
 										</la:link>
 										<la:link href="../downloadpage"
 											styleClass="btn btn-primary btn-xs">
 											<i class="fa fa-download"></i>
-											<la:message key="labels.suggest_elevate_word_link_download" />
+											<la:message key="labels.elevate_word_link_download" />
 										</la:link>
 										<la:link href="../uploadpage"
 											styleClass="btn btn-success btn-xs">
 											<i class="fa fa-upload"></i>
-											<la:message key="labels.suggest_elevate_word_link_upload" />
+											<la:message key="labels.elevate_word_link_upload" />
 										</la:link>
 									</div>
 								</div>
@@ -87,7 +87,7 @@
 									</div>
 									<div class="form-group">
 										<label for="word" class="col-sm-3 control-label"><la:message
-												key="labels.suggest_elevate_word_suggest_word" /></label>
+												key="labels.elevate_word_suggest_word" /></label>
 										<div class="col-sm-9">
 											<la:errors property="suggestWord" />
 											<la:text property="suggestWord" styleClass="form-control" />
@@ -95,7 +95,7 @@
 									</div>
 									<div class="form-group">
 										<label for="reading" class="col-sm-3 control-label"><la:message
-												key="labels.suggest_elevate_word_reading" /></label>
+												key="labels.elevate_word_reading" /></label>
 										<div class="col-sm-9">
 											<la:errors property="reading" />
 											<la:text property="reading" styleClass="form-control" />
@@ -103,7 +103,7 @@
 									</div>
 									<div class="form-group">
 										<label for="targetRole" class="col-sm-3 control-label"><la:message
-												key="labels.suggest_elevate_word_target_role" /></label>
+												key="labels.elevate_word_target_role" /></label>
 										<div class="col-sm-9">
 											<la:errors property="targetRole" />
 											<la:text property="targetRole" styleClass="form-control" />
@@ -124,7 +124,7 @@
 									</div>
 									<div class="form-group">
 										<label for="boost" class="col-sm-3 control-label"><la:message
-												key="labels.suggest_elevate_word_boost" /></label>
+												key="labels.elevate_word_boost" /></label>
 										<div class="col-sm-9">
 											<la:errors property="boost" />
 											<la:text property="boost" styleClass="form-control" />

src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_elevate_word_configuration" /></title>
+		key="labels.elevate_word_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -11,19 +11,19 @@
 		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestElevateWord" />
+			<jsp:param name="menuType" value="elevateWord" />
 		</jsp:include>
 		<div class="content-wrapper">
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.suggest_elevate_word_configuration" />
+					<la:message key="labels.elevate_word_configuration" />
 				</h1>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/elevateword">
-							<la:message key="labels.suggest_elevate_word_link_list" />
+							<la:message key="labels.elevate_word_link_list" />
 						</la:link></li>
 					<li class="active"><a href="#"><la:message
-								key="labels.suggest_elevate_word_link_upload" /></a></li>
+								key="labels.elevate_word_link_upload" /></a></li>
 				</ol>
 			</section>
 			<section class="content">
@@ -32,28 +32,28 @@
 						<div class="box box-primary">
 							<div class="box-header with-border">
 								<h3 class="box-title">
-									<la:message key="labels.suggest_elevate_word_link_download" />
+									<la:message key="labels.elevate_word_link_download" />
 								</h3>
 								<div class="btn-group pull-right">
 									<la:link href="/admin/elevateword"
 										styleClass="btn btn-default btn-xs">
 										<i class="fa fa-th-list"></i>
-										<la:message key="labels.suggest_elevate_word_link_list" />
+										<la:message key="labels.elevate_word_link_list" />
 									</la:link>
 									<la:link href="../createnew"
 										styleClass="btn btn-success btn-xs">
 										<i class="fa fa-plus"></i>
-										<la:message key="labels.suggest_elevate_word_link_create" />
+										<la:message key="labels.elevate_word_link_create" />
 									</la:link>
 									<la:link href="../downloadpage"
 										styleClass="btn btn-primary btn-xs">
 										<i class="fa fa-download"></i>
-										<la:message key="labels.suggest_elevate_word_link_download" />
+										<la:message key="labels.elevate_word_link_download" />
 									</la:link>
 									<la:link href="../uploadpage"
 										styleClass="btn btn-success btn-xs">
 										<i class="fa fa-upload"></i>
-										<la:message key="labels.suggest_elevate_word_link_upload" />
+										<la:message key="labels.elevate_word_link_upload" />
 									</la:link>
 								</div>
 							</div>
@@ -72,18 +72,18 @@
 										<tbody>
 											<tr>
 												<th class="col-sm-3"><la:message
-														key="labels.suggest_elevate_word_file" /></th>
-												<td><input type="file" name="suggestElevateWordFile" /></td>
+														key="labels.elevate_word_file" /></th>
+												<td><input type="file" name="elevateWordFile" /></td>
 											</tr>
 										</tbody>
 										<tfoot>
 											<tr>
 												<td colspan="2">
 													<button type="submit" class="btn btn-success" name="upload"
-														value="<la:message key="labels.suggest_elevate_word_button_upload" />">
+														value="<la:message key="labels.elevate_word_button_upload" />">
 														<i class="fa fa-upload"></i>
 														<la:message
-															key="labels.suggest_elevate_word_button_upload" />
+															key="labels.elevate_word_button_upload" />
 													</button>
 												</td>
 											</tr>

src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp

@@ -196,17 +196,17 @@
 				<ul class="treeview-menu">
 
 					<li
-						<c:if test="${param.menuType=='suggestElevateWord'}">class="active"</c:if>><la:link
+						<c:if test="${param.menuType=='elevateWord'}">class="active"</c:if>><la:link
 							href="/admin/elevateword/">
 							<i class='fa fa-circle-o'></i>
-							<span><la:message key="labels.menu_suggest_elevate_word" /></span>
+							<span><la:message key="labels.menu_elevate_word" /></span>
 						</la:link></li>
 
 					<li
-						<c:if test="${param.menuType=='suggestBadWord'}">class="active"</c:if>><la:link
+						<c:if test="${param.menuType=='badWord'}">class="active"</c:if>><la:link
 							href="/admin/badword/">
 							<i class='fa fa-circle-o'></i>
-							<span><la:message key="labels.menu_suggest_bad_word" /></span>
+							<span><la:message key="labels.menu_bad_word" /></span>
 						</la:link></li>
 
 				</ul></li>

src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java

@@ -0,0 +1,41 @@
+package org.codelibs.fess.dict;
+
+import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+import org.codelibs.core.io.FileUtil;
+import org.codelibs.fess.Constants;
+import org.codelibs.fess.unit.UnitFessTestCase;
+
+public class DictionaryManagerTest extends UnitFessTestCase {
+    private File testDir;
+
+    private File synonymFile1;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        testDir = File.createTempFile("synonymtest", "_dir");
+        testDir.delete();
+        testDir.mkdirs();
+        synonymFile1 = new File(testDir, "synonym.txt");
+        FileUtil.writeBytes(synonymFile1.getAbsolutePath(), "abc=>123\nxyz,890".getBytes(Constants.UTF_8));
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        FileUtils.deleteDirectory(testDir);
+    }
+
+    public void test_getSynonymFiles() throws Exception {
+        /*
+        final DictionaryManager dictionaryManager = new DictionaryManager();
+        dictionaryManager.addCreator(new SynonymCreator(synonymFile1.getPath()));
+        dictionaryManager.init();
+        final DictionaryFile<? extends DictionaryItem>[] synonymFiles = dictionaryManager.getDictionaryFiles();
+        assertEquals(1, synonymFiles.length);
+        */
+    }
+
+}

src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java

@@ -0,0 +1,46 @@
+package org.codelibs.fess.dict.synonym;
+
+import java.io.File;
+
+import org.codelibs.core.io.FileUtil;
+import org.codelibs.fess.Constants;
+import org.codelibs.fess.unit.UnitFessTestCase;
+
+public class SynonymFileTest extends UnitFessTestCase {
+    private File file1;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        file1 = File.createTempFile("synonym", ".txt");
+        FileUtil.writeBytes(file1.getAbsolutePath(), "a1=>A1\nb1,b2 => B1\nc1 => C1, C2\nx1,X1\ny1, Y1, y2".getBytes(Constants.UTF_8));
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        file1.delete();
+    }
+
+    public void test_create() {
+        /*
+        final SynonymCreator synonymCreator = new SynonymCreator();
+        final SynonymFile synonymFile = (SynonymFile) synonymCreator.create(file1.getPath(), new Date());
+        final PagingList<SynonymItem> itemList1 = synonymFile.selectList(0, 20); // error occurs
+        assertEquals(5, itemList1.size());
+        assertEquals(5, itemList1.getAllRecordCount());
+        assertEquals(1, itemList1.getCurrentPageNumber());
+        assertEquals(20, itemList1.getPageSize());
+
+        final PagingList<SynonymItem> itemList2 = synonymFile.selectList(4, 2);
+        assertEquals(1, itemList2.size());
+        assertEquals(5, itemList2.getAllRecordCount());
+        assertEquals(3, itemList2.getCurrentPageNumber());
+        assertEquals(2, itemList2.getPageSize());
+
+        assertEquals(0, synonymFile.selectList(5, 5).size());
+        assertEquals(0, synonymFile.selectList(-1, 5).size());
+        */
+    }
+
+}

src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java

@@ -0,0 +1,86 @@
+package org.codelibs.fess.dict.synonym;
+
+import org.codelibs.fess.unit.UnitFessTestCase;
+
+public class SynonymItemTest extends UnitFessTestCase {
+
+    public void test_new1() {
+        final SynonymItem synonymItem = new SynonymItem(1, new String[] { "a", "A" }, new String[] { "b", "B" });
+        assertEquals(1, synonymItem.getId());
+        assertEquals(2, synonymItem.getInputs().length);
+        assertEquals("A", synonymItem.getInputs()[0]);
+        assertEquals("a", synonymItem.getInputs()[1]);
+        assertEquals(2, synonymItem.getOutputs().length);
+        assertEquals("B", synonymItem.getOutputs()[0]);
+        assertEquals("b", synonymItem.getOutputs()[1]);
+        assertNull(synonymItem.getNewInputs());
+        assertNull(synonymItem.getNewOutputs());
+        assertFalse(synonymItem.isUpdated());
+        assertFalse(synonymItem.isDeleted());
+
+        synonymItem.setNewInputs(new String[] { "1", "2" });
+        synonymItem.setNewOutputs(new String[] { "3", "4" });
+        assertTrue(synonymItem.isUpdated());
+        assertFalse(synonymItem.isDeleted());
+
+        synonymItem.setNewInputs(new String[0]);
+        synonymItem.setNewOutputs(new String[0]);
+        assertTrue(synonymItem.isUpdated());
+        assertTrue(synonymItem.isDeleted());
+    }
+
+    public void test_new2() {
+        final SynonymItem synonymItem = new SynonymItem(1, new String[] { "A", "a" }, new String[] { "B", "b" });
+        assertEquals(1, synonymItem.getId());
+        assertEquals(2, synonymItem.getInputs().length);
+        assertEquals("A", synonymItem.getInputs()[0]);
+        assertEquals("a", synonymItem.getInputs()[1]);
+        assertEquals(2, synonymItem.getOutputs().length);
+        assertEquals("B", synonymItem.getOutputs()[0]);
+        assertEquals("b", synonymItem.getOutputs()[1]);
+        assertNull(synonymItem.getNewInputs());
+        assertNull(synonymItem.getNewOutputs());
+        assertFalse(synonymItem.isUpdated());
+        assertFalse(synonymItem.isDeleted());
+
+        synonymItem.setNewInputs(new String[] { "2", "1" });
+        synonymItem.setNewOutputs(new String[] { "4", "3" });
+        assertTrue(synonymItem.isUpdated());
+        assertFalse(synonymItem.isDeleted());
+
+        synonymItem.setNewInputs(new String[0]);
+        synonymItem.setNewOutputs(new String[0]);
+        assertTrue(synonymItem.isUpdated());
+        assertTrue(synonymItem.isDeleted());
+    }
+
+    public void test_equals1() {
+        final SynonymItem synonymItem1 = new SynonymItem(1, new String[] { "a", "A" }, new String[] { "b", "B" });
+
+        assertTrue(synonymItem1.equals(synonymItem1));
+        assertTrue(synonymItem1.equals(new SynonymItem(1, new String[] { "A", "a" }, new String[] { "B", "b" })));
+        assertTrue(synonymItem1.equals(new SynonymItem(2, new String[] { "A", "a" }, new String[] { "B", "b" })));
+        assertFalse(synonymItem1.equals(new SynonymItem(2, new String[] { "A", "a" }, new String[] { "B", })));
+        assertFalse(synonymItem1.equals(new SynonymItem(2, new String[] { "A" }, new String[] { "B", "b" })));
+        assertFalse(synonymItem1.equals(new SynonymItem(1, new String[] { "A", "a" }, new String[] { "B", "c" })));
+        assertFalse(synonymItem1.equals(new SynonymItem(1, new String[] { "A", "c" }, new String[] { "B", "b" })));
+    }
+
+    public void test_equals2() {
+        final SynonymItem synonymItem1 = new SynonymItem(1, new String[] { "a" }, new String[] { "b" });
+
+        assertTrue(synonymItem1.equals(synonymItem1));
+        assertTrue(synonymItem1.equals(new SynonymItem(1, new String[] { "a" }, new String[] { "b" })));
+        assertFalse(synonymItem1.equals(new SynonymItem(2, new String[] { "a" }, new String[] { "B", })));
+        assertFalse(synonymItem1.equals(new SynonymItem(2, new String[] { "A" }, new String[] { "b" })));
+    }
+
+    public void test_toLineString() {
+        assertEquals("a1,a2,a3=>b1,b2,b3",
+                new SynonymItem(1, new String[] { "a1", "a2", "a3" }, new String[] { "b1", "b2", "b3" }).toLineString());
+        assertEquals("a=>b", new SynonymItem(1, new String[] { "a" }, new String[] { "b" }).toLineString());
+        assertEquals("A,a=>B,b", new SynonymItem(1, new String[] { "a", "A" }, new String[] { "b", "B" }).toLineString());
+        assertEquals("A,a", new SynonymItem(1, new String[] { "a", "A" }, new String[] { "a", "A" }).toLineString());
+        assertEquals("a", new SynonymItem(1, new String[] { "a" }, new String[] { "a" }).toLineString());
+    }
+}