Browse Source

remove event_log

Shinsuke Sugaya 9 years ago
parent
commit
7ca60231a4

+ 0 - 26
src/main/config/es/fess_log.json

@@ -47,32 +47,6 @@
           }
           }
         }
         }
       },
       },
-      "event_log" : {
-        "_all" : {
-          "enabled" : false
-        },
-        "properties" : {
-          "createdAt" : {
-            "type" : "date",
-            "format" : "date_optional_time"
-          },
-          "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
-          "eventType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
-          "message" : {
-            "type" : "string"
-          },
-          "path" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          }
-        }
-      },
       "click_log" : {
       "click_log" : {
         "_all" : {
         "_all" : {
           "enabled" : false
           "enabled" : false

+ 0 - 266
src/main/java/org/codelibs/fess/es/log/bsbhv/BsEventLogBhv.java

@@ -1,266 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.bsbhv;
-
-import java.util.List;
-import java.util.Map;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
-import org.codelibs.fess.es.log.bsentity.dbmeta.EventLogDbm;
-import org.codelibs.fess.es.log.cbean.EventLogCB;
-import org.codelibs.fess.es.log.exentity.EventLog;
-import org.dbflute.Entity;
-import org.dbflute.bhv.readable.CBCall;
-import org.dbflute.bhv.readable.EntityRowHandler;
-import org.dbflute.cbean.ConditionBean;
-import org.dbflute.cbean.result.ListResultBean;
-import org.dbflute.cbean.result.PagingResultBean;
-import org.dbflute.exception.IllegalBehaviorStateException;
-import org.dbflute.optional.OptionalEntity;
-import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsEventLogBhv extends EsAbstractBehavior<EventLog, EventLogCB> {
-
-    // ===================================================================================
-    //                                                                    Control Override
-    //                                                                    ================
-    @Override
-    public String asTableDbName() {
-        return asEsIndexType();
-    }
-
-    @Override
-    protected String asEsIndex() {
-        return "fess_log";
-    }
-
-    @Override
-    public String asEsIndexType() {
-        return "event_log";
-    }
-
-    @Override
-    public String asEsSearchType() {
-        return "event_log";
-    }
-
-    @Override
-    public EventLogDbm asDBMeta() {
-        return EventLogDbm.getInstance();
-    }
-
-    @Override
-    protected <RESULT extends EventLog> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
-        try {
-            final RESULT result = entityType.newInstance();
-            result.setCreatedAt(DfTypeUtil.toLocalDateTime(source.get("createdAt")));
-            result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
-            result.setEventType(DfTypeUtil.toString(source.get("eventType")));
-            result.setMessage(DfTypeUtil.toString(source.get("message")));
-            result.setPath(DfTypeUtil.toString(source.get("path")));
-            return result;
-        } catch (InstantiationException | IllegalAccessException e) {
-            final String msg = "Cannot create a new instance: " + entityType.getName();
-            throw new IllegalBehaviorStateException(msg, e);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                              Select
-    //                                                                              ======
-    public int selectCount(CBCall<EventLogCB> cbLambda) {
-        return facadeSelectCount(createCB(cbLambda));
-    }
-
-    public OptionalEntity<EventLog> selectEntity(CBCall<EventLogCB> cbLambda) {
-        return facadeSelectEntity(createCB(cbLambda));
-    }
-
-    protected OptionalEntity<EventLog> facadeSelectEntity(EventLogCB cb) {
-        return doSelectOptionalEntity(cb, typeOfSelectedEntity());
-    }
-
-    protected <ENTITY extends EventLog> OptionalEntity<ENTITY> doSelectOptionalEntity(EventLogCB cb, Class<? extends ENTITY> tp) {
-        return createOptionalEntity(doSelectEntity(cb, tp), cb);
-    }
-
-    @Override
-    public EventLogCB newConditionBean() {
-        return new EventLogCB();
-    }
-
-    @Override
-    protected Entity doReadEntity(ConditionBean cb) {
-        return facadeSelectEntity(downcast(cb)).orElse(null);
-    }
-
-    public EventLog selectEntityWithDeletedCheck(CBCall<EventLogCB> cbLambda) {
-        return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
-    }
-
-    public OptionalEntity<EventLog> selectByPK(String id) {
-        return facadeSelectByPK(id);
-    }
-
-    protected OptionalEntity<EventLog> facadeSelectByPK(String id) {
-        return doSelectOptionalByPK(id, typeOfSelectedEntity());
-    }
-
-    protected <ENTITY extends EventLog> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
-        return doSelectEntity(xprepareCBAsPK(id), tp);
-    }
-
-    protected EventLogCB xprepareCBAsPK(String id) {
-        assertObjectNotNull("id", id);
-        return newConditionBean().acceptPK(id);
-    }
-
-    protected <ENTITY extends EventLog> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
-        return createOptionalEntity(doSelectByPK(id, tp), id);
-    }
-
-    @Override
-    protected Class<? extends EventLog> typeOfSelectedEntity() {
-        return EventLog.class;
-    }
-
-    @Override
-    protected Class<EventLog> typeOfHandlingEntity() {
-        return EventLog.class;
-    }
-
-    @Override
-    protected Class<EventLogCB> typeOfHandlingConditionBean() {
-        return EventLogCB.class;
-    }
-
-    public ListResultBean<EventLog> selectList(CBCall<EventLogCB> cbLambda) {
-        return facadeSelectList(createCB(cbLambda));
-    }
-
-    public PagingResultBean<EventLog> selectPage(CBCall<EventLogCB> cbLambda) {
-        // #pending same?
-        return (PagingResultBean<EventLog>) facadeSelectList(createCB(cbLambda));
-    }
-
-    public void selectCursor(CBCall<EventLogCB> cbLambda, EntityRowHandler<EventLog> entityLambda) {
-        facadeSelectCursor(createCB(cbLambda), entityLambda);
-    }
-
-    public void selectBulk(CBCall<EventLogCB> cbLambda, EntityRowHandler<List<EventLog>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
-    }
-
-    // ===================================================================================
-    //                                                                              Update
-    //                                                                              ======
-    public void insert(EventLog entity) {
-        doInsert(entity, null);
-    }
-
-    public void insert(EventLog entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
-        if (entity instanceof EsAbstractEntity) {
-            entity.asDocMeta().indexOption(opLambda);
-        }
-        doInsert(entity, null);
-    }
-
-    public void update(EventLog entity) {
-        doUpdate(entity, null);
-    }
-
-    public void update(EventLog entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
-        if (entity instanceof EsAbstractEntity) {
-            entity.asDocMeta().indexOption(opLambda);
-        }
-        doUpdate(entity, null);
-    }
-
-    public void insertOrUpdate(EventLog entity) {
-        doInsertOrUpdate(entity, null, null);
-    }
-
-    public void insertOrUpdate(EventLog entity, RequestOptionCall<IndexRequestBuilder> opLambda) {
-        if (entity instanceof EsAbstractEntity) {
-            entity.asDocMeta().indexOption(opLambda);
-        }
-        doInsertOrUpdate(entity, null, null);
-    }
-
-    public void delete(EventLog entity) {
-        doDelete(entity, null);
-    }
-
-    public void delete(EventLog entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
-        if (entity instanceof EsAbstractEntity) {
-            entity.asDocMeta().deleteOption(opLambda);
-        }
-        doDelete(entity, null);
-    }
-
-    public int queryDelete(CBCall<EventLogCB> cbLambda) {
-        return doQueryDelete(createCB(cbLambda), null);
-    }
-
-    public int[] batchInsert(List<EventLog> list) {
-        return batchInsert(list, null, null);
-    }
-
-    public int[] batchInsert(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call) {
-        return batchInsert(list, call, null);
-    }
-
-    public int[] batchInsert(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call,
-            RequestOptionCall<IndexRequestBuilder> entityCall) {
-        return doBatchInsert(new BulkList<>(list, call, entityCall), null);
-    }
-
-    public int[] batchUpdate(List<EventLog> list) {
-        return batchUpdate(list, null, null);
-    }
-
-    public int[] batchUpdate(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call) {
-        return batchUpdate(list, call, null);
-    }
-
-    public int[] batchUpdate(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call,
-            RequestOptionCall<IndexRequestBuilder> entityCall) {
-        return doBatchUpdate(new BulkList<>(list, call, entityCall), null);
-    }
-
-    public int[] batchDelete(List<EventLog> list) {
-        return batchDelete(list, null, null);
-    }
-
-    public int[] batchDelete(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call) {
-        return batchDelete(list, call, null);
-    }
-
-    public int[] batchDelete(List<EventLog> list, RequestOptionCall<BulkRequestBuilder> call,
-            RequestOptionCall<IndexRequestBuilder> entityCall) {
-        return doBatchDelete(new BulkList<>(list, call, entityCall), null);
-    }
-
-    // #pending create, modify, remove
-}

+ 0 - 164
src/main/java/org/codelibs/fess/es/log/bsentity/BsEventLog.java

@@ -1,164 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.bsentity;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.log.bsentity.dbmeta.EventLogDbm;
-
-/**
- * ${table.comment}
- * @author ESFlute (using FreeGen)
- */
-public class BsEventLog extends EsAbstractEntity {
-
-    // ===================================================================================
-    //                                                                          Definition
-    //                                                                          ==========
-    private static final long serialVersionUID = 1L;
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** createdAt */
-    protected LocalDateTime createdAt;
-
-    /** createdBy */
-    protected String createdBy;
-
-    /** eventType */
-    protected String eventType;
-
-    /** message */
-    protected String message;
-
-    /** path */
-    protected String path;
-
-    // [Referrers] *comment only
-
-    // ===================================================================================
-    //                                                                             DB Meta
-    //                                                                             =======
-    @Override
-    public EventLogDbm asDBMeta() {
-        return EventLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "event_log";
-    }
-
-    // ===================================================================================
-    //                                                                              Source
-    //                                                                              ======
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdAt != null) {
-            sourceMap.put("createdAt", createdAt);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (eventType != null) {
-            sourceMap.put("eventType", eventType);
-        }
-        if (message != null) {
-            sourceMap.put("message", message);
-        }
-        if (path != null) {
-            sourceMap.put("path", path);
-        }
-        return sourceMap;
-    }
-
-    // ===================================================================================
-    //                                                                      Basic Override
-    //                                                                      ==============
-    @Override
-    protected String doBuildColumnString(String dm) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(dm).append(createdAt);
-        sb.append(dm).append(createdBy);
-        sb.append(dm).append(eventType);
-        sb.append(dm).append(message);
-        sb.append(dm).append(path);
-        if (sb.length() > dm.length()) {
-            sb.delete(0, dm.length());
-        }
-        sb.insert(0, "{").append("}");
-        return sb.toString();
-    }
-
-    // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public LocalDateTime getCreatedAt() {
-        checkSpecifiedProperty("createdAt");
-        return createdAt;
-    }
-
-    public void setCreatedAt(LocalDateTime value) {
-        registerModifiedProperty("createdAt");
-        this.createdAt = value;
-    }
-
-    public String getCreatedBy() {
-        checkSpecifiedProperty("createdBy");
-        return convertEmptyToNull(createdBy);
-    }
-
-    public void setCreatedBy(String value) {
-        registerModifiedProperty("createdBy");
-        this.createdBy = value;
-    }
-
-    public String getEventType() {
-        checkSpecifiedProperty("eventType");
-        return convertEmptyToNull(eventType);
-    }
-
-    public void setEventType(String value) {
-        registerModifiedProperty("eventType");
-        this.eventType = value;
-    }
-
-    public String getMessage() {
-        checkSpecifiedProperty("message");
-        return convertEmptyToNull(message);
-    }
-
-    public void setMessage(String value) {
-        registerModifiedProperty("message");
-        this.message = value;
-    }
-
-    public String getPath() {
-        checkSpecifiedProperty("path");
-        return convertEmptyToNull(path);
-    }
-
-    public void setPath(String value) {
-        registerModifiedProperty("path");
-        this.path = value;
-    }
-}

+ 0 - 239
src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java

@@ -1,239 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.bsentity.dbmeta;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-import org.codelibs.fess.es.log.exentity.EventLog;
-import org.dbflute.Entity;
-import org.dbflute.dbmeta.AbstractDBMeta;
-import org.dbflute.dbmeta.info.ColumnInfo;
-import org.dbflute.dbmeta.info.UniqueInfo;
-import org.dbflute.dbmeta.name.TableSqlName;
-import org.dbflute.dbmeta.property.PropertyGateway;
-import org.dbflute.dbway.DBDef;
-import org.dbflute.util.DfTypeUtil;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EventLogDbm extends AbstractDBMeta {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                           Singleton
-    //                                                                           =========
-    private static final EventLogDbm _instance = new EventLogDbm();
-
-    private EventLogDbm() {
-    }
-
-    public static EventLogDbm getInstance() {
-        return _instance;
-    }
-
-    // ===================================================================================
-    //                                                                       Current DBDef
-    //                                                                       =============
-    @Override
-    public String getProjectName() {
-        return null;
-    }
-
-    @Override
-    public String getProjectPrefix() {
-        return null;
-    }
-
-    @Override
-    public String getGenerationGapBasePrefix() {
-        return null;
-    }
-
-    @Override
-    public DBDef getCurrentDBDef() {
-        return null;
-    }
-
-    // ===================================================================================
-    //                                                                    Property Gateway
-    //                                                                    ================
-    // -----------------------------------------------------
-    //                                       Column Property
-    //                                       ---------------
-    protected final Map<String, PropertyGateway> _epgMap = newHashMap();
-    {
-        setupEpg(_epgMap, et -> ((EventLog) et).getCreatedAt(), (et, vl) -> ((EventLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)),
-                "createdAt");
-        setupEpg(_epgMap, et -> ((EventLog) et).getCreatedBy(), (et, vl) -> ((EventLog) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((EventLog) et).getEventType(), (et, vl) -> ((EventLog) et).setEventType(DfTypeUtil.toString(vl)),
-                "eventType");
-        setupEpg(_epgMap, et -> ((EventLog) et).getMessage(), (et, vl) -> ((EventLog) et).setMessage(DfTypeUtil.toString(vl)), "message");
-        setupEpg(_epgMap, et -> ((EventLog) et).getPath(), (et, vl) -> ((EventLog) et).setPath(DfTypeUtil.toString(vl)), "path");
-    }
-
-    @Override
-    public PropertyGateway findPropertyGateway(final String prop) {
-        return doFindEpg(_epgMap, prop);
-    }
-
-    // ===================================================================================
-    //                                                                          Table Info
-    //                                                                          ==========
-    protected final String _tableDbName = "event_log";
-    protected final String _tableDispName = "event_log";
-    protected final String _tablePropertyName = "EventLog";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
-    @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
-    @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
-    @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
-
-    // ===================================================================================
-    //                                                                         Column Info
-    //                                                                         ===========
-    protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false,
-            false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnEventType = cci("eventType", "eventType", null, null, String.class, "eventType", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnMessage = cci("message", "message", null, null, String.class, "message", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedAt() {
-        return _columnCreatedAt;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnEventType() {
-        return _columnEventType;
-    }
-
-    public ColumnInfo columnMessage() {
-        return _columnMessage;
-    }
-
-    public ColumnInfo columnPath() {
-        return _columnPath;
-    }
-
-    protected List<ColumnInfo> ccil() {
-        List<ColumnInfo> ls = newArrayList();
-        ls.add(columnCreatedAt());
-        ls.add(columnCreatedBy());
-        ls.add(columnEventType());
-        ls.add(columnMessage());
-        ls.add(columnPath());
-        return ls;
-    }
-
-    // ===================================================================================
-    //                                                                         Unique Info
-    //                                                                         ===========
-    @Override
-    public boolean hasPrimaryKey() {
-        return false;
-    }
-
-    @Override
-    public boolean hasCompoundPrimaryKey() {
-        return false;
-    }
-
-    @Override
-    protected UniqueInfo cpui() {
-        return null;
-    }
-
-    // ===================================================================================
-    //                                                                           Type Name
-    //                                                                           =========
-    @Override
-    public String getEntityTypeName() {
-        return "org.codelibs.fess.es.log.exentity.EventLog";
-    }
-
-    @Override
-    public String getConditionBeanTypeName() {
-        return "org.codelibs.fess.es.log.cbean.EventLogCB";
-    }
-
-    @Override
-    public String getBehaviorTypeName() {
-        return "org.codelibs.fess.es.log.exbhv.EventLogBhv";
-    }
-
-    // ===================================================================================
-    //                                                                         Object Type
-    //                                                                         ===========
-    @Override
-    public Class<? extends Entity> getEntityType() {
-        return EventLog.class;
-    }
-
-    // ===================================================================================
-    //                                                                     Object Instance
-    //                                                                     ===============
-    @Override
-    public Entity newEntity() {
-        return new EventLog();
-    }
-
-    // ===================================================================================
-    //                                                                   Map Communication
-    //                                                                   =================
-    @Override
-    public void acceptPrimaryKeyMap(Entity entity, Map<String, ? extends Object> primaryKeyMap) {
-    }
-
-    @Override
-    public void acceptAllColumnMap(Entity entity, Map<String, ? extends Object> allColumnMap) {
-    }
-
-    @Override
-    public Map<String, Object> extractPrimaryKeyMap(Entity entity) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> extractAllColumnMap(Entity entity) {
-        return null;
-    }
-}

+ 0 - 24
src/main/java/org/codelibs/fess/es/log/cbean/EventLogCB.java

@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.cbean;
-
-import org.codelibs.fess.es.log.cbean.bs.BsEventLogCB;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EventLogCB extends BsEventLogCB {
-}

+ 0 - 181
src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java

@@ -1,181 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.cbean.bs;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
-import org.codelibs.fess.es.log.bsentity.dbmeta.EventLogDbm;
-import org.codelibs.fess.es.log.cbean.EventLogCB;
-import org.codelibs.fess.es.log.cbean.cq.EventLogCQ;
-import org.codelibs.fess.es.log.cbean.cq.bs.BsEventLogCQ;
-import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class BsEventLogCB extends EsAbstractConditionBean {
-
-    // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    protected BsEventLogCQ _conditionQuery;
-    protected HpSpecification _specification;
-
-    // ===================================================================================
-    //                                                                             Control
-    //                                                                             =======
-    @Override
-    public EventLogDbm asDBMeta() {
-        return EventLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "event_log";
-    }
-
-    @Override
-    public boolean hasSpecifiedColumn() {
-        return _specification != null;
-    }
-
-    @Override
-    public ConditionQuery localCQ() {
-        return doGetConditionQuery();
-    }
-
-    // ===================================================================================
-    //                                                                         Primary Key
-    //                                                                         ===========
-    public EventLogCB acceptPK(String id) {
-        assertObjectNotNull("id", id);
-        BsEventLogCB cb = this;
-        cb.query().docMeta().setId_Equal(id);
-        return (EventLogCB) this;
-    }
-
-    @Override
-    public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
-    }
-
-    // ===================================================================================
-    //                                                                               Build
-    //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
-
-    @Override
-    public SearchRequestBuilder build(SearchRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-            _conditionQuery.getFieldSortBuilderList().forEach(sort -> {
-                builder.addSort(sort);
-            });
-        }
-
-        if (_specification != null) {
-            builder.setFetchSource(_specification.columnList.toArray(new String[_specification.columnList.size()]), null);
-        }
-
-        return builder;
-    }
-
-    // ===================================================================================
-    //                                                                               Query
-    //                                                                               =====
-    public BsEventLogCQ query() {
-        assertQueryPurpose();
-        return doGetConditionQuery();
-    }
-
-    protected BsEventLogCQ doGetConditionQuery() {
-        if (_conditionQuery == null) {
-            _conditionQuery = createLocalCQ();
-        }
-        return _conditionQuery;
-    }
-
-    protected BsEventLogCQ createLocalCQ() {
-        return new EventLogCQ();
-    }
-
-    // ===================================================================================
-    //                                                                             Specify
-    //                                                                             =======
-    public HpSpecification specify() {
-        assertSpecifyPurpose();
-        if (_specification == null) {
-            _specification = new HpSpecification();
-        }
-        return _specification;
-    }
-
-    protected void assertQueryPurpose() {
-    }
-
-    protected void assertSpecifyPurpose() {
-    }
-
-    public static class HpSpecification {
-        private List<String> columnList = new ArrayList<>();
-
-        private void doColumn(String name) {
-            columnList.add(name);
-        }
-
-        public void columnId() {
-            doColumn("_id");
-        }
-
-        public void columnCreatedAt() {
-            doColumn("createdAt");
-        }
-
-        public void columnCreatedBy() {
-            doColumn("createdBy");
-        }
-
-        public void columnEventType() {
-            doColumn("eventType");
-        }
-
-        public void columnMessage() {
-            doColumn("message");
-        }
-
-        public void columnPath() {
-            doColumn("path");
-        }
-    }
-}

+ 0 - 24
src/main/java/org/codelibs/fess/es/log/cbean/cq/EventLogCQ.java

@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.cbean.cq;
-
-import org.codelibs.fess.es.log.cbean.cq.bs.BsEventLogCQ;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EventLogCQ extends BsEventLogCQ {
-}

+ 0 - 997
src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java

@@ -1,997 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.cbean.cq.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cq.EventLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.NotQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Name Override
-    //                                                                       =============
-    @Override
-    public String asTableDbName() {
-        return "event_log";
-    }
-
-    @Override
-    public String xgetAliasName() {
-        return "event_log";
-    }
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void filtered(FilteredCall<EventLogCQ, EventLogCQ> filteredLambda) {
-        filtered(filteredLambda, null);
-    }
-
-    public void filtered(FilteredCall<EventLogCQ, EventLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        bool((must, should, mustNot, filter) -> {
-            filteredLambda.callback(must, filter);
-        }, opLambda);
-    }
-
-    public void not(OperatorCall<EventLogCQ> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<EventLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        EventLogCQ notQuery = new EventLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void bool(BoolCall<EventLogCQ> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<EventLogCQ> boolLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
-        EventLogCQ mustQuery = new EventLogCQ();
-        EventLogCQ shouldQuery = new EventLogCQ();
-        EventLogCQ mustNotQuery = new EventLogCQ();
-        EventLogCQ filterQuery = new EventLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
-            BoolQueryBuilder builder =
-                    regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
-                            filterQuery.getQueryBuilderList());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("_id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotTerm(id, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
-    public void setId_NotTerm(String id) {
-        setId_NotTerm(id, null);
-    }
-
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
-        IdsQueryBuilder builder = regIdsQ(idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_InScope(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public BsEventLogCQ addOrderBy_Id_Asc() {
-        regOBA("_id");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_Id_Desc() {
-        regOBD("_id");
-        return this;
-    }
-
-    public void setCreatedAt_Equal(LocalDateTime createdAt) {
-        setCreatedAt_Term(createdAt, null);
-    }
-
-    public void setCreatedAt_Equal(LocalDateTime createdAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCreatedAt_Term(createdAt, opLambda);
-    }
-
-    public void setCreatedAt_Term(LocalDateTime createdAt) {
-        setCreatedAt_Term(createdAt, null);
-    }
-
-    public void setCreatedAt_Term(LocalDateTime createdAt, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("createdAt", createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt) {
-        setCreatedAt_NotTerm(createdAt, null);
-    }
-
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedAt_NotTerm(createdAt, opLambda);
-    }
-
-    public void setCreatedAt_NotTerm(LocalDateTime createdAt) {
-        setCreatedAt_NotTerm(createdAt, null);
-    }
-
-    public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdAt", createdAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_Terms(Collection<LocalDateTime> createdAtList) {
-        setCreatedAt_Terms(createdAtList, null);
-    }
-
-    public void setCreatedAt_Terms(Collection<LocalDateTime> createdAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("createdAt", createdAtList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_InScope(Collection<LocalDateTime> createdAtList) {
-        setCreatedAt_Terms(createdAtList, null);
-    }
-
-    public void setCreatedAt_InScope(Collection<LocalDateTime> createdAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCreatedAt_Terms(createdAtList, opLambda);
-    }
-
-    public void setCreatedAt_Match(LocalDateTime createdAt) {
-        setCreatedAt_Match(createdAt, null);
-    }
-
-    public void setCreatedAt_Match(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("createdAt", createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt) {
-        setCreatedAt_MatchPhrase(createdAt, null);
-    }
-
-    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt) {
-        setCreatedAt_MatchPhrasePrefix(createdAt, null);
-    }
-
-    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_Fuzzy(LocalDateTime createdAt) {
-        setCreatedAt_Fuzzy(createdAt, null);
-    }
-
-    public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdAt", createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_GreaterThan(LocalDateTime createdAt) {
-        setCreatedAt_GreaterThan(createdAt, null);
-    }
-
-    public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_LessThan(LocalDateTime createdAt) {
-        setCreatedAt_LessThan(createdAt, null);
-    }
-
-    public void setCreatedAt_LessThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_GreaterEqual(LocalDateTime createdAt) {
-        setCreatedAt_GreaterEqual(createdAt, null);
-    }
-
-    public void setCreatedAt_GreaterEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_LessEqual(LocalDateTime createdAt) {
-        setCreatedAt_LessEqual(createdAt, null);
-    }
-
-    public void setCreatedAt_LessEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_CreatedAt_Asc() {
-        regOBA("createdAt");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_CreatedAt_Desc() {
-        regOBD("createdAt");
-        return this;
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotTerm(createdBy, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_NotTerm(String createdBy) {
-        setCreatedBy_NotTerm(createdBy, null);
-    }
-
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Terms(Collection<String> createdByList) {
-        setCreatedBy_Terms(createdByList, null);
-    }
-
-    public void setCreatedBy_Terms(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("createdBy", createdByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_InScope(Collection<String> createdByList) {
-        setCreatedBy_Terms(createdByList, null);
-    }
-
-    public void setCreatedBy_InScope(Collection<String> createdByList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Match(String createdBy) {
-        setCreatedBy_Match(createdBy, null);
-    }
-
-    public void setCreatedBy_Match(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_MatchPhrase(String createdBy) {
-        setCreatedBy_MatchPhrase(createdBy, null);
-    }
-
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy) {
-        setCreatedBy_MatchPhrasePrefix(createdBy, null);
-    }
-
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Fuzzy(String createdBy) {
-        setCreatedBy_Fuzzy(createdBy, null);
-    }
-
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_LessThan(String createdBy) {
-        setCreatedBy_LessThan(createdBy, null);
-    }
-
-    public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterEqual(String createdBy) {
-        setCreatedBy_GreaterEqual(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_LessEqual(String createdBy) {
-        setCreatedBy_LessEqual(createdBy, null);
-    }
-
-    public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_CreatedBy_Asc() {
-        regOBA("createdBy");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_CreatedBy_Desc() {
-        regOBD("createdBy");
-        return this;
-    }
-
-    public void setEventType_Equal(String eventType) {
-        setEventType_Term(eventType, null);
-    }
-
-    public void setEventType_Equal(String eventType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setEventType_Term(eventType, opLambda);
-    }
-
-    public void setEventType_Term(String eventType) {
-        setEventType_Term(eventType, null);
-    }
-
-    public void setEventType_Term(String eventType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_NotEqual(String eventType) {
-        setEventType_NotTerm(eventType, null);
-    }
-
-    public void setEventType_NotEqual(String eventType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setEventType_NotTerm(eventType, opLambda);
-    }
-
-    public void setEventType_NotTerm(String eventType) {
-        setEventType_NotTerm(eventType, null);
-    }
-
-    public void setEventType_NotTerm(String eventType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("eventType", eventType));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_Terms(Collection<String> eventTypeList) {
-        setEventType_Terms(eventTypeList, null);
-    }
-
-    public void setEventType_Terms(Collection<String> eventTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("eventType", eventTypeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_InScope(Collection<String> eventTypeList) {
-        setEventType_Terms(eventTypeList, null);
-    }
-
-    public void setEventType_InScope(Collection<String> eventTypeList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setEventType_Terms(eventTypeList, opLambda);
-    }
-
-    public void setEventType_Match(String eventType) {
-        setEventType_Match(eventType, null);
-    }
-
-    public void setEventType_Match(String eventType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_MatchPhrase(String eventType) {
-        setEventType_MatchPhrase(eventType, null);
-    }
-
-    public void setEventType_MatchPhrase(String eventType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_MatchPhrasePrefix(String eventType) {
-        setEventType_MatchPhrasePrefix(eventType, null);
-    }
-
-    public void setEventType_MatchPhrasePrefix(String eventType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_Fuzzy(String eventType) {
-        setEventType_Fuzzy(eventType, null);
-    }
-
-    public void setEventType_Fuzzy(String eventType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_Prefix(String eventType) {
-        setEventType_Prefix(eventType, null);
-    }
-
-    public void setEventType_Prefix(String eventType, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_GreaterThan(String eventType) {
-        setEventType_GreaterThan(eventType, null);
-    }
-
-    public void setEventType_GreaterThan(String eventType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("eventType", ConditionKey.CK_GREATER_THAN, eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_LessThan(String eventType) {
-        setEventType_LessThan(eventType, null);
-    }
-
-    public void setEventType_LessThan(String eventType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("eventType", ConditionKey.CK_LESS_THAN, eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_GreaterEqual(String eventType) {
-        setEventType_GreaterEqual(eventType, null);
-    }
-
-    public void setEventType_GreaterEqual(String eventType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("eventType", ConditionKey.CK_GREATER_EQUAL, eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_LessEqual(String eventType) {
-        setEventType_LessEqual(eventType, null);
-    }
-
-    public void setEventType_LessEqual(String eventType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("eventType", ConditionKey.CK_LESS_EQUAL, eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_EventType_Asc() {
-        regOBA("eventType");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_EventType_Desc() {
-        regOBD("eventType");
-        return this;
-    }
-
-    public void setMessage_Equal(String message) {
-        setMessage_Term(message, null);
-    }
-
-    public void setMessage_Equal(String message, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setMessage_Term(message, opLambda);
-    }
-
-    public void setMessage_Term(String message) {
-        setMessage_Term(message, null);
-    }
-
-    public void setMessage_Term(String message, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_NotEqual(String message) {
-        setMessage_NotTerm(message, null);
-    }
-
-    public void setMessage_NotEqual(String message, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setMessage_NotTerm(message, opLambda);
-    }
-
-    public void setMessage_NotTerm(String message) {
-        setMessage_NotTerm(message, null);
-    }
-
-    public void setMessage_NotTerm(String message, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("message", message));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_Terms(Collection<String> messageList) {
-        setMessage_Terms(messageList, null);
-    }
-
-    public void setMessage_Terms(Collection<String> messageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("message", messageList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_InScope(Collection<String> messageList) {
-        setMessage_Terms(messageList, null);
-    }
-
-    public void setMessage_InScope(Collection<String> messageList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setMessage_Terms(messageList, opLambda);
-    }
-
-    public void setMessage_Match(String message) {
-        setMessage_Match(message, null);
-    }
-
-    public void setMessage_Match(String message, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_MatchPhrase(String message) {
-        setMessage_MatchPhrase(message, null);
-    }
-
-    public void setMessage_MatchPhrase(String message, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_MatchPhrasePrefix(String message) {
-        setMessage_MatchPhrasePrefix(message, null);
-    }
-
-    public void setMessage_MatchPhrasePrefix(String message, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_Fuzzy(String message) {
-        setMessage_Fuzzy(message, null);
-    }
-
-    public void setMessage_Fuzzy(String message, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_Prefix(String message) {
-        setMessage_Prefix(message, null);
-    }
-
-    public void setMessage_Prefix(String message, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_GreaterThan(String message) {
-        setMessage_GreaterThan(message, null);
-    }
-
-    public void setMessage_GreaterThan(String message, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("message", ConditionKey.CK_GREATER_THAN, message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_LessThan(String message) {
-        setMessage_LessThan(message, null);
-    }
-
-    public void setMessage_LessThan(String message, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("message", ConditionKey.CK_LESS_THAN, message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_GreaterEqual(String message) {
-        setMessage_GreaterEqual(message, null);
-    }
-
-    public void setMessage_GreaterEqual(String message, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("message", ConditionKey.CK_GREATER_EQUAL, message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_LessEqual(String message) {
-        setMessage_LessEqual(message, null);
-    }
-
-    public void setMessage_LessEqual(String message, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("message", ConditionKey.CK_LESS_EQUAL, message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_Message_Asc() {
-        regOBA("message");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_Message_Desc() {
-        regOBD("message");
-        return this;
-    }
-
-    public void setPath_Equal(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Equal(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setPath_Term(path, opLambda);
-    }
-
-    public void setPath_Term(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Term(String path, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_NotEqual(String path) {
-        setPath_NotTerm(path, null);
-    }
-
-    public void setPath_NotEqual(String path, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPath_NotTerm(path, opLambda);
-    }
-
-    public void setPath_NotTerm(String path) {
-        setPath_NotTerm(path, null);
-    }
-
-    public void setPath_NotTerm(String path, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("path", path));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Terms(Collection<String> pathList) {
-        setPath_Terms(pathList, null);
-    }
-
-    public void setPath_Terms(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("path", pathList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_InScope(Collection<String> pathList) {
-        setPath_Terms(pathList, null);
-    }
-
-    public void setPath_InScope(Collection<String> pathList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setPath_Terms(pathList, opLambda);
-    }
-
-    public void setPath_Match(String path) {
-        setPath_Match(path, null);
-    }
-
-    public void setPath_Match(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_MatchPhrase(String path) {
-        setPath_MatchPhrase(path, null);
-    }
-
-    public void setPath_MatchPhrase(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_MatchPhrasePrefix(String path) {
-        setPath_MatchPhrasePrefix(path, null);
-    }
-
-    public void setPath_MatchPhrasePrefix(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Fuzzy(String path) {
-        setPath_Fuzzy(path, null);
-    }
-
-    public void setPath_Fuzzy(String path, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Prefix(String path) {
-        setPath_Prefix(path, null);
-    }
-
-    public void setPath_Prefix(String path, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_GreaterThan(String path) {
-        setPath_GreaterThan(path, null);
-    }
-
-    public void setPath_GreaterThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_THAN, path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_LessThan(String path) {
-        setPath_LessThan(path, null);
-    }
-
-    public void setPath_LessThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_THAN, path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_GreaterEqual(String path) {
-        setPath_GreaterEqual(path, null);
-    }
-
-    public void setPath_GreaterEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_EQUAL, path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_LessEqual(String path) {
-        setPath_LessEqual(path, null);
-    }
-
-    public void setPath_LessEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_EQUAL, path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_Path_Asc() {
-        regOBA("path");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_Path_Desc() {
-        regOBD("path");
-        return this;
-    }
-
-}

+ 0 - 25
src/main/java/org/codelibs/fess/es/log/exbhv/EventLogBhv.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.exbhv;
-
-import org.codelibs.fess.es.log.bsbhv.BsEventLogBhv;
-
-/**
- * @author FreeGen
- */
-public class EventLogBhv extends BsEventLogBhv {
-
-}

+ 0 - 26
src/main/java/org/codelibs/fess/es/log/exentity/EventLog.java

@@ -1,26 +0,0 @@
-/*
- * Copyright 2012-2016 CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.es.log.exentity;
-
-import org.codelibs.fess.es.log.bsentity.BsEventLog;
-
-/**
- * @author FreeGen
- */
-public class EventLog extends BsEventLog {
-
-    private static final long serialVersionUID = 1L;
-}

+ 0 - 3
src/main/resources/esclient.xml

@@ -119,9 +119,6 @@
 			<arg>".fess_user/group"</arg>
 			<arg>".fess_user/group"</arg>
 		</postConstruct>
 		</postConstruct>
 		<!-- fess_log index -->
 		<!-- fess_log index -->
-		<postConstruct name="addIndexConfig">
-			<arg>"fess_log/event_log"</arg>
-		</postConstruct>
 		<postConstruct name="addIndexConfig">
 		<postConstruct name="addIndexConfig">
 			<arg>"fess_log/click_log"</arg>
 			<arg>"fess_log/click_log"</arg>
 		</postConstruct>
 		</postConstruct>

+ 0 - 31
src/main/resources/fess_indices/fess_log/event_log.json

@@ -1,31 +0,0 @@
-{
-  "event_log": {
-    "_source": {
-      "enabled": true
-    },
-    "_all": {
-      "enabled": false
-    },
-    "properties": {
-      "eventType": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
-      "path": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
-      "message": {
-        "type": "string"
-      },
-      "createdBy": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
-      "createdAt": {
-        "type": "date",
-        "format": "date_optional_time"
-      }
-    }
-  }
-}