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

#279 modify RequestHeader

Browse source
This commit is contained in:
Keiichi Watanabe 2015-07-07 16:59:16 +09:00
parent f4a4bcf085
commit 82a84e91a7
5 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/codelibs/fess/db/exentity/WebCrawlingConfig.java
View file

@ -230,6 +230,7 @@ public class WebCrawlingConfig extends BsWebCrawlingConfig implements CrawlingCo
}
paramMap.put(HcHttpClient.BASIC_AUTHENTICATIONS_PROPERTY, basicAuthList.toArray(new Authentication[basicAuthList.size()]));
/* TODO CONFIG
// request header
final List<RequestHeader> requestHeaderList = requestHeaderService.getRequestHeaderList(getId());
final List<org.codelibs.robot.client.http.RequestHeader> rhList = new ArrayList<org.codelibs.robot.client.http.RequestHeader>();
@ -237,7 +238,7 @@ public class WebCrawlingConfig extends BsWebCrawlingConfig implements CrawlingCo
rhList.add(requestHeader.getS2RobotRequestHeader());
}
paramMap.put(HcHttpClient.REQUERT_HEADERS_PROPERTY, rhList.toArray(new org.codelibs.robot.client.http.RequestHeader[rhList.size()]));
*/
}
@Override

16
src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java
View file

@ -8,4 +8,20 @@ import org.codelibs.fess.es.bsentity.BsRequestHeader;
public class RequestHeader extends BsRequestHeader {
private static final long serialVersionUID = 1L;
public String getId() {
return asDocMeta().id();
}
public void setId(String id) {
asDocMeta().id(id);
}
public Long getVersionNo() {
return asDocMeta().version();
}
public void setVersionNo(Long version) {
asDocMeta().version(version);
}
}

30
src/main/java/org/codelibs/fess/service/RequestHeaderService.java
View file

@ -24,9 +24,9 @@ import javax.annotation.Resource;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.crud.CrudMessageException;
import org.codelibs.fess.db.cbean.RequestHeaderCB;
import org.codelibs.fess.db.exbhv.RequestHeaderBhv;
import org.codelibs.fess.db.exentity.RequestHeader;
import org.codelibs.fess.es.cbean.RequestHeaderCB;
import org.codelibs.fess.es.exbhv.RequestHeaderBhv;
import org.codelibs.fess.es.exentity.RequestHeader;
import org.codelibs.fess.pager.RequestHeaderPager;
import org.dbflute.cbean.result.PagingResultBean;
import org.seasar.framework.beans.util.Beans;
@ -60,7 +60,7 @@ public class RequestHeaderService implements Serializable {
public RequestHeader getRequestHeader(final Map<String, String> keys) {
final RequestHeader requestHeader = requestHeaderBhv.selectEntity(cb -> {
cb.query().setId_Equal(Long.parseLong(keys.get("id")));
cb.query().docMeta().setId_Equal(keys.get("id"));
setupEntityCondition(cb, keys);
}).orElse(null);//TODO
if (requestHeader == null) {
@ -74,28 +74,31 @@ public class RequestHeaderService implements Serializable {
public void store(final RequestHeader requestHeader) throws CrudMessageException {
setupStoreCondition(requestHeader);
requestHeaderBhv.insertOrUpdate(requestHeader);
requestHeaderBhv.insertOrUpdate(requestHeader, op -> {
op.setRefresh(true);
});
}
public void delete(final RequestHeader requestHeader) throws CrudMessageException {
setupDeleteCondition(requestHeader);
requestHeaderBhv.delete(requestHeader);
requestHeaderBhv.delete(requestHeader, op -> {
op.setRefresh(true);
});
}
protected void setupListCondition(final RequestHeaderCB cb, final RequestHeaderPager requestHeaderPager) {
if (requestHeaderPager.id != null) {
cb.query().setId_Equal(Long.parseLong(requestHeaderPager.id));
cb.query().docMeta().setId_Equal(requestHeaderPager.id);
}
// TODO Long, Integer, String supported only.
// setup condition
cb.setupSelect_WebCrawlingConfig();
cb.query().setDeletedBy_IsNull();
// TODO CONFIG cb.setupSelect_WebCrawlingConfig();
cb.query().addOrderBy_Name_Asc();
cb.query().addOrderBy_WebCrawlingConfigId_Asc();
// TODO CONFIG cb.query().addOrderBy_WebCrawlingConfigId_Asc();
// search
@ -104,7 +107,6 @@ public class RequestHeaderService implements Serializable {
protected void setupEntityCondition(final RequestHeaderCB cb, final Map<String, String> keys) {
// setup condition
cb.query().setDeletedBy_IsNull();
}
@ -122,9 +124,9 @@ public class RequestHeaderService implements Serializable {
public List<RequestHeader> getRequestHeaderList(final Long webCrawlingConfigId) {
return requestHeaderBhv.selectList(cb -> {
cb.query().setWebCrawlingConfigId_Equal(webCrawlingConfigId);
cb.query().setDeletedBy_IsNull();
});
// TODO CONFIG cb.query().setWebCrawlingConfigId_Equal(webCrawlingConfigId);
cb.query().matchAll();
});
}
}

11
src/main/java/org/codelibs/fess/web/admin/RequestHeaderAction.java
View file

@ -28,7 +28,7 @@ import org.codelibs.fess.beans.FessBeans;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.crud.CrudMessageException;
import org.codelibs.fess.crud.util.SAStrutsUtil;
import org.codelibs.fess.db.exentity.RequestHeader;
import org.codelibs.fess.es.exentity.RequestHeader;
import org.codelibs.fess.db.exentity.WebCrawlingConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.pager.RequestHeaderPager;
@ -285,7 +285,7 @@ public class RequestHeaderAction extends FessAdminAction {
protected RequestHeader createRequestHeader() {
RequestHeader requestHeader;
final String username = systemHelper.getUsername();
final LocalDateTime currentTime = systemHelper.getCurrentTime();
final long currentTime = systemHelper.getCurrentTimeAsLong();
if (requestHeaderForm.crudMode == CommonConstants.EDIT_MODE) {
requestHeader = requestHeaderService.getRequestHeader(createKeyMap());
if (requestHeader == null) {
@ -318,12 +318,7 @@ public class RequestHeaderAction extends FessAdminAction {
throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { requestHeaderForm.id });
}
// requestHeaderService.delete(requestHeader);
final String username = systemHelper.getUsername();
final LocalDateTime currentTime = systemHelper.getCurrentTime();
requestHeader.setDeletedBy(username);
requestHeader.setDeletedTime(currentTime);
requestHeaderService.store(requestHeader);
requestHeaderService.delete(requestHeader);
SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table");
return displayList(true);

22
src/main/java/org/codelibs/fess/web/admin/RequestHeaderForm.java
View file

@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
import org.seasar.struts.annotation.DateType;
import org.seasar.struts.annotation.IntegerType;
import org.seasar.struts.annotation.LongType;
@ -46,7 +47,7 @@ public class RequestHeaderForm implements Serializable {
}
@Required(target = "confirmfromupdate,update,delete")
@LongType
@Maxbytelength(maxbytelength = 1000)
public String id;
@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
@ -66,21 +67,15 @@ public class RequestHeaderForm implements Serializable {
public String createdBy;
@Required(target = "confirmfromupdate,update,delete")
@DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
@LongType
public String createdTime;
@Maxbytelength(maxbytelength = 255)
public String updatedBy;
@DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
@LongType
public String updatedTime;
@Maxbytelength(maxbytelength = 255)
public String deletedBy;
@DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
public String deletedTime;
@Required(target = "confirmfromupdate,update,delete")
@IntegerType
public String versionNo;
@ -90,15 +85,10 @@ public class RequestHeaderForm implements Serializable {
name = null;
value = null;
webCrawlingConfigId = null;
createdBy = null;
createdTime = null;
createdBy = "system";
createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong());
updatedBy = null;
updatedTime = null;
deletedBy = null;
deletedTime = null;
versionNo = null;
createdBy = "system";
final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
createdTime = sdf.format(new Date());
}
}