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

check if hits is null

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-04-27 06:43:38 +09:00
parent 0dbeb2c09e
commit 3588eb3dcd
3 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
if (esCb.getPreference() != null) {
builder.setPreference(esCb.getPreference());
}
return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
return (int) getSearchHits(esCb.build(builder).execute().actionGet(searchTimeout)).getTotalHits().value;
}
@Override
@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
searchHits.forEach(hit -> {
final Map<String, Object> source = hit.getSourceAsMap();
final RESULT entity = createEntity(source, entityType);
@ -237,7 +237,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
String scrollId = response.getScrollId();
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -375,7 +375,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
int count = 0;
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -552,6 +552,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return DfTypeUtil.toDate(value);
}
protected SearchHits getSearchHits(final SearchResponse response) {
SearchHits hits = response.getHits();
if (hits == null) {
throw new IllegalBehaviorStateException("hits is null." + response.status());
}
return hits;
}
public static class BulkList<E, B> implements List<E> {
private final List<E> parent;

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

@ -106,7 +106,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
if (esCb.getPreference() != null) {
builder.setPreference(esCb.getPreference());
}
return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
return (int) getSearchHits(esCb.build(builder).execute().actionGet(searchTimeout)).getTotalHits().value;
}
@Override
@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
searchHits.forEach(hit -> {
final Map<String, Object> source = hit.getSourceAsMap();
final RESULT entity = createEntity(source, entityType);
@ -237,7 +237,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
String scrollId = response.getScrollId();
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -375,7 +375,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
int count = 0;
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -552,6 +552,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return DfTypeUtil.toDate(value);
}
protected SearchHits getSearchHits(final SearchResponse response) {
SearchHits hits = response.getHits();
if (hits == null) {
throw new IllegalBehaviorStateException("hits is null." + response.status());
}
return hits;
}
public static class BulkList<E, B> implements List<E> {
private final List<E> parent;

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

@ -106,7 +106,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
if (esCb.getPreference() != null) {
builder.setPreference(esCb.getPreference());
}
return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
return (int) getSearchHits(esCb.build(builder).execute().actionGet(searchTimeout)).getTotalHits().value;
}
@Override
@ -145,7 +145,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
searchHits.forEach(hit -> {
final Map<String, Object> source = hit.getSourceAsMap();
final RESULT entity = createEntity(source, entityType);
@ -237,7 +237,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
String scrollId = response.getScrollId();
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -375,7 +375,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
int count = 0;
try {
while (scrollId != null) {
final SearchHits searchHits = response.getHits();
final SearchHits searchHits = getSearchHits(response);
final SearchHit[] hits = searchHits.getHits();
if (hits.length == 0) {
break;
@ -552,6 +552,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return DfTypeUtil.toDate(value);
}
protected SearchHits getSearchHits(final SearchResponse response) {
SearchHits hits = response.getHits();
if (hits == null) {
throw new IllegalBehaviorStateException("hits is null." + response.status());
}
return hits;
}
public static class BulkList<E, B> implements List<E> {
private final List<E> parent;