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

update to dbflute 1.1.1

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-01-01 18:06:48 +09:00
parent b0bbf01909
commit 8d364e7621
6 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbflute_fess/_project.bat
View file

@ -2,7 +2,7 @@
set ANT_OPTS=-Xmx512m
set DBFLUTE_HOME=..\mydbflute\dbflute-1.1.0-sp9
set DBFLUTE_HOME=..\mydbflute\dbflute-1.1.1
set MY_PROPERTIES_PATH=build.properties

2
dbflute_fess/_project.sh
View file

@ -2,6 +2,6 @@
export ANT_OPTS=-Xmx512m
export DBFLUTE_HOME=../mydbflute/dbflute-1.1.0-sp9
export DBFLUTE_HOME=../mydbflute/dbflute-1.1.1
export MY_PROPERTIES_PATH=build.properties

2
pom.xml
View file

@ -40,7 +40,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Main Framework -->
<dbflute.version>1.1.0-sp9</dbflute.version>
<dbflute.version>1.1.1</dbflute.version>
<lastaflute.version>0.7.5-RC2</lastaflute.version>
<lasta.taglib.version>0.6.7</lasta.taglib.version>
<servlet.version>3.1.0</servlet.version>

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

@ -36,6 +36,7 @@ import org.dbflute.bhv.writable.UpdateOption;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.coption.CursorSelectOption;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
import org.elasticsearch.action.bulk.BulkItemResponse;
@ -87,6 +88,19 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return (int) ((EsAbstractConditionBean) cb).build(builder).execute().actionGet().getCount();
}
@Override
protected <RESULT extends ENTITY> RESULT delegateSelectEntity(final ConditionBean cb, final Class<? extends RESULT> entityType) {
final List<? extends RESULT> list = delegateSelectList(cb, entityType);
if (list.isEmpty()) {
return null;
}
if (list.size() >= 2) {
String msg = "The size of selected list is over 1: " + list.size();
throw new FetchingOverSafetySizeException(msg, 1); // immediatly catched by caller and tranlated
}
return list.get(0);
}
@Override
protected <RESULT extends ENTITY> List<RESULT> delegateSelectList(final ConditionBean cb, final Class<? extends RESULT> entityType) {
// #pending check response

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

@ -36,6 +36,7 @@ import org.dbflute.bhv.writable.UpdateOption;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.coption.CursorSelectOption;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
import org.elasticsearch.action.bulk.BulkItemResponse;
@ -87,6 +88,19 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return (int) ((EsAbstractConditionBean) cb).build(builder).execute().actionGet().getCount();
}
@Override
protected <RESULT extends ENTITY> RESULT delegateSelectEntity(final ConditionBean cb, final Class<? extends RESULT> entityType) {
final List<? extends RESULT> list = delegateSelectList(cb, entityType);
if (list.isEmpty()) {
return null;
}
if (list.size() >= 2) {
String msg = "The size of selected list is over 1: " + list.size();
throw new FetchingOverSafetySizeException(msg, 1); // immediatly catched by caller and tranlated
}
return list.get(0);
}
@Override
protected <RESULT extends ENTITY> List<RESULT> delegateSelectList(final ConditionBean cb, final Class<? extends RESULT> entityType) {
// #pending check response

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

@ -36,6 +36,7 @@ import org.dbflute.bhv.writable.UpdateOption;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.coption.CursorSelectOption;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
import org.elasticsearch.action.bulk.BulkItemResponse;
@ -87,6 +88,19 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
return (int) ((EsAbstractConditionBean) cb).build(builder).execute().actionGet().getCount();
}
@Override
protected <RESULT extends ENTITY> RESULT delegateSelectEntity(final ConditionBean cb, final Class<? extends RESULT> entityType) {
final List<? extends RESULT> list = delegateSelectList(cb, entityType);
if (list.isEmpty()) {
return null;
}
if (list.size() >= 2) {
String msg = "The size of selected list is over 1: " + list.size();
throw new FetchingOverSafetySizeException(msg, 1); // immediatly catched by caller and tranlated
}
return list.get(0);
}
@Override
protected <RESULT extends ENTITY> List<RESULT> delegateSelectList(final ConditionBean cb, final Class<? extends RESULT> entityType) {
// #pending check response