0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename: SuggestBadWord -> BadWord

Browse source
This commit is contained in:
Keiichi Watanabe 2015-12-07 15:14:56 +09:00
parent 3e506364af
commit c5d5bb17ef
28 changed files with 332 additions and 332 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/config/es/fess_config.json
View file

@ -392,7 +392,7 @@
}
}
},
"suggest_bad_word" : {
"bad_word" : {
"_all" : {
"enabled" : false
},

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

@ -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();
}

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

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

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

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

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

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

94
src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java → src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
View file

@ -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<SuggestBadWord, SuggestBadWordCB> {
public abstract class BsBadWordBhv extends EsAbstractBehavior<BadWord, BadWordCB> {
// ===================================================================================
// Control Override
@ -57,21 +57,21 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
@Override
public String asEsIndexType() {
return "suggest_bad_word";
return "bad_word";
}
@Override
public String asEsSearchType() {
return "suggest_bad_word";
return "bad_word";
}
@Override
public SuggestBadWordDbm asDBMeta() {
return SuggestBadWordDbm.getInstance();
public BadWordDbm asDBMeta() {
return BadWordDbm.getInstance();
}
@Override
protected <RESULT extends SuggestBadWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
protected <RESULT extends BadWord> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
try {
final RESULT result = entityType.newInstance();
result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
@ -91,25 +91,25 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
// ===================================================================================
// Select
// ======
public int selectCount(CBCall<SuggestBadWordCB> cbLambda) {
public int selectCount(CBCall<BadWordCB> cbLambda) {
return facadeSelectCount(createCB(cbLambda));
}
public OptionalEntity<SuggestBadWord> selectEntity(CBCall<SuggestBadWordCB> cbLambda) {
public OptionalEntity<BadWord> selectEntity(CBCall<BadWordCB> cbLambda) {
return facadeSelectEntity(createCB(cbLambda));
}
protected OptionalEntity<SuggestBadWord> facadeSelectEntity(SuggestBadWordCB cb) {
protected OptionalEntity<BadWord> facadeSelectEntity(BadWordCB cb) {
return doSelectOptionalEntity(cb, typeOfSelectedEntity());
}
protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestBadWordCB cb, Class<? extends ENTITY> tp) {
protected <ENTITY extends BadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(BadWordCB cb, Class<? extends ENTITY> tp) {
return createOptionalEntity(doSelectEntity(cb, tp), cb);
}
@Override
public SuggestBadWordCB newConditionBean() {
return new SuggestBadWordCB();
public BadWordCB newConditionBean() {
return new BadWordCB();
}
@Override
@ -117,135 +117,135 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
return facadeSelectEntity(downcast(cb)).orElse(null);
}
public SuggestBadWord selectEntityWithDeletedCheck(CBCall<SuggestBadWordCB> cbLambda) {
public BadWord selectEntityWithDeletedCheck(CBCall<BadWordCB> cbLambda) {
return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
}
public OptionalEntity<SuggestBadWord> selectByPK(String id) {
public OptionalEntity<BadWord> selectByPK(String id) {
return facadeSelectByPK(id);
}
protected OptionalEntity<SuggestBadWord> facadeSelectByPK(String id) {
protected OptionalEntity<BadWord> facadeSelectByPK(String id) {
return doSelectOptionalByPK(id, typeOfSelectedEntity());
}
protected <ENTITY extends SuggestBadWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
protected <ENTITY extends BadWord> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
return doSelectEntity(xprepareCBAsPK(id), tp);
}
protected SuggestBadWordCB xprepareCBAsPK(String id) {
protected BadWordCB xprepareCBAsPK(String id) {
assertObjectNotNull("id", id);
return newConditionBean().acceptPK(id);
}
protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
protected <ENTITY extends BadWord> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
return createOptionalEntity(doSelectByPK(id, tp), id);
}
@Override
protected Class<? extends SuggestBadWord> typeOfSelectedEntity() {
return SuggestBadWord.class;
protected Class<? extends BadWord> typeOfSelectedEntity() {
return BadWord.class;
}
@Override
protected Class<SuggestBadWord> typeOfHandlingEntity() {
return SuggestBadWord.class;
protected Class<BadWord> typeOfHandlingEntity() {
return BadWord.class;
}
@Override
protected Class<SuggestBadWordCB> typeOfHandlingConditionBean() {
return SuggestBadWordCB.class;
protected Class<BadWordCB> typeOfHandlingConditionBean() {
return BadWordCB.class;
}
public ListResultBean<SuggestBadWord> selectList(CBCall<SuggestBadWordCB> cbLambda) {
public ListResultBean<BadWord> selectList(CBCall<BadWordCB> cbLambda) {
return facadeSelectList(createCB(cbLambda));
}
public PagingResultBean<SuggestBadWord> selectPage(CBCall<SuggestBadWordCB> cbLambda) {
public PagingResultBean<BadWord> selectPage(CBCall<BadWordCB> cbLambda) {
// #pending same?
return (PagingResultBean<SuggestBadWord>) facadeSelectList(createCB(cbLambda));
return (PagingResultBean<BadWord>) facadeSelectList(createCB(cbLambda));
}
public void selectCursor(CBCall<SuggestBadWordCB> cbLambda, EntityRowHandler<SuggestBadWord> entityLambda) {
public void selectCursor(CBCall<BadWordCB> cbLambda, EntityRowHandler<BadWord> entityLambda) {
facadeSelectCursor(createCB(cbLambda), entityLambda);
}
public void selectBulk(CBCall<SuggestBadWordCB> cbLambda, EntityRowHandler<List<SuggestBadWord>> entityLambda) {
public void selectBulk(CBCall<BadWordCB> cbLambda, EntityRowHandler<List<BadWord>> 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<IndexRequestBuilder> opLambda) {
public void insert(BadWord entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
public void update(BadWord entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
public void insertOrUpdate(BadWord entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
if (entity instanceof EsAbstractEntity) {
entity.asDocMeta().indexOption(opLambda);
}
doInsertOrUpdate(entity, null, null);
}
public void delete(SuggestBadWord entity) {
public void delete(BadWord entity) {
doDelete(entity, null);
}
public void delete(SuggestBadWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
public void delete(BadWord entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
if (entity instanceof EsAbstractEntity) {
entity.asDocMeta().deleteOption(opLambda);
}
doDelete(entity, null);
}
public int queryDelete(CBCall<SuggestBadWordCB> cbLambda) {
public int queryDelete(CBCall<BadWordCB> cbLambda) {
return doQueryDelete(createCB(cbLambda), null);
}
public int[] batchInsert(List<SuggestBadWord> list) {
public int[] batchInsert(List<BadWord> list) {
return batchInsert(list, null);
}
public int[] batchInsert(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
public int[] batchInsert(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
return doBatchInsert(new BulkList<>(list, call), null);
}
public int[] batchUpdate(List<SuggestBadWord> list) {
public int[] batchUpdate(List<BadWord> list) {
return batchUpdate(list, null);
}
public int[] batchUpdate(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
public int[] batchUpdate(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
return doBatchUpdate(new BulkList<>(list, call), null);
}
public int[] batchDelete(List<SuggestBadWord> list) {
public int[] batchDelete(List<BadWord> list) {
return batchDelete(list, null);
}
public int[] batchDelete(List<SuggestBadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
public int[] batchDelete(List<BadWord> list, RequestOptionCall<BulkRequestBuilder> call) {
return doBatchDelete(new BulkList<>(list, call), null);
}

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

@ -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";
}
// ===================================================================================

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

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

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

@ -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 {
}

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

@ -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();
}
// ===================================================================================

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

@ -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 {
}

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

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

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

@ -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 {
}

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

@ -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;

12
src/main/java/org/codelibs/fess/helper/SuggestHelper.java
View file

@ -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<SuggestBadWord> list = suggestBadWordBhv.selectList(cb -> {
final List<BadWord> list = badWordBhv.selectList(cb -> {
cb.query().matchAll();
});
for (final SuggestBadWord suggestBadWord : list) {
final String word = suggestBadWord.getSuggestWord();
for (final BadWord badWord : list) {
final String word = badWord.getSuggestWord();
suggester.indexer().addBadWord(word);
}
}

32
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -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}";

8
src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java
View file

@ -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.
* <pre>
* message: Uploaded Bad Word file.
* </pre>
* @param property The property name for the message. (NotNull)
* @return this. (NotNull)
*/
public FessMessages addSuccessUploadSuggestBadWord(String property) {
public FessMessages addSuccessUploadBadWord(String property) {
assertPropertyNotNull(property);
add(property, new ActionMessage(SUCCESS_upload_suggest_bad_word));
add(property, new ActionMessage(SUCCESS_upload_bad_word));
return this;
}

2
src/main/resources/esclient.xml
View file

@ -88,7 +88,7 @@
<arg>".fess_config/scheduled_job"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config/suggest_bad_word"</arg>
<arg>".fess_config/bad_word"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config/suggest_elevate_word"</arg>

2
src/main/resources/esflute_config.xml
View file

@ -25,7 +25,7 @@
<component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
<component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>
<component name="scheduledJobBhv" class="org.codelibs.fess.es.config.exbhv.ScheduledJobBhv"/>
<component name="suggestBadWordBhv" class="org.codelibs.fess.es.config.exbhv.SuggestBadWordBhv"/>
<component name="badWordBhv" class="org.codelibs.fess.es.config.exbhv.BadWordBhv"/>
<component name="suggestElevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.SuggestElevateWordToLabelBhv"/>
<component name="suggestElevateWordBhv" class="org.codelibs.fess.es.config.exbhv.SuggestElevateWordBhv"/>
<component name="webAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv"/>

2
src/main/resources/fess_indices/.fess_config/suggest_bad_word.json → src/main/resources/fess_indices/.fess_config/bad_word.json
View file

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

32
src/main/resources/fess_label.properties
View file

@ -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

2
src/main/resources/fess_message.properties
View file

@ -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.

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

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

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

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

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

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

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

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

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

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

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

@ -203,10 +203,10 @@
</la:link></li>
<li
<c:if test="${param.menuType=='suggestBadWord'}">class="active"</c:if>><la:link
<c:if test="${param.menuType=='badWord'}">class="active"</c:if>><la:link
href="/admin/badword/">
<i class='fa fa-circle-o'></i>
<span><la:message key="labels.menu_suggest_bad_word" /></span>
<span><la:message key="labels.menu_bad_word" /></span>
</la:link></li>
</ul></li>