Browse Source

fix #1102 add ImplementedInvokerAssistant

Shinsuke Sugaya 8 years ago
parent
commit
a43c92174c

+ 179 - 0
src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java

@@ -0,0 +1,179 @@
+/*
+ * Copyright 2012-2017 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.common;
+
+import javax.sql.DataSource;
+
+import org.dbflute.bhv.core.InvokerAssistant;
+import org.dbflute.bhv.core.context.ResourceParameter;
+import org.dbflute.bhv.core.supplement.SequenceCacheHandler;
+import org.dbflute.bhv.exception.BehaviorExceptionThrower;
+import org.dbflute.bhv.exception.SQLExceptionHandlerFactory;
+import org.dbflute.cbean.cipher.GearedCipherManager;
+import org.dbflute.cbean.sqlclause.SqlClauseCreator;
+import org.dbflute.dbmeta.DBMetaProvider;
+import org.dbflute.dbway.DBDef;
+import org.dbflute.jdbc.SQLExceptionDigger;
+import org.dbflute.jdbc.StatementConfig;
+import org.dbflute.jdbc.StatementFactory;
+import org.dbflute.optional.RelationOptionalFactory;
+import org.dbflute.outsidesql.OutsideSqlOption;
+import org.dbflute.outsidesql.factory.OutsideSqlExecutorFactory;
+import org.dbflute.s2dao.jdbc.TnResultSetHandlerFactory;
+import org.dbflute.s2dao.metadata.TnBeanMetaDataFactory;
+import org.dbflute.twowaysql.factory.SqlAnalyzerFactory;
+
+public class ImplementedInvokerAssistant implements InvokerAssistant {
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    protected static final String[] DEFAULT_CLIENT_INVOKE_NAMES = new String[] { "Page", "Action", "Controller", "ControllerImpl", "Task",
+            "Test" };
+
+    protected static final String[] DEFAULT_BYPASS_INVOKE_NAMES = new String[] { "Service", "ServiceImpl", "Facade", "FacadeImpl", "Logic",
+            "LogicImpl" };
+
+    @Override
+    public DBDef assistCurrentDBDef() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public DataSource assistDataSource() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public DBMetaProvider assistDBMetaProvider() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SqlClauseCreator assistSqlClauseCreator() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public StatementFactory assistStatementFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TnBeanMetaDataFactory assistBeanMetaDataFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TnResultSetHandlerFactory assistResultSetHandlerFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public RelationOptionalFactory assistRelationOptionalFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SqlAnalyzerFactory assistSqlAnalyzerFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public OutsideSqlOption assistFirstOutsideSqlOption(String tableDbName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public OutsideSqlExecutorFactory assistOutsideSqlExecutorFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SQLExceptionDigger assistSQLExceptionDigger() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SQLExceptionHandlerFactory assistSQLExceptionHandlerFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SequenceCacheHandler assistSequenceCacheHandler() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String assistSqlFileEncoding() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public StatementConfig assistDefaultStatementConfig() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public BehaviorExceptionThrower assistBehaviorExceptionThrower() {
+        return new BehaviorExceptionThrower();
+    }
+
+    @Override
+    public GearedCipherManager assistGearedCipherManager() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ResourceParameter assistResourceParameter() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String[] assistClientInvokeNames() {
+        return DEFAULT_CLIENT_INVOKE_NAMES;
+    }
+
+    @Override
+    public String[] assistByPassInvokeNames() {
+        return DEFAULT_BYPASS_INVOKE_NAMES;
+    }
+
+    @Override
+    public void toBeDisposable(DisposableProcess callerProcess) {
+        // TODO Auto-generated method stub
+
+    }
+
+}

+ 31 - 30
src/main/resources/esflute_config.xml

@@ -5,37 +5,38 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
+	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
-    <!-- The components of Behavior. -->
-    <component name="accessTokenBhv" class="org.codelibs.fess.es.config.exbhv.AccessTokenBhv"/>
-    <component name="badWordBhv" class="org.codelibs.fess.es.config.exbhv.BadWordBhv"/>
-    <component name="boostDocumentRuleBhv" class="org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv"/>
-    <component name="crawlingInfoBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv"/>
-    <component name="crawlingInfoParamBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv"/>
-    <component name="dataConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToLabelBhv"/>
-    <component name="dataConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToRoleBhv"/>
-    <component name="dataConfigBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigBhv"/>
-    <component name="duplicateHostBhv" class="org.codelibs.fess.es.config.exbhv.DuplicateHostBhv"/>
-    <component name="elevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv"/>
-    <component name="elevateWordBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordBhv"/>
-    <component name="failureUrlBhv" class="org.codelibs.fess.es.config.exbhv.FailureUrlBhv"/>
-    <component name="fileAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv"/>
-    <component name="fileConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigToLabelBhv"/>
-    <component name="fileConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigToRoleBhv"/>
-    <component name="fileConfigBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigBhv"/>
-    <component name="jobLogBhv" class="org.codelibs.fess.es.config.exbhv.JobLogBhv"/>
-    <component name="keyMatchBhv" class="org.codelibs.fess.es.config.exbhv.KeyMatchBhv"/>
-    <component name="labelTypeBhv" class="org.codelibs.fess.es.config.exbhv.LabelTypeBhv"/>
-    <component name="labelToRoleBhv" class="org.codelibs.fess.es.config.exbhv.LabelToRoleBhv"/>
-    <component name="pathMappingBhv" class="org.codelibs.fess.es.config.exbhv.PathMappingBhv"/>
-    <component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
-    <component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>
-    <component name="scheduledJobBhv" class="org.codelibs.fess.es.config.exbhv.ScheduledJobBhv"/>
-    <component name="thumbnailQueueBhv" class="org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv"/>
-    <component name="webAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv"/>
-    <component name="webConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToLabelBhv"/>
-    <component name="webConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv"/>
-    <component name="webConfigBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigBhv"/>
+	<!-- The components of Behavior. -->
+	<component name="accessTokenBhv" class="org.codelibs.fess.es.config.exbhv.AccessTokenBhv"/>
+	<component name="badWordBhv" class="org.codelibs.fess.es.config.exbhv.BadWordBhv"/>
+	<component name="boostDocumentRuleBhv" class="org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv"/>
+	<component name="crawlingInfoBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv"/>
+	<component name="crawlingInfoParamBhv" class="org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv"/>
+	<component name="dataConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToLabelBhv"/>
+	<component name="dataConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigToRoleBhv"/>
+	<component name="dataConfigBhv" class="org.codelibs.fess.es.config.exbhv.DataConfigBhv"/>
+	<component name="duplicateHostBhv" class="org.codelibs.fess.es.config.exbhv.DuplicateHostBhv"/>
+	<component name="elevateWordToLabelBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv"/>
+	<component name="elevateWordBhv" class="org.codelibs.fess.es.config.exbhv.ElevateWordBhv"/>
+	<component name="failureUrlBhv" class="org.codelibs.fess.es.config.exbhv.FailureUrlBhv"/>
+	<component name="fileAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv"/>
+	<component name="fileConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigToLabelBhv"/>
+	<component name="fileConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigToRoleBhv"/>
+	<component name="fileConfigBhv" class="org.codelibs.fess.es.config.exbhv.FileConfigBhv"/>
+	<component name="jobLogBhv" class="org.codelibs.fess.es.config.exbhv.JobLogBhv"/>
+	<component name="keyMatchBhv" class="org.codelibs.fess.es.config.exbhv.KeyMatchBhv"/>
+	<component name="labelTypeBhv" class="org.codelibs.fess.es.config.exbhv.LabelTypeBhv"/>
+	<component name="labelToRoleBhv" class="org.codelibs.fess.es.config.exbhv.LabelToRoleBhv"/>
+	<component name="pathMappingBhv" class="org.codelibs.fess.es.config.exbhv.PathMappingBhv"/>
+	<component name="requestHeaderBhv" class="org.codelibs.fess.es.config.exbhv.RequestHeaderBhv"/>
+	<component name="roleTypeBhv" class="org.codelibs.fess.es.config.exbhv.RoleTypeBhv"/>
+	<component name="scheduledJobBhv" class="org.codelibs.fess.es.config.exbhv.ScheduledJobBhv"/>
+	<component name="thumbnailQueueBhv" class="org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv"/>
+	<component name="webAuthenticationBhv" class="org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv"/>
+	<component name="webConfigToLabelBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToLabelBhv"/>
+	<component name="webConfigToRoleBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv"/>
+	<component name="webConfigBhv" class="org.codelibs.fess.es.config.exbhv.WebConfigBhv"/>
 
 </components>

+ 7 - 6
src/main/resources/esflute_log.xml

@@ -5,12 +5,13 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
+	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
-    <!-- The components of Behavior. -->
-    <component name="clickLogBhv" class="org.codelibs.fess.es.log.exbhv.ClickLogBhv"/>
-    <component name="favoriteLogBhv" class="org.codelibs.fess.es.log.exbhv.FavoriteLogBhv"/>
-    <component name="searchFieldLogBhv" class="org.codelibs.fess.es.log.exbhv.SearchFieldLogBhv"/>
-    <component name="searchLogBhv" class="org.codelibs.fess.es.log.exbhv.SearchLogBhv"/>
-    <component name="userInfoBhv" class="org.codelibs.fess.es.log.exbhv.UserInfoBhv"/>
+	<!-- The components of Behavior. -->
+	<component name="clickLogBhv" class="org.codelibs.fess.es.log.exbhv.ClickLogBhv"/>
+	<component name="favoriteLogBhv" class="org.codelibs.fess.es.log.exbhv.FavoriteLogBhv"/>
+	<component name="searchFieldLogBhv" class="org.codelibs.fess.es.log.exbhv.SearchFieldLogBhv"/>
+	<component name="searchLogBhv" class="org.codelibs.fess.es.log.exbhv.SearchLogBhv"/>
+	<component name="userInfoBhv" class="org.codelibs.fess.es.log.exbhv.UserInfoBhv"/>
 </components>

+ 5 - 4
src/main/resources/esflute_user.xml

@@ -5,10 +5,11 @@
 	<include path="esclient.xml"/>
 
 	<!-- The components of DBFlute Runtime. -->
+	<component name="invokerAssistant" class="org.codelibs.fess.es.common.ImplementedInvokerAssistant"/>
 	<component name="behaviorCommandInvoker" class="org.dbflute.bhv.core.BehaviorCommandInvoker"/>
 
-    <!-- The components of Behavior. -->
-    <component name="userBhv" class="org.codelibs.fess.es.user.exbhv.UserBhv"/>
-    <component name="roleBhv" class="org.codelibs.fess.es.user.exbhv.RoleBhv"/>
-    <component name="groupBhv" class="org.codelibs.fess.es.user.exbhv.GroupBhv"/>
+	<!-- The components of Behavior. -->
+	<component name="userBhv" class="org.codelibs.fess.es.user.exbhv.UserBhv"/>
+	<component name="roleBhv" class="org.codelibs.fess.es.user.exbhv.RoleBhv"/>
+	<component name="groupBhv" class="org.codelibs.fess.es.user.exbhv.GroupBhv"/>
 </components>