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

es 2.0 support

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-07 15:26:44 +09:00
parent 0ce4323508
commit 5d88d77160
68 changed files with 316 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pom.xml
View file

@ -39,11 +39,11 @@
<!-- Main Framework -->
<dbflute.version>1.1.0-sp8</dbflute.version>
<lastaflute.version>0.6.5-RC1</lastaflute.version>
<lastaflute.version>0.6.5-RC3</lastaflute.version>
<lasta.taglib.version>0.6.0</lasta.taglib.version>
<servlet.version>3.1.0</servlet.version>
<jsp.version>2.3.1</jsp.version>
<mailflute.version>0.4.3-RC1</mailflute.version>
<mailflute.version>0.4.3-RC2</mailflute.version>
<!-- Partner Library -->
<slf4j.version>1.7.12</slf4j.version>
@ -281,11 +281,11 @@
<url
url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-synonym/2.0.0-SNAPSHOT/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
<url
url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" />
<url
url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-langfield/2.0.0-SNAPSHOT/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
<url
url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-1.5.7.1.zip" />
url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-2.0.0.0.zip" />
</get>
<delete dir="${basedir}/plugins" />
<mkdir dir="${basedir}/plugins" />
@ -294,11 +294,11 @@
<unzip dest="${basedir}/plugins/analysis-synonym"
src="${basedir}/target/plugins/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
<unzip dest="${basedir}/plugins/configsync"
src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.213152-3.zip" />
<unzip dest="${basedir}/plugins/langfield"
src="${basedir}/target/plugins/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
<unzip dest="${basedir}/plugins/kopf"
src="${basedir}/target/plugins/elasticsearch-kopf-1.5.7.1.zip" />
src="${basedir}/target/plugins/elasticsearch-kopf-2.0.0.0.zip" />
</tasks>
</configuration>
<goals>
@ -440,11 +440,6 @@
<artifactId>fess-suggest</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codelibs</groupId>
<artifactId>lucene-analyzers-kuromoji-ipadic-neologd</artifactId>
<version>4.10.4-20150501</version>
</dependency>
<!-- fileupload -->
<dependency>

4
src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
View file

@ -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('\"');

7
src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java
View file

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

4
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
View file

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

19
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

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

19
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
View file

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

25
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java
View file

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

19
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java
View file

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

19
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java
View file

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

7
src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
View file

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

16
src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
View file

@ -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<ScheduledJob> scheduledJobList = scheduledJobService.getCrawlerJobList();

6
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -1258,7 +1258,7 @@ public class FessEsClient implements Client {
@Override
public void termVectors(TermVectorsRequest request, ActionListener<TermVectorsResponse> listener) {
client.termVector(request, listener);
client.termVectors(request, listener);
}
@Override
@ -1272,21 +1272,25 @@ public class FessEsClient implements Client {
}
@Override
@Deprecated
public ActionFuture<TermVectorsResponse> termVector(TermVectorsRequest request) {
return client.termVector(request);
}
@Override
@Deprecated
public void termVector(TermVectorsRequest request, ActionListener<TermVectorsResponse> 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);
}

4
src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
View file

@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
return boolQuery;
}
public List<QueryBuilder> getQueryBuilderList() {
return queryBuilderList != null ? queryBuilderList : Collections.emptyList();
}
// ===================================================================================
// Query
// =====

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
View file

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

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

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
View file

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

4
src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
View file

@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
return boolQuery;
}
public List<QueryBuilder> getQueryBuilderList() {
return queryBuilderList != null ? queryBuilderList : Collections.emptyList();
}
// ===================================================================================
// Query
// =====

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
View file

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

4
src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
View file

@ -93,6 +93,10 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
return boolQuery;
}
public List<QueryBuilder> getQueryBuilderList() {
return queryBuilderList != null ? queryBuilderList : Collections.emptyList();
}
// ===================================================================================
// Query
// =====

8
src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
View file

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

8
src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
View file

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

2
src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
View file

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

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

@ -144,6 +144,8 @@
<property name="roleSeparator">","</property>
-->
</component>
<!-- TODO
<component name="suggestHelper" class="org.codelibs.fess.helper.SuggestHelper">
</component>
-->
</components>