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

update from esflute

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-02-03 16:33:37 +09:00
parent ebf5c83c05
commit 46b5d3685e
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
View file

@ -271,7 +271,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
}
protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(esEntity.toSource());
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(toSource(esEntity));
final String id = esEntity.asDocMeta().id();
if (id != null) {
builder.setId(id);
@ -298,7 +298,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected IndexRequestBuilder createUpdateRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder =
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(esEntity.toSource());
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(toSource(esEntity));
final RequestOptionCall<IndexRequestBuilder> indexOption = esEntity.asDocMeta().indexOption();
if (indexOption != null) {
indexOption.callback(builder);
@ -310,6 +310,10 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return builder;
}
protected Map<String, Object> toSource(final EsAbstractEntity esEntity) {
return esEntity.toSource();
}
@Override
protected int delegateDelete(final Entity entity, final DeleteOption<? extends ConditionBean> option) {
final EsAbstractEntity esEntity = (EsAbstractEntity) entity;

8
src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
View file

@ -271,7 +271,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
}
protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(esEntity.toSource());
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(toSource(esEntity));
final String id = esEntity.asDocMeta().id();
if (id != null) {
builder.setId(id);
@ -298,7 +298,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected IndexRequestBuilder createUpdateRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder =
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(esEntity.toSource());
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(toSource(esEntity));
final RequestOptionCall<IndexRequestBuilder> indexOption = esEntity.asDocMeta().indexOption();
if (indexOption != null) {
indexOption.callback(builder);
@ -310,6 +310,10 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return builder;
}
protected Map<String, Object> toSource(final EsAbstractEntity esEntity) {
return esEntity.toSource();
}
@Override
protected int delegateDelete(final Entity entity, final DeleteOption<? extends ConditionBean> option) {
final EsAbstractEntity esEntity = (EsAbstractEntity) entity;

8
src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
View file

@ -271,7 +271,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
}
protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(esEntity.toSource());
final IndexRequestBuilder builder = client.prepareIndex(asEsIndex(), asEsIndexType()).setSource(toSource(esEntity));
final String id = esEntity.asDocMeta().id();
if (id != null) {
builder.setId(id);
@ -298,7 +298,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected IndexRequestBuilder createUpdateRequest(final EsAbstractEntity esEntity) {
final IndexRequestBuilder builder =
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(esEntity.toSource());
client.prepareIndex(asEsIndex(), asEsIndexType(), esEntity.asDocMeta().id()).setSource(toSource(esEntity));
final RequestOptionCall<IndexRequestBuilder> indexOption = esEntity.asDocMeta().indexOption();
if (indexOption != null) {
indexOption.callback(builder);
@ -310,6 +310,10 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return builder;
}
protected Map<String, Object> toSource(final EsAbstractEntity esEntity) {
return esEntity.toSource();
}
@Override
protected int delegateDelete(final Entity entity, final DeleteOption<? extends ConditionBean> option) {
final EsAbstractEntity esEntity = (EsAbstractEntity) entity;

2
src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
View file

@ -56,7 +56,7 @@ public class CrawlingInfoHelper {
protected int maxSessionIdsInList;
protected int urlIdPrefixLength = 445;;
protected int urlIdPrefixLength = 445;
protected CrawlingInfoService getCrawlingInfoService() {
return ComponentUtil.getComponent(CrawlingInfoService.class);