diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json index a4ad5a0c9..2669a8bb2 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 }, 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/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/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/es/config/bsbhv/BsSuggestBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.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/BsBadWordBhv.java index d42f3a6ec..ef2d22ecf 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.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.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.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 BsSuggestBadWordBhv extends EsAbstractBehavior { +public abstract class BsBadWordBhv extends EsAbstractBehavior { // =================================================================================== // Control Override @@ -57,21 +57,21 @@ 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.setCreatedBy(DfTypeUtil.toString(source.get("createdBy"))); @@ -91,25 +91,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(BadWordCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(SuggestBadWordCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(BadWordCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @Override - public SuggestBadWordCB newConditionBean() { - return new SuggestBadWordCB(); + public BadWordCB newConditionBean() { + return new BadWordCB(); } @Override @@ -117,135 +117,135 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior 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 SuggestBadWordCB 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 SuggestBadWord.class; + protected Class typeOfSelectedEntity() { + return BadWord.class; } @Override - protected Class typeOfHandlingEntity() { - return SuggestBadWord.class; + protected Class typeOfHandlingEntity() { + return BadWord.class; } @Override - protected Class typeOfHandlingConditionBean() { - return SuggestBadWordCB.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(SuggestBadWord entity) { + public void insert(BadWord entity) { doInsert(entity, null); } - public void insert(SuggestBadWord entity, RequestOptionCall opLambda) { + public void insert(BadWord entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doInsert(entity, null); } - public void update(SuggestBadWord entity) { + public void update(BadWord entity) { doUpdate(entity, null); } - public void update(SuggestBadWord entity, RequestOptionCall opLambda) { + public void update(BadWord entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doUpdate(entity, null); } - public void insertOrUpdate(SuggestBadWord entity) { + public void insertOrUpdate(BadWord entity) { doInsertOrUpdate(entity, null, null); } - public void insertOrUpdate(SuggestBadWord 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(SuggestBadWord entity) { + public void delete(BadWord entity) { doDelete(entity, null); } - public void delete(SuggestBadWord 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/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/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/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/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/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/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/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/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/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index a85576377..46997941f 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -29,9 +29,9 @@ 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.BadWordBhv; import org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv; -import org.codelibs.fess.es.config.exentity.SuggestBadWord; +import org.codelibs.fess.es.config.exentity.BadWord; import org.codelibs.fess.es.config.exentity.SuggestElevateWord; import org.codelibs.fess.es.log.exentity.SearchFieldLog; import org.codelibs.fess.es.log.exentity.SearchLog; @@ -57,7 +57,7 @@ public class SuggestHelper { protected SuggestElevateWordBhv suggestElevateWordBhv; @Resource - protected SuggestBadWordBhv suggestBadWordBhv; + protected BadWordBhv badWordBhv; @Resource protected FessEsClient fessEsClient; @@ -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..79ae6c7e7 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -507,7 +507,7 @@ public class FessLabels extends ActionMessages { public static final String LABELS_SUGGEST_ELEVATE_WORD_FILE = "{labels.suggestElevateWordFile}"; /** The key of the message: Bad Word File */ - public static final String LABELS_SUGGEST_BAD_WORD_FILE = "{labels.suggestBadWordFile}"; + public static final String LABELS_SUGGEST_BAD_WORD_FILE = "{labels.badWordFile}"; /** The key of the message: System */ public static final String LABELS_menu_system = "{labels.menu_system}"; @@ -588,7 +588,7 @@ public class FessLabels extends ActionMessages { public static final String LABELS_menu_suggest_elevate_word = "{labels.menu_suggest_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}"; @@ -1834,46 +1834,46 @@ public class FessLabels extends ActionMessages { public static final String LABELS_suggest_elevate_word_file = "{labels.suggest_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..071e68ede 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -330,7 +330,7 @@ public class FessMessages extends FessLabels { public static final String SUCCESS_upload_suggest_elevate_word = "{success.upload_suggest_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}"; @@ -1834,16 +1834,16 @@ public class FessMessages extends FessLabels { } /** - * 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..c6d3be73b 100644 --- a/src/main/resources/esclient.xml +++ b/src/main/resources/esclient.xml @@ -88,7 +88,7 @@ ".fess_config/scheduled_job" - ".fess_config/suggest_bad_word" + ".fess_config/bad_word" ".fess_config/suggest_elevate_word" diff --git a/src/main/resources/esflute_config.xml b/src/main/resources/esflute_config.xml index b9a5f9fd8..8e0b5058f 100644 --- a/src/main/resources/esflute_config.xml +++ b/src/main/resources/esflute_config.xml @@ -25,7 +25,7 @@ - + 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_label.properties b/src/main/resources/fess_label.properties index f28d89ad0..799a30608 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -161,7 +161,7 @@ labels.token=Token labels.synonymFile=Synonym File labels.userDictFile=Kuromoji File labels.suggestElevateWordFile=Additional Word File -labels.suggestBadWordFile=Bad Word File +labels.badWordFile=Bad Word File labels.menu_system=System labels.menu_wizard=Wizard @@ -189,7 +189,7 @@ 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_bad_word=Bad Word labels.menu_system_log=System Info labels.menu_system_info=Config Info labels.menu_crawling_info=Crawling Info @@ -608,20 +608,20 @@ 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.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..4b6d41536 100644 --- a/src/main/resources/fess_message.properties +++ b/src/main/resources/fess_message.properties @@ -134,7 +134,7 @@ 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_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/common/admin/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp index 445918139..5a8dbe60e 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp @@ -203,10 +203,10 @@
  • class="active">class="active"> - +