diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json index a4ad5a0c9..834b3a578 100644 --- a/src/main/config/es/fess_config.json +++ b/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 }, diff --git a/src/main/java/org/codelibs/fess/app/pager/SuggestBadWordPager.java b/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/SuggestBadWordPager.java rename to src/main/java/org/codelibs/fess/app/pager/BadWordPager.java index 9e16ae7fc..6fe66448e 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SuggestBadWordPager.java +++ b/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(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/SuggestElevateWordPager.java b/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/SuggestElevateWordPager.java rename to src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java index 938115627..25bf608e1 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SuggestElevateWordPager.java +++ b/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(); } diff --git a/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java b/src/main/java/org/codelibs/fess/app/service/BadWordService.java similarity index 60% rename from src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java rename to src/main/java/org/codelibs/fess/app/service/BadWordService.java index 4174c487e..126ad9603 100644 --- a/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java +++ b/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 getSuggestBadWordList(final SuggestBadWordPager suggestBadWordPager) { + public List getBadWordList(final BadWordPager badWordPager) { - final PagingResultBean suggestBadWordList = suggestBadWordBhv.selectPage(cb -> { - cb.paging(suggestBadWordPager.getPageSize(), suggestBadWordPager.getCurrentPageNumber()); - setupListCondition(cb, suggestBadWordPager); + final PagingResultBean 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 getSuggestBadWord(final String id) { - return suggestBadWordBhv.selectByPK(id); + public OptionalEntity 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 keys) { + protected void setupEntityCondition(final BadWordCB cb, final Map 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 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() { + }, new EntityRowHandler() { @Override - public void handle(final SuggestBadWord entity) { + public void handle(final BadWord entity) { final List list = new ArrayList(); addToList(list, entity.getSuggestWord()); try { diff --git a/src/main/java/org/codelibs/fess/app/service/SuggestElevateWordService.java b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java similarity index 57% rename from src/main/java/org/codelibs/fess/app/service/SuggestElevateWordService.java rename to src/main/java/org/codelibs/fess/app/service/ElevateWordService.java index 34c7c485b..b35c7d0ff 100644 --- a/src/main/java/org/codelibs/fess/app/service/SuggestElevateWordService.java +++ b/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 getSuggestElevateWordList(final SuggestElevateWordPager suggestElevateWordPager) { + public List getElevateWordList(final ElevateWordPager elevateWordPager) { - final PagingResultBean suggestElevateWordList = suggestElevateWordBhv.selectPage(cb -> { - cb.paging(suggestElevateWordPager.getPageSize(), suggestElevateWordPager.getCurrentPageNumber()); - setupListCondition(cb, suggestElevateWordPager); + final PagingResultBean 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 getSuggestElevateWord(final String id) { - return suggestElevateWordBhv.selectByPK(id).map(entity -> { + public OptionalEntity getElevateWord(final String id) { + return elevateWordBhv.selectByPK(id).map(entity -> { - final List wctltmList = suggestElevateWordToLabelBhv.selectList(wctltmCb -> { - wctltmCb.query().setSuggestElevateWordId_Equal(entity.getId()); + final List wctltmList = elevateWordToLabelBhv.selectList(wctltmCb -> { + wctltmCb.query().setElevateWordId_Equal(entity.getId()); }); if (!wctltmList.isEmpty()) { final List labelTypeIds = new ArrayList(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 wctltmList = new ArrayList(); + final List wctltmList = new ArrayList(); 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 list = suggestElevateWordToLabelBhv.selectList(wctltmCb -> { - wctltmCb.query().setSuggestElevateWordId_Equal(suggestElevateWordId); + final List list = elevateWordToLabelBhv.selectList(wctltmCb -> { + wctltmCb.query().setElevateWordId_Equal(elevateWordId); }); - final List newList = new ArrayList(); - final List matchedList = new ArrayList(); + final List newList = new ArrayList(); + final List matchedList = new ArrayList(); 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 keys) { + protected void setupEntityCondition(final ElevateWordCB cb, final Map 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() { + }, new EntityRowHandler() { @Override - public void handle(final SuggestElevateWord entity) { + public void handle(final ElevateWord entity) { final List list = new ArrayList(); addToList(list, entity.getSuggestWord()); addToList(list, entity.getReading()); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index 61da4ffee..41d24b681 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/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 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 getEntity(final CreateForm form, final String username, final long currentTime) { + private OptionalEntity 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 getSuggestBadWord(final CreateForm form) { + protected OptionalEntity 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")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java index 059b7c652..cae1ec597 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java index d8f4e0604..1d052fe84 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java +++ b/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 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 getEntity(final CreateForm form, final String username, final long currentTime) { + private OptionalEntity 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 getSuggestElevateWord(final CreateForm form) { + protected OptionalEntity 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")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java index 4ecc4b62f..5065929af 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java similarity index 55% rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordToLabelBhv.java rename to src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java index 79d3eeb1c..ef2d22ecf 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordToLabelBhv.java +++ b/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 { +public abstract class BsBadWordBhv extends EsAbstractBehavior { // =================================================================================== // 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 createEntity(Map source, Class entityType) { + protected RESULT createEntity(Map source, Class 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 cbLambda) { + public int selectCount(CBCall cbLambda) { return facadeSelectCount(createCB(cbLambda)); } - public OptionalEntity selectEntity(CBCall cbLambda) { + public OptionalEntity selectEntity(CBCall cbLambda) { return facadeSelectEntity(createCB(cbLambda)); } - protected OptionalEntity facadeSelectEntity(SuggestElevateWordToLabelCB cb) { + protected OptionalEntity facadeSelectEntity(BadWordCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(SuggestElevateWordToLabelCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(BadWordCB cb, Class 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 cbLambda) { + public BadWord selectEntityWithDeletedCheck(CBCall cbLambda) { return facadeSelectEntityWithDeletedCheck(createCB(cbLambda)); } - public OptionalEntity selectByPK(String id) { + public OptionalEntity selectByPK(String id) { return facadeSelectByPK(id); } - protected OptionalEntity facadeSelectByPK(String id) { + protected OptionalEntity facadeSelectByPK(String id) { return doSelectOptionalByPK(id, typeOfSelectedEntity()); } - protected ENTITY doSelectByPK(String id, Class tp) { + protected ENTITY doSelectByPK(String id, Class tp) { return doSelectEntity(xprepareCBAsPK(id), tp); } - protected SuggestElevateWordToLabelCB xprepareCBAsPK(String id) { + protected BadWordCB xprepareCBAsPK(String id) { assertObjectNotNull("id", id); return newConditionBean().acceptPK(id); } - protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { + protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { return createOptionalEntity(doSelectByPK(id, tp), id); } @Override - protected Class typeOfSelectedEntity() { - return SuggestElevateWordToLabel.class; + protected Class typeOfSelectedEntity() { + return BadWord.class; } @Override - protected Class typeOfHandlingEntity() { - return SuggestElevateWordToLabel.class; + protected Class typeOfHandlingEntity() { + return BadWord.class; } @Override - protected Class typeOfHandlingConditionBean() { - return SuggestElevateWordToLabelCB.class; + protected Class typeOfHandlingConditionBean() { + return BadWordCB.class; } - public ListResultBean selectList(CBCall cbLambda) { + public ListResultBean selectList(CBCall cbLambda) { return facadeSelectList(createCB(cbLambda)); } - public PagingResultBean selectPage(CBCall cbLambda) { + public PagingResultBean selectPage(CBCall cbLambda) { // #pending same? - return (PagingResultBean) facadeSelectList(createCB(cbLambda)); + return (PagingResultBean) facadeSelectList(createCB(cbLambda)); } - public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { + public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { facadeSelectCursor(createCB(cbLambda), entityLambda); } - public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { + public void selectBulk(CBCall cbLambda, EntityRowHandler> 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 opLambda) { + public void insert(BadWord entity, RequestOptionCall 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 opLambda) { + public void update(BadWord entity, RequestOptionCall 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 opLambda) { + public void insertOrUpdate(BadWord entity, RequestOptionCall 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 opLambda) { + public void delete(BadWord entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().deleteOption(opLambda); } doDelete(entity, null); } - public int queryDelete(CBCall cbLambda) { + public int queryDelete(CBCall cbLambda) { return doQueryDelete(createCB(cbLambda), null); } - public int[] batchInsert(List list) { + public int[] batchInsert(List list) { return batchInsert(list, null); } - public int[] batchInsert(List list, RequestOptionCall call) { + public int[] batchInsert(List list, RequestOptionCall call) { return doBatchInsert(new BulkList<>(list, call), null); } - public int[] batchUpdate(List list) { + public int[] batchUpdate(List list) { return batchUpdate(list, null); } - public int[] batchUpdate(List list, RequestOptionCall call) { + public int[] batchUpdate(List list, RequestOptionCall call) { return doBatchUpdate(new BulkList<>(list, call), null); } - public int[] batchDelete(List list) { + public int[] batchDelete(List list) { return batchDelete(list, null); } - public int[] batchDelete(List list, RequestOptionCall call) { + public int[] batchDelete(List list, RequestOptionCall call) { return doBatchDelete(new BulkList<>(list, call), null); } diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java similarity index 62% rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java rename to src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java index d42f3a6ec..8f3dedd84 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java +++ b/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 { +public abstract class BsElevateWordBhv extends EsAbstractBehavior { // =================================================================================== // Control Override @@ -57,25 +57,27 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { + protected RESULT createEntity(Map source, Class 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 cbLambda) { + public int selectCount(CBCall cbLambda) { return facadeSelectCount(createCB(cbLambda)); } - public OptionalEntity selectEntity(CBCall cbLambda) { + public OptionalEntity selectEntity(CBCall cbLambda) { return facadeSelectEntity(createCB(cbLambda)); } - protected OptionalEntity facadeSelectEntity(SuggestBadWordCB cb) { + protected OptionalEntity facadeSelectEntity(ElevateWordCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(SuggestBadWordCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(ElevateWordCB cb, Class 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 cbLambda) { + public ElevateWord selectEntityWithDeletedCheck(CBCall cbLambda) { return facadeSelectEntityWithDeletedCheck(createCB(cbLambda)); } - public OptionalEntity selectByPK(String id) { + public OptionalEntity selectByPK(String id) { return facadeSelectByPK(id); } - protected OptionalEntity facadeSelectByPK(String id) { + protected OptionalEntity facadeSelectByPK(String id) { return doSelectOptionalByPK(id, typeOfSelectedEntity()); } - protected ENTITY doSelectByPK(String id, Class tp) { + protected ENTITY doSelectByPK(String id, Class tp) { return doSelectEntity(xprepareCBAsPK(id), tp); } - protected SuggestBadWordCB xprepareCBAsPK(String id) { + protected ElevateWordCB xprepareCBAsPK(String id) { assertObjectNotNull("id", id); return newConditionBean().acceptPK(id); } - protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { + protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { return createOptionalEntity(doSelectByPK(id, tp), id); } @Override - protected Class typeOfSelectedEntity() { - return SuggestBadWord.class; + protected Class typeOfSelectedEntity() { + return ElevateWord.class; } @Override - protected Class typeOfHandlingEntity() { - return SuggestBadWord.class; + protected Class typeOfHandlingEntity() { + return ElevateWord.class; } @Override - protected Class typeOfHandlingConditionBean() { - return SuggestBadWordCB.class; + protected Class typeOfHandlingConditionBean() { + return ElevateWordCB.class; } - public ListResultBean selectList(CBCall cbLambda) { + public ListResultBean selectList(CBCall cbLambda) { return facadeSelectList(createCB(cbLambda)); } - public PagingResultBean selectPage(CBCall cbLambda) { + public PagingResultBean selectPage(CBCall cbLambda) { // #pending same? - return (PagingResultBean) facadeSelectList(createCB(cbLambda)); + return (PagingResultBean) facadeSelectList(createCB(cbLambda)); } - public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { + public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { facadeSelectCursor(createCB(cbLambda), entityLambda); } - public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { + public void selectBulk(CBCall cbLambda, EntityRowHandler> 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 opLambda) { + public void insert(ElevateWord entity, RequestOptionCall 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 opLambda) { + public void update(ElevateWord entity, RequestOptionCall 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 opLambda) { + public void insertOrUpdate(ElevateWord entity, RequestOptionCall 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 opLambda) { + public void delete(ElevateWord entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().deleteOption(opLambda); } doDelete(entity, null); } - public int queryDelete(CBCall cbLambda) { + public int queryDelete(CBCall cbLambda) { return doQueryDelete(createCB(cbLambda), null); } - public int[] batchInsert(List list) { + public int[] batchInsert(List list) { return batchInsert(list, null); } - public int[] batchInsert(List list, RequestOptionCall call) { + public int[] batchInsert(List list, RequestOptionCall call) { return doBatchInsert(new BulkList<>(list, call), null); } - public int[] batchUpdate(List list) { + public int[] batchUpdate(List list) { return batchUpdate(list, null); } - public int[] batchUpdate(List list, RequestOptionCall call) { + public int[] batchUpdate(List list, RequestOptionCall call) { return doBatchUpdate(new BulkList<>(list, call), null); } - public int[] batchDelete(List list) { + public int[] batchDelete(List list) { return batchDelete(list, null); } - public int[] batchDelete(List list, RequestOptionCall call) { + public int[] batchDelete(List list, RequestOptionCall call) { return doBatchDelete(new BulkList<>(list, call), null); } diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java similarity index 60% rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java rename to src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java index 4f7a2b1ef..c508738e1 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java +++ b/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 { +public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior { // =================================================================================== // Control Override @@ -57,32 +57,25 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { + protected RESULT createEntity(Map source, Class 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 cbLambda) { + public int selectCount(CBCall cbLambda) { return facadeSelectCount(createCB(cbLambda)); } - public OptionalEntity selectEntity(CBCall cbLambda) { + public OptionalEntity selectEntity(CBCall cbLambda) { return facadeSelectEntity(createCB(cbLambda)); } - protected OptionalEntity facadeSelectEntity(SuggestElevateWordCB cb) { + protected OptionalEntity facadeSelectEntity(ElevateWordToLabelCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(SuggestElevateWordCB cb, + protected OptionalEntity doSelectOptionalEntity(ElevateWordToLabelCB cb, Class 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 cbLambda) { + public ElevateWordToLabel selectEntityWithDeletedCheck(CBCall cbLambda) { return facadeSelectEntityWithDeletedCheck(createCB(cbLambda)); } - public OptionalEntity selectByPK(String id) { + public OptionalEntity selectByPK(String id) { return facadeSelectByPK(id); } - protected OptionalEntity facadeSelectByPK(String id) { + protected OptionalEntity facadeSelectByPK(String id) { return doSelectOptionalByPK(id, typeOfSelectedEntity()); } - protected ENTITY doSelectByPK(String id, Class tp) { + protected ENTITY doSelectByPK(String id, Class tp) { return doSelectEntity(xprepareCBAsPK(id), tp); } - protected SuggestElevateWordCB xprepareCBAsPK(String id) { + protected ElevateWordToLabelCB xprepareCBAsPK(String id) { assertObjectNotNull("id", id); return newConditionBean().acceptPK(id); } - protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { + protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { return createOptionalEntity(doSelectByPK(id, tp), id); } @Override - protected Class typeOfSelectedEntity() { - return SuggestElevateWord.class; + protected Class typeOfSelectedEntity() { + return ElevateWordToLabel.class; } @Override - protected Class typeOfHandlingEntity() { - return SuggestElevateWord.class; + protected Class typeOfHandlingEntity() { + return ElevateWordToLabel.class; } @Override - protected Class typeOfHandlingConditionBean() { - return SuggestElevateWordCB.class; + protected Class typeOfHandlingConditionBean() { + return ElevateWordToLabelCB.class; } - public ListResultBean selectList(CBCall cbLambda) { + public ListResultBean selectList(CBCall cbLambda) { return facadeSelectList(createCB(cbLambda)); } - public PagingResultBean selectPage(CBCall cbLambda) { + public PagingResultBean selectPage(CBCall cbLambda) { // #pending same? - return (PagingResultBean) facadeSelectList(createCB(cbLambda)); + return (PagingResultBean) facadeSelectList(createCB(cbLambda)); } - public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { + public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { facadeSelectCursor(createCB(cbLambda), entityLambda); } - public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { + public void selectBulk(CBCall cbLambda, EntityRowHandler> 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 opLambda) { + public void insert(ElevateWordToLabel entity, RequestOptionCall 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 opLambda) { + public void update(ElevateWordToLabel entity, RequestOptionCall 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 opLambda) { + public void insertOrUpdate(ElevateWordToLabel entity, RequestOptionCall 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 opLambda) { + public void delete(ElevateWordToLabel entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().deleteOption(opLambda); } doDelete(entity, null); } - public int queryDelete(CBCall cbLambda) { + public int queryDelete(CBCall cbLambda) { return doQueryDelete(createCB(cbLambda), null); } - public int[] batchInsert(List list) { + public int[] batchInsert(List list) { return batchInsert(list, null); } - public int[] batchInsert(List list, RequestOptionCall call) { + public int[] batchInsert(List list, RequestOptionCall call) { return doBatchInsert(new BulkList<>(list, call), null); } - public int[] batchUpdate(List list) { + public int[] batchUpdate(List list) { return batchUpdate(list, null); } - public int[] batchUpdate(List list, RequestOptionCall call) { + public int[] batchUpdate(List list, RequestOptionCall call) { return doBatchUpdate(new BulkList<>(list, call), null); } - public int[] batchDelete(List list) { + public int[] batchDelete(List list) { return batchDelete(list, null); } - public int[] batchDelete(List list, RequestOptionCall call) { + public int[] batchDelete(List list, RequestOptionCall call) { return doBatchDelete(new BulkList<>(list, call), null); } diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java similarity index 96% rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java index 88eb2e4e4..d6afe0c64 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java +++ b/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"; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java similarity index 96% rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java index 541df6042..5d12973fb 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java +++ b/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"; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java similarity index 81% rename from src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java index effc034c5..0ab1f76db 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java +++ b/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 toSource() { Map 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() { diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java similarity index 81% rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java index e76de36ac..1a5368f5a 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java +++ b/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 _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 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(); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java similarity index 79% rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java index e6f250e0d..cc3a8880c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java +++ b/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 _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 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(); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java similarity index 78% rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java index 42858f31f..efbc1aa7b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java +++ b/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 _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 ccil() { List 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 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(); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java similarity index 85% rename from src/main/java/org/codelibs/fess/es/config/cbean/SuggestBadWordCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java index 5fcb3bd15..d7c2d3e95 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestBadWordCB.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java similarity index 82% rename from src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordToLabelCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java index 5d08bd266..712b94480 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordToLabelCB.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java index fbcc2bfca..63b1b138d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/SuggestElevateWordCB.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java similarity index 87% rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java index 761350905..b8c436cbe 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java +++ b/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(); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java similarity index 86% rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java index 346246df2..7cdd429cf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java +++ b/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(); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java similarity index 82% rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java index 925331819..d30905f22 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java similarity index 85% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestBadWordCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java index 83a30771f..38a15bae4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestBadWordCQ.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java similarity index 81% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordToLabelCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java index 113f47518..0df377b9a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordToLabelCQ.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java index 2a5ee2c31..335be207c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/SuggestElevateWordCQ.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java similarity index 95% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java index cb1b2cba9..42dc3b56d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java +++ b/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 filteredLambda) { + public void filtered(FilteredCall filteredLambda) { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } - public void not(OperatorCall notLambda) { + public void not(OperatorCall notLambda) { not(notLambda, null); } - public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { - SuggestBadWordCQ notQuery = new SuggestBadWordCQ(); + public void not(OperatorCall notLambda, ConditionOptionCall 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 boolLambda) { + public void bool(BoolCall boolLambda) { bool(boolLambda, null); } - public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { - SuggestBadWordCQ mustQuery = new SuggestBadWordCQ(); - SuggestBadWordCQ shouldQuery = new SuggestBadWordCQ(); - SuggestBadWordCQ mustNotQuery = new SuggestBadWordCQ(); - SuggestBadWordCQ filterQuery = new SuggestBadWordCQ(); + public void bool(BoolCall boolLambda, ConditionOptionCall 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; } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java similarity index 95% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java index b999f8612..d42c3f79a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java +++ b/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 filteredLambda) { + public void filtered(FilteredCall filteredLambda) { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } - public void not(OperatorCall notLambda) { + public void not(OperatorCall notLambda) { not(notLambda, null); } - public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { - SuggestElevateWordCQ notQuery = new SuggestElevateWordCQ(); + public void not(OperatorCall notLambda, ConditionOptionCall 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 boolLambda) { + public void bool(BoolCall boolLambda) { bool(boolLambda, null); } - public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { - SuggestElevateWordCQ mustQuery = new SuggestElevateWordCQ(); - SuggestElevateWordCQ shouldQuery = new SuggestElevateWordCQ(); - SuggestElevateWordCQ mustNotQuery = new SuggestElevateWordCQ(); - SuggestElevateWordCQ filterQuery = new SuggestElevateWordCQ(); + public void bool(BoolCall boolLambda, ConditionOptionCall 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; } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java similarity index 63% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java index 7c47ad004..f1ac4e890 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java +++ b/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 filteredLambda) { + public void filtered(FilteredCall filteredLambda) { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } - public void not(OperatorCall notLambda) { + public void not(OperatorCall notLambda) { not(notLambda, null); } - public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { - SuggestElevateWordToLabelCQ notQuery = new SuggestElevateWordToLabelCQ(); + public void not(OperatorCall notLambda, ConditionOptionCall 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 boolLambda) { + public void bool(BoolCall boolLambda) { bool(boolLambda, null); } - public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { - SuggestElevateWordToLabelCQ mustQuery = new SuggestElevateWordToLabelCQ(); - SuggestElevateWordToLabelCQ shouldQuery = new SuggestElevateWordToLabelCQ(); - SuggestElevateWordToLabelCQ mustNotQuery = new SuggestElevateWordToLabelCQ(); - SuggestElevateWordToLabelCQ filterQuery = new SuggestElevateWordToLabelCQ(); + public void bool(BoolCall boolLambda, ConditionOptionCall 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 opLambda) { - setSuggestElevateWordId_Term(suggestElevateWordId, opLambda); + public void setElevateWordId_Equal(String elevateWordId, ConditionOptionCall 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 opLambda) { - TermQueryBuilder builder = regTermQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_Term(String elevateWordId, ConditionOptionCall 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 opLambda) { - setSuggestElevateWordId_NotTerm(suggestElevateWordId, opLambda); + public void setElevateWordId_NotEqual(String elevateWordId, ConditionOptionCall 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 opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestElevateWordId", suggestElevateWordId)); + public void setElevateWordId_NotTerm(String elevateWordId, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("elevateWordId", elevateWordId)); if (opLambda != null) { opLambda.callback(builder); } } - public void setSuggestElevateWordId_Terms(Collection suggestElevateWordIdList) { - setSuggestElevateWordId_Terms(suggestElevateWordIdList, null); + public void setElevateWordId_Terms(Collection elevateWordIdList) { + setElevateWordId_Terms(elevateWordIdList, null); } - public void setSuggestElevateWordId_Terms(Collection suggestElevateWordIdList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("suggestElevateWordId", suggestElevateWordIdList); + public void setElevateWordId_Terms(Collection elevateWordIdList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("elevateWordId", elevateWordIdList); if (opLambda != null) { opLambda.callback(builder); } } - public void setSuggestElevateWordId_InScope(Collection suggestElevateWordIdList) { - setSuggestElevateWordId_Terms(suggestElevateWordIdList, null); + public void setElevateWordId_InScope(Collection elevateWordIdList) { + setElevateWordId_Terms(elevateWordIdList, null); } - public void setSuggestElevateWordId_InScope(Collection suggestElevateWordIdList, ConditionOptionCall opLambda) { - setSuggestElevateWordId_Terms(suggestElevateWordIdList, opLambda); + public void setElevateWordId_InScope(Collection elevateWordIdList, ConditionOptionCall 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 opLambda) { - MatchQueryBuilder builder = regMatchQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_Match(String elevateWordId, ConditionOptionCall 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 opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_MatchPhrase(String elevateWordId, ConditionOptionCall 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 opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_MatchPhrasePrefix(String elevateWordId, ConditionOptionCall 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 opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_Fuzzy(String elevateWordId, ConditionOptionCall 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 opLambda) { - PrefixQueryBuilder builder = regPrefixQ("suggestElevateWordId", suggestElevateWordId); + public void setElevateWordId_Prefix(String elevateWordId, ConditionOptionCall 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 opLambda) { - RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_GREATER_THAN, suggestElevateWordId); + public void setElevateWordId_GreaterThan(String elevateWordId, ConditionOptionCall 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 opLambda) { - RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_LESS_THAN, suggestElevateWordId); + public void setElevateWordId_LessThan(String elevateWordId, ConditionOptionCall 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 opLambda) { - RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_GREATER_EQUAL, suggestElevateWordId); + public void setElevateWordId_GreaterEqual(String elevateWordId, ConditionOptionCall 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 opLambda) { - RangeQueryBuilder builder = regRangeQ("suggestElevateWordId", ConditionKey.CK_LESS_EQUAL, suggestElevateWordId); + public void setElevateWordId_LessEqual(String elevateWordId, ConditionOptionCall 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; } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/exbhv/SuggestBadWordBhv.java rename to src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java index 1787ff09e..be19a22af 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestBadWordBhv.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java similarity index 81% rename from src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordToLabelBhv.java rename to src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java index 15d56f93c..dee337f01 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordToLabelBhv.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordBhv.java rename to src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java index b86b9e0ad..3ae7a2a79 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/SuggestElevateWordBhv.java +++ b/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 { } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java similarity index 88% rename from src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java rename to src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java index 5d17b9ee0..b3b68073f 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java similarity index 95% rename from src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java rename to src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java index b75c14b91..878e92d61 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java similarity index 86% rename from src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWordToLabel.java rename to src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java index 5bd1fa25d..7f1cc6d2c 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWordToLabel.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index a85576377..6431843ff 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/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 list = suggestElevateWordBhv.selectList(cb -> { + final List 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 list = suggestElevateWordBhv.selectList(cb -> { + final List 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 list = suggestBadWordBhv.selectList(cb -> { + final List 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); } } diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 2a0f5d953..ce8b55962 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/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}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index 45c020991..b5bb45d34 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/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. * 
      * message: Uploaded Additional Word file.
      *
* @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. * 
      * message: Uploaded Bad Word file.
      *
* @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; } diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml index 11c612349..6d7ad49e0 100644 --- a/src/main/resources/esclient.xml +++ b/src/main/resources/esclient.xml @@ -88,13 +88,13 @@ ".fess_config/scheduled_job" - ".fess_config/suggest_bad_word" + ".fess_config/bad_word" - ".fess_config/suggest_elevate_word" + ".fess_config/elevate_word" - ".fess_config/suggest_elevate_word_to_label" + ".fess_config/elevate_word_to_label" ".fess_config/web_authentication" diff --git a/src/main/resources/esflute_config.xml b/src/main/resources/esflute_config.xml index b9a5f9fd8..f489a6970 100644 --- a/src/main/resources/esflute_config.xml +++ b/src/main/resources/esflute_config.xml @@ -25,9 +25,9 @@ - - - + + + diff --git a/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json b/src/main/resources/fess_indices/.fess_config/bad_word.json similarity index 96% rename from src/main/resources/fess_indices/.fess_config/suggest_bad_word.json rename to src/main/resources/fess_indices/.fess_config/bad_word.json index b959e7ebc..e7490f3b0 100644 --- a/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json +++ b/src/main/resources/fess_indices/.fess_config/bad_word.json @@ -1,5 +1,5 @@ { - "suggest_bad_word": { + "bad_word": { "_source": { "enabled": true }, diff --git a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json b/src/main/resources/fess_indices/.fess_config/elevate_word.json similarity index 96% rename from src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json rename to src/main/resources/fess_indices/.fess_config/elevate_word.json index 898b9b75f..e06f18d3c 100644 --- a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json +++ b/src/main/resources/fess_indices/.fess_config/elevate_word.json @@ -1,5 +1,5 @@ { - "suggest_elevate_word": { + "elevate_word": { "_source": { "enabled": true }, diff --git a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word_to_label.json b/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json similarity index 80% rename from src/main/resources/fess_indices/.fess_config/suggest_elevate_word_to_label.json rename to src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json index 9628016ac..3b858c052 100644 --- a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word_to_label.json +++ b/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" }, diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index f28d89ad0..b4f88e104 100644 --- a/src/main/resources/fess_label.properties +++ b/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 diff --git a/src/main/resources/fess_message.properties b/src/main/resources/fess_message.properties index 289203496..3bf3ac9a9 100644 --- a/src/main/resources/fess_message.properties +++ b/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. diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp index 1ca169b1e..660587f7b 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_bad_word_configuration" /> + key="labels.bad_word_configuration" /> @@ -11,16 +11,16 @@ - +

- +

  1. - +
@@ -30,26 +30,26 @@

- +

- + - + - + - +
@@ -63,7 +63,7 @@
<%-- List --%> - +
@@ -71,19 +71,19 @@
- +
+ key="labels.bad_word_list_suggest_word" /> + items="${badWordItems}"> @@ -93,7 +93,7 @@
${f:h(data.suggestWord)}
- diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp index 13a81eed4..1f5efa0d8 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_bad_word_configuration" /> + key="labels.bad_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.bad_word_link_details" />
@@ -43,43 +43,43 @@

+ key="labels.bad_word_link_create" /> - + + key="labels.bad_word_link_delete" /> + key="labels.bad_word_link_details" />

- + + key="labels.bad_word_link_create" /> + key="labels.bad_word_link_download" /> + key="labels.bad_word_link_upload" />
@@ -97,7 +97,7 @@ + key="labels.bad_word_suggest_word" /> ${f:h(suggestWord)} diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp index fa53f4820..866a0b413 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_bad_word_configuration" /> + key="labels.bad_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.bad_word_link_download" />
@@ -33,28 +33,28 @@

- +

- + - + - + - +
@@ -69,15 +69,15 @@
+ key="labels.bad_word_file" />
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp index 3e92695b8..1f66ea736 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_bad_word_configuration" /> + key="labels.bad_word_configuration" /> @@ -11,24 +11,24 @@ - +

- +

  1. - +
    3. + key="labels.bad_word_link_create" />
    4. + key="labels.bad_word_link_edit" />
@@ -49,35 +49,35 @@

+ key="labels.bad_word_link_create" /> - +

- + + key="labels.bad_word_link_create" /> + key="labels.bad_word_link_download" /> + key="labels.bad_word_link_upload" />
@@ -91,7 +91,7 @@
+ key="labels.bad_word_suggest_word" />
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp index 780c4fbc8..4f8a11fe9 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_bad_word_configuration" /> + key="labels.bad_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.bad_word_link_upload" />
@@ -32,28 +32,28 @@

- +

- + - + - + - +
@@ -71,17 +71,17 @@ - + key="labels.bad_word_file" /> + diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp index 572598e4d..2d80723ce 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_elevate_word_configuration" /> + key="labels.elevate_word_configuration" /> @@ -11,16 +11,16 @@ - +

- +

  1. - +
@@ -30,26 +30,26 @@

- +

- + - + - + - +
@@ -63,7 +63,7 @@
<%-- List --%> - +
@@ -71,19 +71,19 @@
- +
+ key="labels.elevate_word_list_suggest_word" /> + items="${elevateWordItems}"> @@ -93,7 +93,7 @@
${f:h(data.suggestWord)}
- diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp index 67c14a311..50a160215 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_elevate_word_configuration" /> + key="labels.elevate_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.elevate_word_link_details" />
@@ -42,38 +42,38 @@

- + - + - + - +

- + - + - + - +
@@ -91,18 +91,18 @@ + key="labels.elevate_word_suggest_word" /> ${f:h(suggestWord)} + key="labels.elevate_word_reading" /> ${f:h(reading)} + key="labels.elevate_word_target_role" /> ${f:h(targetRole)} @@ -118,7 +118,7 @@ - + ${f:h(boost)} diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp index 7b2f41ade..03ed61649 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_elevate_word_configuration" /> + key="labels.elevate_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.elevate_word_link_download" />
@@ -34,28 +34,28 @@ <%-- Box Header --%>

- +

- + - + - + - +
@@ -70,15 +70,15 @@
+ key="labels.elevate_word_file" />
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp index bb9235aa0..0fd14200b 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_elevate_word_configuration" /> + key="labels.elevate_word_configuration" /> @@ -11,24 +11,24 @@ - +

- +

  1. - +
    3. + key="labels.elevate_word_link_create" />
    4. + key="labels.elevate_word_link_edit" />
@@ -48,32 +48,32 @@

- + - +

- + - + - + - +
@@ -87,7 +87,7 @@
+ key="labels.elevate_word_suggest_word" />
@@ -95,7 +95,7 @@
+ key="labels.elevate_word_reading" />
@@ -103,7 +103,7 @@
+ key="labels.elevate_word_target_role" />
@@ -124,7 +124,7 @@
+ key="labels.elevate_word_boost" />
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp index d30591c03..85e7597d1 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.suggest_elevate_word_configuration" /> + key="labels.elevate_word_configuration" /> @@ -11,19 +11,19 @@ - +

- +

  1. - +
    3. + key="labels.elevate_word_link_upload" />
@@ -32,28 +32,28 @@

- +

- + - + - + - +
@@ -72,18 +72,18 @@ - + key="labels.elevate_word_file" /> + diff --git a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp index 445918139..162623bdb 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp @@ -196,17 +196,17 @@
  • class="active">class="active"> - +
  • class="active">class="active"> - +
diff --git a/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java b/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java new file mode 100644 index 000000000..e4c75a597 --- /dev/null +++ b/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[] synonymFiles = dictionaryManager.getDictionaryFiles(); + assertEquals(1, synonymFiles.length); + */ + } + +} diff --git a/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java b/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java new file mode 100644 index 000000000..58996fc05 --- /dev/null +++ b/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 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 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()); + */ + } + +} diff --git a/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java b/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java new file mode 100644 index 000000000..ae19ef8a7 --- /dev/null +++ b/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()); + } +}