diff --git a/pom.xml b/pom.xml index a5280a14a..f8a0c7380 100644 --- a/pom.xml +++ b/pom.xml @@ -39,11 +39,11 @@ 1.1.0-sp8 - 0.6.5-RC1 + 0.6.5-RC3 0.6.0 3.1.0 2.3.1 - 0.4.3-RC1 + 0.4.3-RC2 1.7.12 @@ -281,11 +281,11 @@ + url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" /> + url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-2.0.0.0.zip" /> @@ -294,11 +294,11 @@ + src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" /> + src="${basedir}/target/plugins/elasticsearch-kopf-2.0.0.0.zip" /> @@ -440,11 +440,6 @@ fess-suggest 2.0.0-SNAPSHOT - - org.codelibs - lucene-analyzers-kuromoji-ipadic-neologd - 4.10.4-20150501 - diff --git a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java index f09a22916..2de24a392 100644 --- a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java +++ b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java @@ -68,8 +68,8 @@ public class SuggestApiManager extends BaseApiManager { final SuggestResponse suggestResponse = builder.execute().getResponse(); buf.append("\"result\":{"); - - buf.append("\"index\":\"").append(suggestResponse.getIndex()).append('\"'); + // TODO removed? + // buf.append("\"index\":\"").append(suggestResponse.getIndex()).append('\"'); buf.append(",\"took\":\"").append(suggestResponse.getTookMs()).append('\"'); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java index e76e7ff1d..3032993d0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java @@ -31,7 +31,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -109,7 +108,8 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -119,7 +119,8 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java index deec65d6b..64ea2bbee 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java @@ -28,7 +28,6 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -121,7 +120,8 @@ public class AdminCrawlingsessionAction extends FessAdminAction { // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse deletefromconfirm(final EditForm form) { form.crudMode = CrudMode.DELETE; validate(form, messages -> {}, toIndexHtml()); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index 6d563d742..09e10d04a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -39,7 +39,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -124,7 +123,8 @@ public class AdminDataconfigAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminDataconfig_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -137,7 +137,8 @@ public class AdminDataconfigAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 017839444..2740041ff 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -38,7 +38,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.ActionResponse; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.StreamResponse; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,7 +100,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { // =================================================================================== // Execute // ======= - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse index() { return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class); } @@ -188,7 +188,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse delete(final DesignForm form) { final File file = getTargetFile(form); if (file == null) { @@ -205,7 +206,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { // ----------------------------------------------------- // Edit // ------ - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final DesignEditForm form) { final String jspType = "view"; final File jspFile = getJspFile(form.fileName, jspType); @@ -217,7 +219,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { return asHtml(path_AdminDesign_AdminDesignEditJsp); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse editAsUseDefault(final DesignEditForm form) { final String jspType = "orig/view"; final File jspFile = getJspFile(form.fileName, jspType); @@ -229,7 +232,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { return asHtml(path_AdminDesign_AdminDesignEditJsp); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse update(final DesignEditForm form) { final String jspType = "view"; final File jspFile = getJspFile(form.fileName, jspType); @@ -248,7 +252,8 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { return redirect(getClass()); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse back() { return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java index 92bda5676..b991df482 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java @@ -40,7 +40,6 @@ import org.lastaflute.web.response.ActionResponse; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -128,7 +127,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew(final String dictId) { return asHtml(path_AdminDictKuromoji_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -139,7 +139,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; @@ -185,7 +186,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { // ----------------------------------------------------- // Download // ------- - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse downloadpage(final String dictId) { return asHtml(path_AdminDictKuromoji_DownloadJsp).useForm(DownloadForm.class, op -> { op.setup(form -> { @@ -200,7 +202,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public ActionResponse download(final DownloadForm form) { validate(form, messages -> {}, () -> downloadpage(form.dictId)); return kuromojiService.getKuromojiFile(form.dictId).map(file -> { @@ -216,7 +219,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { // ----------------------------------------------------- // Upload // ------- - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse uploadpage(final String dictId) { return asHtml(path_AdminDictKuromoji_UploadJsp).useForm(UploadForm.class, op -> { op.setup(form -> { @@ -231,7 +235,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse upload(final UploadForm form) { validate(form, messages -> {}, () -> uploadpage(form.dictId)); return kuromojiService.getKuromojiFile(form.dictId).map(file -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java index dbdbdb680..718998e5a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java @@ -42,7 +42,6 @@ import org.lastaflute.web.response.ActionResponse; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -130,7 +129,8 @@ public class AdminDictSynonymAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew(final String dictId) { return asHtml(path_AdminDictSynonym_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -141,7 +141,8 @@ public class AdminDictSynonymAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; @@ -189,7 +190,8 @@ public class AdminDictSynonymAction extends FessAdminAction { // Confirm // ------- - @Execute(token = TxToken.VALIDATE_KEEP) + @Execute + //(token = TxToken.VALIDATE_KEEP) public HtmlResponse confirmfromcreate(final CreateForm form) { validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.CREATE; @@ -200,7 +202,8 @@ public class AdminDictSynonymAction extends FessAdminAction { return asHtml(path_AdminDictSynonym_DetailsJsp); } - @Execute(token = TxToken.VALIDATE_KEEP) + @Execute + //(token = TxToken.VALIDATE_KEEP) public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.EDIT; @@ -214,7 +217,8 @@ public class AdminDictSynonymAction extends FessAdminAction { // ----------------------------------------------------- // Download // ------- - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse downloadpage(final String dictId) { return asHtml(path_AdminDictSynonym_DownloadJsp).useForm(DownloadForm.class, op -> { op.setup(form -> { @@ -229,7 +233,8 @@ public class AdminDictSynonymAction extends FessAdminAction { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public ActionResponse download(final DownloadForm form) { validate(form, messages -> {}, () -> downloadpage(form.dictId)); return synonymService.getSynonymFile(form.dictId).map(file -> { @@ -245,7 +250,8 @@ public class AdminDictSynonymAction extends FessAdminAction { // ----------------------------------------------------- // Upload // ------- - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse uploadpage(final String dictId) { return asHtml(path_AdminDictSynonym_UploadJsp).useForm(UploadForm.class, op -> { op.setup(form -> { @@ -260,7 +266,8 @@ public class AdminDictSynonymAction extends FessAdminAction { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse upload(final UploadForm form) { validate(form, messages -> {}, () -> uploadpage(form.dictId)); return synonymService.getSynonymFile(form.dictId).map(file -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java index 0669fc9b3..8525f24ea 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java @@ -40,7 +40,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -122,7 +121,8 @@ public class AdminFileauthenticationAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminFileauthentication_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -135,7 +135,8 @@ public class AdminFileauthenticationAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index 0e0f49ea4..229b33017 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -33,7 +33,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -116,7 +115,8 @@ public class AdminFileconfigAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminFileconfig_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -128,7 +128,8 @@ public class AdminFileconfigAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index 081da28a9..db79d4332 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -31,7 +31,6 @@ import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaRequestUtil; /** @@ -61,7 +60,8 @@ public class AdminGeneralAction extends FessAdminAction { // =================================================================================== // - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse index() { return asHtml(path_AdminGeneral_IndexJsp).useForm(EditForm.class, setup -> { setup.setup(form -> { @@ -70,7 +70,8 @@ public class AdminGeneralAction extends FessAdminAction { }); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse update(final EditForm form) { validate(form, messages -> {}, () -> { return asHtml(path_AdminGeneral_IndexJsp); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 4bdf62755..59c126b28 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -33,7 +33,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -112,7 +111,8 @@ public class AdminGroupAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminGroup_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -122,7 +122,8 @@ public class AdminGroupAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java index 122932f69..f8534494f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java @@ -27,7 +27,6 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -109,7 +108,8 @@ public class AdminJoblogAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse deletepage(final int crudMode, final String id) { verifyCrudMode(crudMode, CrudMode.DELETE); return asHtml(path_AdminJoblog_DetailsJsp).useForm(EditForm.class, op -> { @@ -126,7 +126,8 @@ public class AdminJoblogAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse deletefromconfirm(final EditForm form) { form.crudMode = CrudMode.DELETE; validate(form, messages -> {}, toIndexHtml()); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java index c2a782949..52d1c8e8f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java @@ -32,7 +32,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -111,7 +110,8 @@ public class AdminKeymatchAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminKeymatch_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -121,7 +121,8 @@ public class AdminKeymatchAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index 195fbb2bd..995bbc9f4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -32,7 +32,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -114,7 +113,8 @@ public class AdminLabeltypeAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminLabeltype_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -126,7 +126,8 @@ public class AdminLabeltypeAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java index a5ce7056e..9c8939017 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java @@ -31,7 +31,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -110,7 +109,8 @@ public class AdminOverlappinghostAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminOverlappinghost_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -120,7 +120,8 @@ public class AdminOverlappinghostAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java index 8e8754c6c..cd0dccb54 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java @@ -31,7 +31,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -111,7 +110,8 @@ public class AdminPathmappingAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminPathmapping_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -121,7 +121,8 @@ public class AdminPathmappingAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java index c273e6a37..484cab01e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java @@ -40,7 +40,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -124,7 +123,8 @@ public class AdminRequestheaderAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminRequestheader_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -137,7 +137,8 @@ public class AdminRequestheaderAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 2ab88d7b1..0374841f2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -33,7 +33,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -112,7 +111,8 @@ public class AdminRoleAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminRole_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -122,7 +122,8 @@ public class AdminRoleAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java index 41131059c..1c8113d55 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java @@ -31,7 +31,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -110,7 +109,8 @@ public class AdminRoletypeAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminRoletype_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -120,7 +120,8 @@ public class AdminRoletypeAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java index 415ac653f..6969a0fc2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java @@ -33,7 +33,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -115,7 +114,8 @@ public class AdminScheduledjobAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminScheduledjob_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -125,7 +125,8 @@ public class AdminScheduledjobAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java index 34754aeb1..c37a05049 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java @@ -47,7 +47,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaResponseUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -128,7 +127,8 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminSuggestbadword_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -138,7 +138,8 @@ public class AdminSuggestbadwordAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; @@ -184,12 +185,14 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // ----------------------------------------------------- // Download // ------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse downloadpage(final SearchForm form) { return asHtml(path_AdminSuggestbadword_DownloadJsp); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse download(final SearchForm form) { final HttpServletResponse response = LaResponseUtil.getResponse(); response.setContentType("application/octet-stream"); @@ -207,7 +210,8 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // ----------------------------------------------------- // Upload // ------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse uploadpage(final UploadForm form) { return asHtml(path_AdminSuggestbadword_UploadJsp); } @@ -257,7 +261,8 @@ public class AdminSuggestbadwordAction extends FessAdminAction { return redirect(getClass()); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse upload(final UploadForm form) { BufferedInputStream is = null; File tempFile = null; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java index 9d203b631..3566d243f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java @@ -47,7 +47,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaResponseUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -128,7 +127,8 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminSuggestelevateword_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -138,7 +138,8 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; @@ -184,12 +185,14 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { // ----------------------------------------------------- // Download // ------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse downloadpage(final SearchForm form) { return asHtml(path_AdminSuggestelevateword_DownloadJsp); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse download(final SearchForm form) { final HttpServletResponse response = LaResponseUtil.getResponse(); response.setContentType("application/octet-stream"); @@ -207,7 +210,8 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { // ----------------------------------------------------- // Upload // ------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse uploadpage(final UploadForm form) { return asHtml(path_AdminSuggestelevateword_UploadJsp); } @@ -257,7 +261,8 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { return redirect(getClass()); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse upload(final UploadForm form) { BufferedInputStream is = null; File tempFile = null; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 93868370a..2a5b1fb69 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -38,7 +38,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -131,7 +130,8 @@ public class AdminUserAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { clearStoredPassword(); return asHtml(path_AdminUser_EditJsp).useForm(CreateForm.class, op -> { @@ -144,7 +144,8 @@ public class AdminUserAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { clearStoredPassword(); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java index 2ec49d1f3..6525235c6 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java @@ -40,7 +40,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.VaErrorHook; @@ -123,7 +122,8 @@ public class AdminWebauthenticationAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminWebauthentication_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -136,7 +136,8 @@ public class AdminWebauthenticationAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index 243030952..19ab56c86 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -33,7 +33,6 @@ import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.response.render.RenderData; -import org.lastaflute.web.token.TxToken; import org.lastaflute.web.validation.VaErrorHook; /** @@ -117,7 +116,8 @@ public class AdminWebconfigAction extends FessAdminAction { // ----------------------------------------------------- // Entry Page // ---------- - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse createnew() { return asHtml(path_AdminWebconfig_EditJsp).useForm(CreateForm.class, op -> { op.setup(form -> { @@ -129,7 +129,8 @@ public class AdminWebconfigAction extends FessAdminAction { }); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse edit(final EditForm form) { validate(form, messages -> {}, toEditHtml()); HtmlNext next; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 42a022ca9..1ac7da4c7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -41,7 +41,6 @@ import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; -import org.lastaflute.web.token.TxToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,12 +90,14 @@ public class AdminWizardAction extends FessAdminAction { return asHtml(path_AdminWizard_IndexJsp).useForm(IndexForm.class); } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse crawlingConfigForm() { return asHtml(path_AdminWizard_CrawlingConfigJsp).useForm(CrawlingConfigForm.class); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse crawlingConfig(final CrawlingConfigForm form) { validate(form, messages -> {}, () -> { return asHtml(path_AdminWizard_CrawlingConfigJsp); @@ -106,7 +107,8 @@ public class AdminWizardAction extends FessAdminAction { return redirectWith(getClass(), moreUrl("crawlingConfigForm")); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse crawlingConfigNext(final CrawlingConfigForm form) { validate(form, messages -> {}, () -> { return asHtml(path_AdminWizard_CrawlingConfigJsp); @@ -266,12 +268,14 @@ public class AdminWizardAction extends FessAdminAction { return path; } - @Execute(token = TxToken.SAVE) + @Execute + //(token = TxToken.SAVE) public HtmlResponse startCrawlingForm() { return asHtml(path_AdminWizard_StartCrawlingJsp).useForm(StartCrawlingForm.class); } - @Execute(token = TxToken.VALIDATE) + @Execute + //(token = TxToken.VALIDATE) public HtmlResponse startCrawling(final StartCrawlingForm form) { if (!jobHelper.isCrawlProcessRunning()) { final List scheduledJobList = scheduledJobService.getCrawlerJobList(); diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java index 4bf4fc4f7..8583cfbd7 100644 --- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java @@ -1258,7 +1258,7 @@ public class FessEsClient implements Client { @Override public void termVectors(TermVectorsRequest request, ActionListener listener) { - client.termVector(request, listener); + client.termVectors(request, listener); } @Override @@ -1272,21 +1272,25 @@ public class FessEsClient implements Client { } @Override + @Deprecated public ActionFuture termVector(TermVectorsRequest request) { return client.termVector(request); } @Override + @Deprecated public void termVector(TermVectorsRequest request, ActionListener listener) { client.termVector(request, listener); } @Override + @Deprecated public TermVectorsRequestBuilder prepareTermVector() { return client.prepareTermVector(); } @Override + @Deprecated public TermVectorsRequestBuilder prepareTermVector(String index, String type, String id) { return client.prepareTermVector(index, type, id); } diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java index 02811d658..0b40e9ef0 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java @@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { return boolQuery; } + public List getQueryBuilderList() { + return queryBuilderList != null ? queryBuilderList : Collections.emptyList(); + } + // =================================================================================== // Query // ===== diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java index fa5132fe8..8779f61b6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java @@ -75,11 +75,11 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { BoostDocumentRuleCQ notQuery = new BoostDocumentRuleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java index e1e22171f..387eaed3d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java @@ -74,11 +74,11 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { CrawlingSessionCQ notQuery = new CrawlingSessionCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java index 7f4f31add..a113096bf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java @@ -75,11 +75,11 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { CrawlingSessionInfoCQ notQuery = new CrawlingSessionInfoCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java index d236e5df3..d95f7d4ed 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java @@ -74,11 +74,11 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { DataConfigCQ notQuery = new DataConfigCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java index 57bbc59b3..0ba1bd4b8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java @@ -75,11 +75,11 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { DataConfigToLabelCQ notQuery = new DataConfigToLabelCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java index c8892c03c..92c6b50bd 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java @@ -74,11 +74,11 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { DataConfigToRoleCQ notQuery = new DataConfigToRoleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java index 9b0417df0..d3da1b2ca 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java @@ -74,11 +74,11 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { FailureUrlCQ notQuery = new FailureUrlCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java index 8badee895..e82e6ff0d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java @@ -75,11 +75,11 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { FileAuthenticationCQ notQuery = new FileAuthenticationCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java index 23be2299a..c3dc09efc 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java @@ -74,11 +74,11 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { FileConfigCQ notQuery = new FileConfigCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java index e2ba020ed..8796c6cd9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java @@ -75,11 +75,11 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { FileConfigToLabelCQ notQuery = new FileConfigToLabelCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java index 85e7c660d..dde73ee97 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java @@ -74,11 +74,11 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { FileConfigToRoleCQ notQuery = new FileConfigToRoleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java index 66833e741..bd9dc7786 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { JobLogCQ notQuery = new JobLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java index 4dadd9faa..2d051225a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java @@ -74,11 +74,11 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { KeyMatchCQ notQuery = new KeyMatchCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java index 73e319931..2972323ba 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java @@ -74,11 +74,11 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { LabelToRoleCQ notQuery = new LabelToRoleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java index 42887c738..b4f6077a1 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java @@ -74,11 +74,11 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { LabelTypeCQ notQuery = new LabelTypeCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java index 73a1bccdf..9e8f83e0e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java @@ -74,11 +74,11 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery { OverlappingHostCQ notQuery = new OverlappingHostCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java index 1a42f99fd..524cff4aa 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java @@ -74,11 +74,11 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { PathMappingCQ notQuery = new PathMappingCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java index 21f15e3b9..087946ea9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java @@ -74,11 +74,11 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { RequestHeaderCQ notQuery = new RequestHeaderCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java index a2bce6fd1..e0f93c602 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java @@ -74,11 +74,11 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { RoleTypeCQ notQuery = new RoleTypeCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java index eedd8b170..c704c2175 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java @@ -74,11 +74,11 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { ScheduledJobCQ notQuery = new ScheduledJobCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } 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/BsSuggestBadWordCQ.java index def1a4557..cb1b2cba9 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/BsSuggestBadWordCQ.java @@ -74,11 +74,11 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery { SuggestBadWordCQ notQuery = new SuggestBadWordCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java index 572e8ddc5..b999f8612 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java @@ -75,11 +75,11 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery { SuggestElevateWordCQ notQuery = new SuggestElevateWordCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java index 2663d622a..b22ede256 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java @@ -75,11 +75,11 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { WebAuthenticationCQ notQuery = new WebAuthenticationCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -98,8 +98,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java index 87fc1b9d1..f4b8ab588 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java @@ -74,11 +74,11 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { WebConfigCQ notQuery = new WebConfigCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java index 168b7c7ce..5a7e6b815 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java @@ -74,11 +74,11 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { WebConfigToLabelCQ notQuery = new WebConfigToLabelCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java index cccb1f789..3605e776f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java @@ -74,11 +74,11 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { WebConfigToRoleCQ notQuery = new WebConfigToRoleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java index 14389c912..f43ba1b97 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java @@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { return boolQuery; } + public List getQueryBuilderList() { + return queryBuilderList != null ? queryBuilderList : Collections.emptyList(); + } + // =================================================================================== // Query // ===== diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java index 24dccff80..5c9c955ac 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { ClickLogCQ notQuery = new ClickLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java index 7b8ad225d..ff2dcf679 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery { EventLogCQ notQuery = new EventLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java index da01df86b..fc6ff0218 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { FavoriteLogCQ notQuery = new FavoriteLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java index 9900ffc2b..74143321d 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { SearchFieldLogCQ notQuery = new SearchFieldLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java index d1728669a..b321d9866 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java @@ -74,11 +74,11 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { SearchLogCQ notQuery = new SearchLogCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java index 70ec5b21a..f86d94de3 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java @@ -74,11 +74,11 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { UserInfoCQ notQuery = new UserInfoCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java index d95a457cc..4bc28c238 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java @@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { return boolQuery; } + public List getQueryBuilderList() { + return queryBuilderList != null ? queryBuilderList : Collections.emptyList(); + } + // =================================================================================== // Query // ===== diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java index 2fffa1394..eb84aaab3 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java @@ -74,11 +74,11 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { GroupCQ notQuery = new GroupCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java index 76a3313bc..1a347b093 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java @@ -74,11 +74,11 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { RoleCQ notQuery = new RoleCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java index 8e805668c..3d3d28c36 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java @@ -74,11 +74,11 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { UserCQ notQuery = new UserCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { - if (notQuery.queryBuilderList.size() > 1) { + if (notQuery.getQueryBuilderList().size() > 1) { final String msg = "not query must be one query."; throw new IllegalConditionBeanOperationException(msg); } - NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0)); + NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0)); if (opLambda != null) { opLambda.callback(builder); } @@ -97,8 +97,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { BoolQueryBuilder builder = - regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList, - filterQuery.queryBuilderList); + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index 1bb6185f6..983c7e633 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -170,7 +170,7 @@ public class IndexUpdater extends Thread { final QueryBuilder queryBuilder = QueryBuilders .boolQuery() - .filter(QueryBuilders.termQuery(EsAccessResult.SESSION_ID, sessionIdList)) + .filter(QueryBuilders.termsQuery(EsAccessResult.SESSION_ID, sessionIdList)) .filter(QueryBuilders.termQuery(EsAccessResult.STATUS, org.codelibs.fess.crawler.Constants.OK_STATUS)); builder.setQuery(queryBuilder); diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index 8aaabd88d..184a89f9a 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -144,6 +144,8 @@ "," --> +