diff --git a/dbflute_fess/dfprop/esfluteMap.dfprop b/dbflute_fess/dfprop/esfluteMap.dfprop
index dc3e0a11831d2388dcd6e4c8aa131dc984806ae8..b9c9cc878282d7e4003545eb153c3bd8ca678986 100644
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@@ -31,4 +31,5 @@ map:{
             }
         }
     }
+    ; elasticsearchVersion = 2.0.0
 }
diff --git a/pom.xml b/pom.xml
index d0f2d4f2ce4abb5280d93a90f66265fb4a3d850d..308af8b167b793515f54c333a4311ef66ddf985b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
 		<crawler.version>1.0.0-SNAPSHOT</crawler.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>1.7.3</elasticsearch.version>
-		<cluster.runner.version>1.7.0.1-SNAPSHOT</cluster.runner.version>
+		<elasticsearch.version>2.0.0</elasticsearch.version>
+		<cluster.runner.version>2.0.0.0-SNAPSHOT</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.boot.version>0.3.8-RC9</tomcat.boot.version>
@@ -277,26 +277,26 @@
 						<mkdir dir="${basedir}/target/plugins" />
 						<get dest="${basedir}/target/plugins">
 							<url
-								url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/1.7.1/elasticsearch-analysis-kuromoji-neologd-1.7.1.zip" />
+								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/2.0.0-SNAPSHOT/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
 							<url
-								url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-synonym/1.5.0/elasticsearch-analysis-synonym-1.5.0.zip" />
+								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-synonym/2.0.0-SNAPSHOT/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
 							<url
-								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/1.7.1-SNAPSHOT/elasticsearch-configsync-1.7.1-20151008.061136-2.zip" />
+								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
 							<url
-								url="${maven.release.repo.url}/org/codelibs/elasticsearch-langfield/1.7.0/elasticsearch-langfield-1.7.0.zip" />
+								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-langfield/2.0.0-SNAPSHOT/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
 							<url
 								url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-1.5.7.1.zip" />
 						</get>
 						<delete dir="${basedir}/plugins" />
 						<mkdir dir="${basedir}/plugins" />
 						<unzip dest="${basedir}/plugins/analysis-kuromoji-neologd"
-							src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-1.7.1.zip" />
+							src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
 						<unzip dest="${basedir}/plugins/analysis-synonym"
-							src="${basedir}/target/plugins/elasticsearch-analysis-synonym-1.5.0.zip" />
+							src="${basedir}/target/plugins/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
 						<unzip dest="${basedir}/plugins/configsync"
-							src="${basedir}/target/plugins/elasticsearch-configsync-1.7.1-20151008.061136-2.zip" />
+							src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
 						<unzip dest="${basedir}/plugins/langfield"
-							src="${basedir}/target/plugins/elasticsearch-langfield-1.7.0.zip" />
+							src="${basedir}/target/plugins/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
 						<unzip dest="${basedir}/plugins/kopf"
 							src="${basedir}/target/plugins/elasticsearch-kopf-1.5.7.1.zip" />
 					</tasks>
@@ -392,18 +392,6 @@
 		</dependency>
 
 		<!-- servlet -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>${servlet.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>javax.servlet.jsp-api</artifactId>
-			<version>${jsp.version}</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
@@ -558,6 +546,24 @@
 			<version>${tomcat.boot.version}</version>
 			<!-- Disable scope at development on IDEA -->
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-servlet-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-juli</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-util-scan</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- test -->
diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json
index 45cbf9618761d69213b59ce116fc750657f9d3cb..cf005dc49647d0a269b17bdea2eaf853a3d61e3e 100644
--- a/src/main/config/es/fess_config.json
+++ b/src/main/config/es/fess_config.json
@@ -5,14 +5,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "labelTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -27,18 +20,11 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "dataConfigId" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "roleTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -49,9 +35,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -60,10 +43,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "processType" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -92,9 +71,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "boostExpr" : {
             "type" : "string",
@@ -107,10 +83,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "sortOrder" : {
             "type" : "integer"
           },
@@ -131,18 +103,11 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "fileConfigId" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "roleTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -153,17 +118,10 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "endTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "jobName" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -197,9 +155,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -208,10 +163,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -236,9 +187,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "available" : {
             "type" : "boolean"
@@ -268,10 +216,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "includedDocUrls" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -317,9 +261,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "authRealm" : {
             "type" : "string",
@@ -336,10 +277,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "parameters" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -376,18 +313,11 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "dataConfigId" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "labelTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -398,9 +328,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -409,10 +336,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "overlappingName" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -437,9 +360,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -448,10 +368,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -477,9 +393,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -488,10 +401,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "suggestWord" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -517,9 +426,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "available" : {
             "type" : "boolean"
@@ -546,10 +452,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -570,9 +472,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "crawlingSessionId" : {
             "type" : "string",
@@ -581,10 +480,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "key" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -599,14 +494,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "roleTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -621,9 +509,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -640,10 +525,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "parameters" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -676,9 +557,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdTime" : {
             "type" : "long"
@@ -686,10 +564,6 @@
           "expiredTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -704,9 +578,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "boost" : {
             "type" : "float"
@@ -718,10 +589,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "maxSize" : {
             "type" : "integer"
           },
@@ -746,14 +613,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "labelTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -768,9 +628,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "boost" : {
             "type" : "float"
@@ -782,10 +639,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "reading" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -815,18 +668,11 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "fileConfigId" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "labelTypeId" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -837,9 +683,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "available" : {
             "type" : "boolean"
@@ -869,10 +712,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "includedDocPaths" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -914,9 +753,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "available" : {
             "type" : "boolean"
@@ -935,10 +771,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "jobLogging" : {
             "type" : "boolean"
           },
@@ -974,9 +806,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "configId" : {
             "type" : "string",
@@ -993,10 +822,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "lastAccessTime" : {
             "type" : "long"
           },
@@ -1014,9 +839,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdBy" : {
             "type" : "string",
@@ -1029,10 +851,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "includedPaths" : {
             "type" : "string",
             "index" : "not_analyzed"
diff --git a/src/main/config/es/fess_log.json b/src/main/config/es/fess_log.json
index c3f0e2b9be9abf743e28ce94c4b8428c2402d10c..463e69b43374eac7ce788d50e5445b219d396404 100644
--- a/src/main/config/es/fess_log.json
+++ b/src/main/config/es/fess_log.json
@@ -5,14 +5,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -31,17 +24,10 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "url" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -56,9 +42,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "createdAt" : {
             "type" : "date",
@@ -72,10 +55,6 @@
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "message" : {
             "type" : "string"
           },
@@ -89,14 +68,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "requestedTime" : {
             "type" : "long"
           },
@@ -114,9 +86,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "accessType" : {
             "type" : "string",
@@ -129,10 +98,6 @@
           "hitCount" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "queryOffset" : {
             "type" : "integer"
           },
@@ -171,9 +136,6 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "code" : {
             "type" : "string",
@@ -182,10 +144,6 @@
           "createdTime" : {
             "type" : "long"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "updatedTime" : {
             "type" : "long"
           }
diff --git a/src/main/config/es/fess_user.json b/src/main/config/es/fess_user.json
index 084f5eda51286a3220fa7db139608254b0ee0aa8..996950047877f892b6b35ad919a36b03f3a075f8 100644
--- a/src/main/config/es/fess_user.json
+++ b/src/main/config/es/fess_user.json
@@ -5,14 +5,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -23,18 +16,11 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
           "groups" : {
             "type" : "string",
             "index" : "not_analyzed"
           },
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
@@ -53,14 +39,7 @@
         "_all" : {
           "enabled" : false
         },
-        "_id" : {
-          "path" : "id"
-        },
         "properties" : {
-          "id" : {
-            "type" : "string",
-            "index" : "not_analyzed"
-          },
           "name" : {
             "type" : "string",
             "index" : "not_analyzed"
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 54c64afab56d42554044b5e768d4e4f5f2c63bf1..2224a2cd3c76013851938f724721445a73e801ec 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -17,8 +17,8 @@ package org.codelibs.fess.entity;
 
 import org.codelibs.core.lang.StringUtil;
 import org.elasticsearch.common.unit.DistanceUnit;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
 
 public class GeoInfo {
     //@Mask(mask = "-?([0-9]+|[0-9]+\\.[0-9]+)")
@@ -35,7 +35,7 @@ public class GeoInfo {
 
     private boolean isInit = false;
 
-    private FilterBuilder builder;
+    private QueryBuilder builder;
 
     private void init() {
         if (!isInit) {
@@ -74,7 +74,7 @@ public class GeoInfo {
                     }
                 }
 
-                builder = FilterBuilders.geoDistanceFilter("geo_info").distance(dist, DistanceUnit.KILOMETERS).lat(lat).lon(lon);
+                builder = QueryBuilders.geoDistanceQuery("geo_info").distance(dist, DistanceUnit.KILOMETERS).lat(lat).lon(lon);
             } catch (final NumberFormatException e) {
                 clear();
             }
@@ -93,7 +93,7 @@ public class GeoInfo {
         return builder != null;
     }
 
-    public FilterBuilder toFilterBuilder() {
+    public QueryBuilder toQueryBuilder() {
         init();
         return builder;
     }
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index 6a83c217834f265d0a505cb983fdfbada273dc50..78b11b10a41b89dc48689899f176cb6558bfb5f7 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -26,7 +26,6 @@ import java.util.stream.Stream;
 
 import org.codelibs.fess.Constants;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -52,10 +51,6 @@ public class QueryContext {
         });
     }
 
-    public void addFilter(final FilterBuilder filterBuilder) {
-        queryBuilder = QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
-    }
-
     public void addQuery(final Consumer<BoolQueryBuilder> boolQuery) {
         BoolQueryBuilder builder;
         if (queryBuilder instanceof BoolQueryBuilder) {
@@ -104,4 +99,8 @@ public class QueryContext {
         highlightedQuerySet.add(text);
     }
 
+    public String getQueryString() {
+        return queryString;
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 88e116876880a4e094bbef6bfcfaf7e8cc10c7db..4bf4fc4f7bc74300d07c6089cbc197139a9bbeb7 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -18,6 +18,8 @@ package org.codelibs.fess.es.client;
 import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
 
 import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,11 +48,13 @@ import org.codelibs.fess.entity.FacetInfo;
 import org.codelibs.fess.entity.GeoInfo;
 import org.codelibs.fess.entity.PingResponse;
 import org.codelibs.fess.entity.QueryContext;
+import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.QueryHelper;
 import org.codelibs.fess.indexer.FessSearchQueryException;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.StreamUtil;
+import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.Action;
@@ -59,7 +63,6 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
@@ -76,9 +79,6 @@ import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteRequestBuilder;
 import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
 import org.elasticsearch.action.exists.ExistsRequest;
 import org.elasticsearch.action.exists.ExistsRequestBuilder;
 import org.elasticsearch.action.exists.ExistsResponse;
@@ -107,8 +107,6 @@ import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptResponse;
 import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
 import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequestBuilder;
 import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
-import org.elasticsearch.action.mlt.MoreLikeThisRequest;
-import org.elasticsearch.action.mlt.MoreLikeThisRequestBuilder;
 import org.elasticsearch.action.percolate.MultiPercolateRequest;
 import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder;
 import org.elasticsearch.action.percolate.MultiPercolateResponse;
@@ -126,36 +124,37 @@ import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
 import org.elasticsearch.action.search.SearchScrollRequestBuilder;
+import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.action.suggest.SuggestRequest;
 import org.elasticsearch.action.suggest.SuggestRequestBuilder;
 import org.elasticsearch.action.suggest.SuggestResponse;
-import org.elasticsearch.action.termvector.MultiTermVectorsRequest;
-import org.elasticsearch.action.termvector.MultiTermVectorsRequestBuilder;
-import org.elasticsearch.action.termvector.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvector.TermVectorRequest;
-import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
-import org.elasticsearch.action.termvector.TermVectorResponse;
+import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
+import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
+import org.elasticsearch.action.termvectors.TermVectorsRequest;
+import org.elasticsearch.action.termvectors.TermVectorsRequestBuilder;
+import org.elasticsearch.action.termvectors.TermVectorsResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.AdminClient;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.client.support.Headers;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.settings.ImmutableSettings;
-import org.elasticsearch.common.settings.ImmutableSettings.Builder;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.Settings.Builder;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.get.GetField;
-import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.indices.IndexAlreadyExistsException;
-import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
+import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
@@ -184,6 +183,10 @@ public class FessEsClient implements Client {
 
     protected Map<String, List<String>> configListMap = new HashMap<>();
 
+    protected int sizeForDelete = 100;
+
+    protected String scrollForDelete = "1m";
+
     public void addIndexConfig(final String path) {
         indexConfigList.add(path);
     }
@@ -218,7 +221,11 @@ public class FessEsClient implements Client {
     }
 
     public void addTransportAddress(final String host, final int port) {
-        transportAddressList.add(new InetSocketTransportAddress(host, port));
+        try {
+            transportAddressList.add(new InetSocketTransportAddress(InetAddress.getByName(host), port));
+        } catch (UnknownHostException e) {
+            throw new FessSystemException("Failed to resolve the hostname: " + host, e);
+        }
     }
 
     @PostConstruct
@@ -268,10 +275,10 @@ public class FessEsClient implements Client {
             client = runner.client();
             addTransportAddress("localhost", runner.node().settings().getAsInt("transport.tcp.port", 9300));
         } else {
-            final Builder settingsBuilder = ImmutableSettings.settingsBuilder();
+            final Builder settingsBuilder = Settings.settingsBuilder();
             settingsBuilder.put("cluster.name", clusterName);
             final Settings settings = settingsBuilder.build();
-            final TransportClient transportClient = new TransportClient(settings);
+            final TransportClient transportClient = TransportClient.builder().settings(settings).build();
             for (final TransportAddress address : transportAddressList) {
                 transportClient.addTransportAddress(address);
             }
@@ -311,7 +318,7 @@ public class FessEsClient implements Client {
                 try {
                     client.prepareExists(configIndex).execute().actionGet();
                     exists = true;
-                } catch (final IndexMissingException e) {
+                } catch (final IndexNotFoundException e) {
                     // ignore
             }
             if (!exists) {
@@ -437,23 +444,35 @@ public class FessEsClient implements Client {
         }
     }
 
-    public void deleteByQuery(final String index, final String type, final QueryBuilder queryBuilder) {
-        try {
-            // TODO replace with deleting bulk ids with scroll/scan
-            client.prepareDeleteByQuery(index).setQuery(queryBuilder).setTypes(type).execute().actionGet().forEach(res -> {
-                final ShardOperationFailedException[] failures = res.getFailures();
-                if (failures.length > 0) {
-                    final StringBuilder buf = new StringBuilder(200);
-                    buf.append("Failed to delete documents in some shards.");
-                    for (final ShardOperationFailedException failure : failures) {
-                        buf.append('\n').append(failure.toString());
-                    }
-                    throw new FessEsClientException(buf.toString());
-                }
-            });
-        } catch (final ElasticsearchException e) {
-            throw new FessEsClientException("Failed to delete documents.", e);
+    public int deleteByQuery(final String index, final String type, final QueryBuilder queryBuilder) {
+
+        final SearchResponse response =
+                client.prepareSearch(index).setTypes(type).setSearchType(SearchType.SCAN).setScroll(scrollForDelete).setSize(sizeForDelete)
+                        .setQuery(queryBuilder).execute().actionGet();
+
+        int count = 0;
+        String scrollId = response.getScrollId();
+        while (scrollId != null) {
+            final SearchResponse scrollResponse = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet();
+            scrollId = scrollResponse.getScrollId();
+            final SearchHits searchHits = scrollResponse.getHits();
+            final SearchHit[] hits = searchHits.getHits();
+            if (hits.length == 0) {
+                scrollId = null;
+                break;
+            }
+
+            final BulkRequestBuilder bulkRequest = client.prepareBulk();
+            for (final SearchHit hit : hits) {
+                bulkRequest.add(client.prepareDelete(index, type, hit.getId()));
+            }
+            count += hits.length;
+            final BulkResponse bulkResponse = bulkRequest.execute().actionGet();
+            if (bulkResponse.hasFailures()) {
+                throw new IllegalBehaviorStateException(bulkResponse.buildFailureMessage());
+            }
         }
+        return count;
     }
 
     public <T> T get(final String index, final String type, final String id, final SearchCondition<GetRequestBuilder> condition,
@@ -743,7 +762,9 @@ public class FessEsClient implements Client {
             final QueryContext queryContext = queryHelper.build(query, context -> {
                 // geo
                     if (geoInfo != null && geoInfo.isAvailable()) {
-                        context.addFilter(geoInfo.toFilterBuilder());
+                        context.addQuery(boolQuery -> {
+                            boolQuery.filter(geoInfo.toQueryBuilder());
+                        });
                     }
                 });
 
@@ -783,7 +804,7 @@ public class FessEsClient implements Client {
                                 final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
                                 final FilterAggregationBuilder filterBuilder =
                                         AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery).filter(
-                                                FilterBuilders.queryFilter(facetContext.getQueryBuilder()));
+                                                facetContext.getQueryBuilder());
                                 // TODO order
                                 if (facetInfo.limit != null) {
                                     // TODO
@@ -857,24 +878,6 @@ public class FessEsClient implements Client {
     // Elasticsearch Client
     //
 
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> ActionFuture<Response> execute(
-            final Action<Request, Response, RequestBuilder, Client> action, final Request request) {
-        return client.execute(action, request);
-    }
-
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> void execute(
-            final Action<Request, Response, RequestBuilder, Client> action, final Request request, final ActionListener<Response> listener) {
-        client.execute(action, request, listener);
-    }
-
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> RequestBuilder prepareExecute(
-            final Action<Request, Response, RequestBuilder, Client> action) {
-        return client.prepareExecute(action);
-    }
-
     @Override
     public ThreadPool threadPool() {
         return client.threadPool();
@@ -965,21 +968,6 @@ public class FessEsClient implements Client {
         return client.prepareBulk();
     }
 
-    @Override
-    public ActionFuture<DeleteByQueryResponse> deleteByQuery(final DeleteByQueryRequest request) {
-        return client.deleteByQuery(request);
-    }
-
-    @Override
-    public void deleteByQuery(final DeleteByQueryRequest request, final ActionListener<DeleteByQueryResponse> listener) {
-        client.deleteByQuery(request, listener);
-    }
-
-    @Override
-    public DeleteByQueryRequestBuilder prepareDeleteByQuery(final String... indices) {
-        return client.prepareDeleteByQuery(indices);
-    }
-
     @Override
     public ActionFuture<GetResponse> get(final GetRequest request) {
         return client.get(request);
@@ -1165,56 +1153,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiSearch();
     }
 
-    @Override
-    public ActionFuture<SearchResponse> moreLikeThis(final MoreLikeThisRequest request) {
-        return client.moreLikeThis(request);
-    }
-
-    @Override
-    public void moreLikeThis(final MoreLikeThisRequest request, final ActionListener<SearchResponse> listener) {
-        client.moreLikeThis(request, listener);
-    }
-
-    @Override
-    public MoreLikeThisRequestBuilder prepareMoreLikeThis(final String index, final String type, final String id) {
-        return client.prepareMoreLikeThis(index, type, id);
-    }
-
-    @Override
-    public ActionFuture<TermVectorResponse> termVector(final TermVectorRequest request) {
-        return client.termVector(request);
-    }
-
-    @Override
-    public void termVector(final TermVectorRequest request, final ActionListener<TermVectorResponse> listener) {
-        client.termVector(request, listener);
-    }
-
-    @Override
-    public TermVectorRequestBuilder prepareTermVector() {
-        return client.prepareTermVector();
-    }
-
-    @Override
-    public TermVectorRequestBuilder prepareTermVector(final String index, final String type, final String id) {
-        return client.prepareTermVector(index, type, id);
-    }
-
-    @Override
-    public ActionFuture<MultiTermVectorsResponse> multiTermVectors(final MultiTermVectorsRequest request) {
-        return client.multiTermVectors(request);
-    }
-
-    @Override
-    public void multiTermVectors(final MultiTermVectorsRequest request, final ActionListener<MultiTermVectorsResponse> listener) {
-        client.multiTermVectors(request, listener);
-    }
-
-    @Override
-    public MultiTermVectorsRequestBuilder prepareMultiTermVectors() {
-        return client.prepareMultiTermVectors();
-    }
-
     @Override
     public ActionFuture<PercolateResponse> percolate(final PercolateRequest request) {
         return client.percolate(request);
@@ -1295,4 +1233,90 @@ public class FessEsClient implements Client {
         return client.settings();
     }
 
+    @Override
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
+            Action<Request, Response, RequestBuilder> action, Request request) {
+        return client.execute(action, request);
+    }
+
+    @Override
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
+            Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
+        client.execute(action, request, listener);
+    }
+
+    @Override
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
+            Action<Request, Response, RequestBuilder> action) {
+        return client.prepareExecute(action);
+    }
+
+    @Override
+    public ActionFuture<TermVectorsResponse> termVectors(TermVectorsRequest request) {
+        return client.termVectors(request);
+    }
+
+    @Override
+    public void termVectors(TermVectorsRequest request, ActionListener<TermVectorsResponse> listener) {
+        client.termVector(request, listener);
+    }
+
+    @Override
+    public TermVectorsRequestBuilder prepareTermVectors() {
+        return client.prepareTermVectors();
+    }
+
+    @Override
+    public TermVectorsRequestBuilder prepareTermVectors(String index, String type, String id) {
+        return client.prepareTermVectors(index, type, id);
+    }
+
+    @Override
+    public ActionFuture<TermVectorsResponse> termVector(TermVectorsRequest request) {
+        return client.termVector(request);
+    }
+
+    @Override
+    public void termVector(TermVectorsRequest request, ActionListener<TermVectorsResponse> listener) {
+        client.termVector(request, listener);
+    }
+
+    @Override
+    public TermVectorsRequestBuilder prepareTermVector() {
+        return client.prepareTermVector();
+    }
+
+    @Override
+    public TermVectorsRequestBuilder prepareTermVector(String index, String type, String id) {
+        return client.prepareTermVector(index, type, id);
+    }
+
+    @Override
+    public ActionFuture<MultiTermVectorsResponse> multiTermVectors(MultiTermVectorsRequest request) {
+        return client.multiTermVectors(request);
+    }
+
+    @Override
+    public void multiTermVectors(MultiTermVectorsRequest request, ActionListener<MultiTermVectorsResponse> listener) {
+        client.multiTermVectors(request, listener);
+    }
+
+    @Override
+    public MultiTermVectorsRequestBuilder prepareMultiTermVectors() {
+        return client.prepareMultiTermVectors();
+    }
+
+    @Override
+    public Headers headers() {
+        return client.headers();
+    }
+
+    public void setSizeForDelete(int sizeForDelete) {
+        this.sizeForDelete = sizeForDelete;
+    }
+
+    public void setScrollForDelete(String scrollForDelete) {
+        this.scrollForDelete = scrollForDelete;
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java
deleted file mode 100644
index 3c2142f18739ff1ebd950ce94e183862594a85ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.allcommon;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
-import org.elasticsearch.index.query.IdsFilterBuilder;
-import org.elasticsearch.index.query.MatchAllFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.ScriptFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EsAbstractConditionFilter {
-
-    // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    protected List<FilterBuilder> filterBuilderList;
-
-    // ===================================================================================
-    //                                                                             Control
-    //                                                                             =======
-    public boolean hasFilters() {
-        return filterBuilderList != null && !filterBuilderList.isEmpty();
-    }
-
-    public FilterBuilder getFilter() {
-        if (filterBuilderList == null) {
-            return null;
-        } else if (filterBuilderList.size() == 1) {
-            return filterBuilderList.get(0);
-        }
-        return FilterBuilders.andFilter(filterBuilderList.toArray(new FilterBuilder[filterBuilderList.size()]));
-    }
-
-    public void addFilter(FilterBuilder filterBuilder) {
-        regF(filterBuilder);
-    }
-
-    // ===================================================================================
-    //                                                                               Query
-    //                                                                               =====
-    public void setIds_Equal(Collection<String> idList) {
-        checkEsInvalidQueryCollection("ids", idList);
-        doSetIds_Equal(idList, null);
-    }
-
-    public void setIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        checkEsInvalidQueryCollection("ids", idList);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetIds_Equal(idList, opLambda);
-    }
-
-    protected void doSetIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        IdsFilterBuilder builder = regIdsF(idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void matchAll() {
-        doMatchAll(null);
-    }
-
-    public void matchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        assertObjectNotNull("opLambda", opLambda);
-        doMatchAll(opLambda);
-    }
-
-    protected void doMatchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        MatchAllFilterBuilder builder = FilterBuilders.matchAllFilter();
-        regF(builder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScript(String script) {
-        checkEsInvalidQuery("script", script);
-        doSetScript(script, null);
-    }
-
-    public void setScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        checkEsInvalidQuery("script", script);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetScript(script, opLambda);
-    }
-
-    protected void doSetScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        ScriptFilterBuilder builder = regScriptF(script);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                            Register
-    //                                                                            ========
-    protected void regF(FilterBuilder builder) {
-        assertObjectNotNull("builder", builder);
-        if (filterBuilderList == null) {
-            filterBuilderList = new ArrayList<>();
-        }
-        filterBuilderList.add(builder);
-    }
-
-    protected TermFilterBuilder regTermF(String name, Object value) {
-        checkEsInvalidQuery(name, value);
-        TermFilterBuilder termFilter = FilterBuilders.termFilter(name, value);
-        regF(termFilter);
-        return termFilter;
-    }
-
-    protected TermsFilterBuilder regTermsF(String name, Collection<?> values) {
-        checkEsInvalidQueryCollection(name, values);
-        TermsFilterBuilder termsFilter = FilterBuilders.termsFilter(name, values);
-        regF(termsFilter);
-        return termsFilter;
-    }
-
-    protected PrefixFilterBuilder regPrefixF(String name, String value) {
-        checkEsInvalidQuery(name, value);
-        PrefixFilterBuilder prefixFilter = FilterBuilders.prefixFilter(name, value);
-        regF(prefixFilter);
-        return prefixFilter;
-    }
-
-    protected ExistsFilterBuilder regExistsF(String name) {
-        ExistsFilterBuilder existsFilter = FilterBuilders.existsFilter(name);
-        regF(existsFilter);
-        return existsFilter;
-    }
-
-    protected MissingFilterBuilder regMissingF(String name) {
-        MissingFilterBuilder missingFilter = FilterBuilders.missingFilter(name);
-        regF(missingFilter);
-        return missingFilter;
-    }
-
-    protected RangeFilterBuilder regRangeF(String name, ConditionKey ck, Object value) {
-        checkEsInvalidQuery(name, value);
-        assertObjectNotNull("ck", ck);
-        for (FilterBuilder builder : filterBuilderList) {
-            if (builder instanceof RangeFilterBuilder) {
-                RangeFilterBuilder rangeFilterBuilder = (RangeFilterBuilder) builder;
-                if (rangeFilterBuilder.toString().replaceAll("\\s", "").startsWith("{\"range\":{\"" + name + "\"")) {
-                    addRangeC(rangeFilterBuilder, ck, value);
-                    return rangeFilterBuilder;
-                }
-            }
-        }
-        RangeFilterBuilder rangeFilterBuilder = FilterBuilders.rangeFilter(name);
-        addRangeC(rangeFilterBuilder, ck, value);
-        regF(rangeFilterBuilder);
-        return rangeFilterBuilder;
-    }
-
-    protected void addRangeC(RangeFilterBuilder builder, ConditionKey ck, Object value) {
-        assertObjectNotNull("builder", builder);
-        assertObjectNotNull("ck", ck);
-        if (ck.equals(ConditionKey.CK_GREATER_THAN)) {
-            builder.gt(value);
-        } else if (ck.equals(ConditionKey.CK_GREATER_EQUAL)) {
-            builder.gte(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_THAN)) {
-            builder.lt(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_EQUAL)) {
-            builder.lte(value);
-        }
-    }
-
-    protected ScriptFilterBuilder regScriptF(String script) {
-        checkEsInvalidQuery("script", script);
-        ScriptFilterBuilder scriptFilter = FilterBuilders.scriptFilter(script);
-        regF(scriptFilter);
-        return scriptFilter;
-    }
-
-    protected IdsFilterBuilder regIdsF(Collection<?> values) {
-        checkEsInvalidQueryCollection("idsF", values);
-        IdsFilterBuilder idsFilter = FilterBuilders.idsFilter(values.toArray(new String[values.size()]));
-        regF(idsFilter);
-        return idsFilter;
-    }
-
-    protected BoolFilterBuilder regBoolF(List<FilterBuilder> mustList, List<FilterBuilder> shouldList, List<FilterBuilder> mustNotList) {
-        assertObjectNotNull("mustList", mustList);
-        assertObjectNotNull("shouldList", shouldList);
-        assertObjectNotNull("mustNotList", mustNotList);
-        BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
-        mustList.forEach(query -> {
-            boolFilter.must(query);
-        });
-        shouldList.forEach(query -> {
-            boolFilter.should(query);
-        });
-        mustNotList.forEach(query -> {
-            boolFilter.mustNot(query);
-        });
-        return boolFilter;
-    }
-
-    protected AndFilterBuilder regAndF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        AndFilterBuilder andFilter = FilterBuilders.andFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected OrFilterBuilder regOrF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        OrFilterBuilder andFilter = FilterBuilders.orFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected NotFilterBuilder regNotF(FilterBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        NotFilterBuilder notFilter = FilterBuilders.notFilter(filter);
-        regF(notFilter);
-        return notFilter;
-    }
-
-    protected QueryFilterBuilder regQueryF(QueryBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        QueryFilterBuilder queryFilter = FilterBuilders.queryFilter(filter);
-        regF(queryFilter);
-        return queryFilter;
-    }
-
-    // ===================================================================================
-    //                                                                       Invalid Query
-    //                                                                       =============
-    protected void checkEsInvalidQuery(String name, Object value) {
-        if (value == null || (value instanceof String && ((String) value).isEmpty())) {
-            String msg = "Cannot register null or empty query: name=" + name + " value=" + value;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    protected void checkEsInvalidQueryCollection(String name, Collection<?> values) {
-        if (values == null || values.isEmpty()) {
-            String msg = "Cannot register null or empty query collection: name=" + name + " values=" + values;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                      General Helper
-    //                                                                      ==============
-    protected void assertObjectNotNull(String variableName, Object value) {
-        if (variableName == null) {
-            String msg = "The value should not be null: variableName=null value=" + value;
-            throw new IllegalArgumentException(msg);
-        }
-        if (value == null) {
-            String msg = "The value should not be null: variableName=" + variableName;
-            throw new IllegalArgumentException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                        Assist Class
-    //                                                                        ============
-    @FunctionalInterface
-    public interface ConditionOptionCall<OP extends FilterBuilder> {
-
-        /**
-         * @param op The option of condition to be set up. (NotNull)
-         */
-        void callback(OP op);
-    }
-
-    @FunctionalInterface
-    public interface BoolCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF must, CF should, CF mustNot);
-    }
-
-    @FunctionalInterface
-    public interface OperatorCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF and);
-    }
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index d8e8e0c4326f68fecabfac7494d85045aff1e49b..02811d6586eec13b64a9c582c433e84e319502e3 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -33,9 +33,8 @@ import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 import org.elasticsearch.index.query.FuzzyQueryBuilder;
+import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -141,16 +140,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
-    protected FilteredQueryBuilder regFilteredQ(QueryBuilder queryBuilder, FilterBuilder filterBuilder) {
-        assertObjectNotNull("queryBuilder", queryBuilder);
-        assertObjectNotNull("filterBuilder", filterBuilder);
-        return QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
-    }
 
-    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList) {
+    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList,
+            List<QueryBuilder> filterList) {
         assertObjectNotNull("mustList", mustList);
         assertObjectNotNull("shouldList", shouldList);
         assertObjectNotNull("mustNotList", mustNotList);
+        assertObjectNotNull("filterList", filterList);
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         mustList.forEach(query -> {
             boolQuery.must(query);
@@ -161,6 +157,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         mustNotList.forEach(query -> {
             boolQuery.mustNot(query);
         });
+        filterList.forEach(query -> {
+            boolQuery.filter(query);
+        });
         return boolQuery;
     }
 
@@ -178,6 +177,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return termsQuery;
     }
 
+    protected IdsQueryBuilder regIdsQ(Collection<String> values) {
+        checkEsInvalidQueryCollection("_id", values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        regQ(idsQuery);
+        return idsQuery;
+    }
+
     protected MatchQueryBuilder regMatchQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
         MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, value);
@@ -453,11 +459,11 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface BoolCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ must, CQ should, CQ mustNot);
+        void callback(CQ must, CQ should, CQ mustNot, CQ filter);
     }
 
     @FunctionalInterface
-    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionFilter> {
+    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionQuery> {
 
         void callback(CQ query, CF filter);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
index 3ac6a682456c2495fe6644b75ab59816935dcf27..daee888d5f12a3f97aa0d7ef354f3166cdf77ac9 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
@@ -176,39 +176,54 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl
     }
 
     // ===================================================================================
-    //                                                                      Basic Override
+    //                                                                      Classification
     //                                                                      ==============
     @Override
-    public int instanceHash() { // #pending
-        return 0;
+    public void myunlockUndefinedClassificationAccess() {
     }
 
     @Override
-    public String toStringWithRelation() { // #pending
-        return null;
+    public boolean myundefinedClassificationAccessAllowed() {
+        return false;
     }
 
-    @Override
-    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
-        return null;
+    // ===================================================================================
+    //                                                                        Empty String
+    //                                                                        ============
+    protected String convertEmptyToNull(String value) {
+        return (value != null && value.length() == 0) ? null : value;
     }
 
     // ===================================================================================
-    //                                                                      Classification
+    //                                                                              Source
+    //                                                                              ======
+    public abstract Map<String, Object> toSource();
+
+    // ===================================================================================
+    //                                                                      Basic Override
     //                                                                      ==============
+    // #pending hashCode(), equals()
     @Override
-    public void myunlockUndefinedClassificationAccess() {
+    public int instanceHash() {
+        return super.hashCode();
     }
 
     @Override
-    public boolean myundefinedClassificationAccessAllowed() {
-        return false;
+    public String toString() {
+        return getClass().getSimpleName() + ":" + doBuildColumnString(", ") + "@" + Integer.toHexString(hashCode());
     }
 
-    // ===================================================================================
-    //                                                                              Source
-    //                                                                              ======
-    public abstract Map<String, Object> toSource();
+    protected abstract String doBuildColumnString(String dm);
+
+    @Override
+    public String toStringWithRelation() { // #pending
+        return toString();
+    }
+
+    @Override
+    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
+        return toString();
+    }
 
     // ===================================================================================
     //                                                                        Assist Class
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 71fbd485189cc5a67cc851dedc037e600e36d83a..24bfcfc922e504e36efa260fa5b7bfa237a0a8f8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -77,7 +77,6 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
             result.setBoostExpr(DfTypeUtil.toString(source.get("boostExpr")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionBhv.java
index 152c369e4dda3dbe44b5471d75027f74ff8fa4f1..a6df7d541da7e8a2654984fc565801fffc3f7911 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionBhv.java
@@ -76,7 +76,6 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior<CrawlingSe
             final RESULT result = entityType.newInstance();
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
             result.setExpiredTime(DfTypeUtil.toLong(source.get("expiredTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setSessionId(DfTypeUtil.toString(source.get("sessionId")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java
index f1f4e5d9ffbe0272d9077f0a9aa52ea64904585c..00731e67ce6f23267d01f1b16e74fa7fa9d52599 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java
@@ -76,7 +76,6 @@ public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior<Crawli
             final RESULT result = entityType.newInstance();
             result.setCrawlingSessionId(DfTypeUtil.toString(source.get("crawlingSessionId")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setKey(DfTypeUtil.toString(source.get("key")));
             result.setValue(DfTypeUtil.toString(source.get("value")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index cca5504a8a4f88b2492f495991545757487e3458..ccf95c26b15046ebb47630e79291b5b939948202 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -81,7 +81,6 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
             result.setHandlerName(DfTypeUtil.toString(source.get("handlerName")));
             result.setHandlerParameter(DfTypeUtil.toString(source.get("handlerParameter")));
             result.setHandlerScript(DfTypeUtil.toString(source.get("handlerScript")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
index a15f671736e1230d1cec6a8e4c0de194ec5ec4fc..a8b857e6286e37fb50746f175a56e2fd6aa82d9c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
@@ -75,7 +75,6 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior<DataConf
         try {
             final RESULT result = entityType.newInstance();
             result.setDataConfigId(DfTypeUtil.toString(source.get("dataConfigId")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
index c5b4610f87470493f225c5aa83e776eb77fbfb48..3324e475ef0c89a293197d1424e70388b37a489c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
@@ -75,7 +75,6 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior<DataConfi
         try {
             final RESULT result = entityType.newInstance();
             result.setDataConfigId(DfTypeUtil.toString(source.get("dataConfigId")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
index 3af70e10234c062d3d3fa340c31d9863f34a8b60..c6f35f01573328fe02c06617cfd8343baf832aef 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
@@ -78,7 +78,6 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
             result.setErrorCount(DfTypeUtil.toInteger(source.get("errorCount")));
             result.setErrorLog(DfTypeUtil.toString(source.get("errorLog")));
             result.setErrorName(DfTypeUtil.toString(source.get("errorName")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setLastAccessTime(DfTypeUtil.toLong(source.get("lastAccessTime")));
             result.setThreadName(DfTypeUtil.toString(source.get("threadName")));
             result.setUrl(DfTypeUtil.toString(source.get("url")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
index 95717587bc36cbde67a7277e6c4faf54e7301d13..427ee5ec715fc7984b8a9e5f8c8d53b130acbb58 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
@@ -78,7 +78,6 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
             result.setFileConfigId(DfTypeUtil.toString(source.get("fileConfigId")));
             result.setHostname(DfTypeUtil.toString(source.get("hostname")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setParameters(DfTypeUtil.toString(source.get("parameters")));
             result.setPassword(DfTypeUtil.toString(source.get("password")));
             result.setPort(DfTypeUtil.toInteger(source.get("port")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 2f3b34c40ec910d64e6c53214e005ec99922d452..828c1485cc508f7e0e4898dfb78c0837eb3d78e9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -82,7 +82,6 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
             result.setDepth(DfTypeUtil.toInteger(source.get("depth")));
             result.setExcludedDocPaths(DfTypeUtil.toString(source.get("excludedDocPaths")));
             result.setExcludedPaths(DfTypeUtil.toString(source.get("excludedPaths")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setIncludedDocPaths(DfTypeUtil.toString(source.get("includedDocPaths")));
             result.setIncludedPaths(DfTypeUtil.toString(source.get("includedPaths")));
             result.setIntervalTime(DfTypeUtil.toInteger(source.get("intervalTime")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
index 3b711b32e37b6aa272d3d783c186c9ed01257b68..00673fcebb3fde3dc5ae0c62531dd8b3557602ed 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
@@ -75,7 +75,6 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior<FileConf
         try {
             final RESULT result = entityType.newInstance();
             result.setFileConfigId(DfTypeUtil.toString(source.get("fileConfigId")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
index 7d750aa1daa4587870a0e76452046c3303e8a857..440375a7affb72d103e0687c6dd1e77f47f2bd3e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
@@ -75,7 +75,6 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior<FileConfi
         try {
             final RESULT result = entityType.newInstance();
             result.setFileConfigId(DfTypeUtil.toString(source.get("fileConfigId")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
index 71b115fab8884b2ffee6fdbca8102d2cdde72558..8d8973459bb99e6f117550757de9781b1c08def7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
@@ -75,7 +75,6 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
         try {
             final RESULT result = entityType.newInstance();
             result.setEndTime(DfTypeUtil.toLong(source.get("endTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setJobName(DfTypeUtil.toString(source.get("jobName")));
             result.setJobStatus(DfTypeUtil.toString(source.get("jobStatus")));
             result.setScriptData(DfTypeUtil.toString(source.get("scriptData")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index 545cc04e130b000bfa2d369fb2e5f0dd7c8912ab..58b062aa272025343ccf81d5a27e22ef5499e45f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -77,7 +77,6 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
             result.setBoost(DfTypeUtil.toFloat(source.get("boost")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setMaxSize(DfTypeUtil.toInteger(source.get("maxSize")));
             result.setQuery(DfTypeUtil.toString(source.get("query")));
             result.setTerm(DfTypeUtil.toString(source.get("term")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
index 7b2bf1f31ef391a532d089a84d881210cf42e278..299e2a0378b4c0e1333d57c4ab8cbd8fcf3a2773 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
@@ -74,7 +74,6 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
     protected <RESULT extends LabelToRole> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
             result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index 41599d13d552cc55c278028b7196288dd914d427..bb73b99f6a2931a36fa1ae4cf42e6ec29a9b7b6a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -77,7 +77,6 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
             result.setExcludedPaths(DfTypeUtil.toString(source.get("excludedPaths")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setIncludedPaths(DfTypeUtil.toString(source.get("includedPaths")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsOverlappingHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsOverlappingHostBhv.java
index 6cead7177316f388e1621906b9fc393acf6f141d..060bc26f8f9fc61e864dd83a013015dc305518e4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsOverlappingHostBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsOverlappingHostBhv.java
@@ -76,7 +76,6 @@ public abstract class BsOverlappingHostBhv extends EsAbstractBehavior<Overlappin
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setOverlappingName(DfTypeUtil.toString(source.get("overlappingName")));
             result.setRegularName(DfTypeUtil.toString(source.get("regularName")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
index 2e7a0dde588a0da7b96989c194066d823398369e..cafc2dad512eda7be26a31b08dfa1a12d92af4db 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
@@ -76,7 +76,6 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setProcessType(DfTypeUtil.toString(source.get("processType")));
             result.setRegex(DfTypeUtil.toString(source.get("regex")));
             result.setReplacement(DfTypeUtil.toString(source.get("replacement")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
index be6edf8370110e07fcb84dcdd0f356c08c94516f..922b605e3850f1783f41bd7a95c6b585212df5ad 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
@@ -76,7 +76,6 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
index fb10b9ffc18e0dd3aebc8c6ba4197fdf474b9879..d51a6b3048c71234b35da259cdd82089e7241bdc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
@@ -76,7 +76,6 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
index d5e11a1bb88597f3ed12b8f5f37268c4dc888b8b..7008843be9221b1f569370089d76e4644ff9b478 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
@@ -79,7 +79,6 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
             result.setCronExpression(DfTypeUtil.toString(source.get("cronExpression")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setJobLogging(DfTypeUtil.toBoolean(source.get("jobLogging")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setScriptData(DfTypeUtil.toString(source.get("scriptData")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java
index 7b0323907974a6bd1d5e2c81718a996671f1a630..d42f3a6ecf446099e670ca720354d75f2d133606 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java
@@ -76,7 +76,6 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
             final RESULT result = entityType.newInstance();
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
             result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
             result.setTargetRole(DfTypeUtil.toString(source.get("targetRole")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java
index 8b770cea93a04e0fad6b928ffbddd61c88a8d2fd..4f7a2b1ef97d25636b7094a905f29d7b54e84a04 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java
@@ -77,7 +77,6 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
             result.setBoost(DfTypeUtil.toFloat(source.get("boost")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setReading(DfTypeUtil.toString(source.get("reading")));
             result.setSuggestWord(DfTypeUtil.toString(source.get("suggestWord")));
             result.setTargetLabel(DfTypeUtil.toString(source.get("targetLabel")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
index 9122230bd86c92ee68cf6f37395207872a8d511d..964e17c4dcdddd6f4b5f3d8930a8f0eaced50f68 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
@@ -78,7 +78,6 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
             result.setHostname(DfTypeUtil.toString(source.get("hostname")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setParameters(DfTypeUtil.toString(source.get("parameters")));
             result.setPassword(DfTypeUtil.toString(source.get("password")));
             result.setPort(DfTypeUtil.toInteger(source.get("port")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index b948436fc1e0044ca4d196641dd1ac441783dae8..bdca995359b0bff3d009c46f04d712989114c447 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -82,7 +82,6 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
             result.setDepth(DfTypeUtil.toInteger(source.get("depth")));
             result.setExcludedDocUrls(DfTypeUtil.toString(source.get("excludedDocUrls")));
             result.setExcludedUrls(DfTypeUtil.toString(source.get("excludedUrls")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setIncludedDocUrls(DfTypeUtil.toString(source.get("includedDocUrls")));
             result.setIncludedUrls(DfTypeUtil.toString(source.get("includedUrls")));
             result.setIntervalTime(DfTypeUtil.toInteger(source.get("intervalTime")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
index 5da67cb311debe50a0a55180a18e68ae46669e7d..51d84564e1c76ed79701e58962e29fb7e46e3d60 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
@@ -74,7 +74,6 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior<WebConfig
     protected <RESULT extends WebConfigToLabel> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
             result.setWebConfigId(DfTypeUtil.toString(source.get("webConfigId")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
index fda1f76d474c9517b3b04722349ef16db1b4fd96..ba2b7d3133b156915f9c4adc7f80b87af584ebd4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
@@ -74,7 +74,6 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior<WebConfigT
     protected <RESULT extends WebConfigToRole> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
             result.setWebConfigId(DfTypeUtil.toString(source.get("webConfigId")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
index 8ea84e5f545e355445c0ad2b269dd5af3c133bc6..3c030143bf45be3705935597da388903d02148c9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
  */
 public class BsBoostDocumentRule extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public BoostDocumentRuleDbm asDBMeta() {
-        return BoostDocumentRuleDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "boost_document_rule";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public BoostDocumentRuleDbm asDBMeta() {
+        return BoostDocumentRuleDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "boost_document_rule";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (boostExpr != null) {
+            sourceMap.put("boostExpr", boostExpr);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (urlExpr != null) {
+            sourceMap.put("urlExpr", urlExpr);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(boostExpr);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(urlExpr);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getBoostExpr() {
         checkSpecifiedProperty("boostExpr");
-        return boostExpr;
+        return convertEmptyToNull(boostExpr);
     }
 
     public void setBoostExpr(String value) {
@@ -82,7 +138,7 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -100,16 +156,6 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Integer getSortOrder() {
         checkSpecifiedProperty("sortOrder");
         return sortOrder;
@@ -122,7 +168,7 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -142,41 +188,11 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
 
     public String getUrlExpr() {
         checkSpecifiedProperty("urlExpr");
-        return urlExpr;
+        return convertEmptyToNull(urlExpr);
     }
 
     public void setUrlExpr(String value) {
         registerModifiedProperty("urlExpr");
         this.urlExpr = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (boostExpr != null) {
-            sourceMap.put("boostExpr", boostExpr);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (urlExpr != null) {
-            sourceMap.put("urlExpr", urlExpr);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
index f00292785d23e3b37a90a3bad1f35167421eba1f..e8e09b43918c9fdb3cfa4f603845b5fb6c080a34 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionDbm;
  */
 public class BsCrawlingSession extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public CrawlingSessionDbm asDBMeta() {
-        return CrawlingSessionDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "crawling_session";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -58,6 +51,57 @@ public class BsCrawlingSession extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public CrawlingSessionDbm asDBMeta() {
+        return CrawlingSessionDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "crawling_session";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (expiredTime != null) {
+            sourceMap.put("expiredTime", expiredTime);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (sessionId != null) {
+            sourceMap.put("sessionId", sessionId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(expiredTime);
+        sb.append(dm).append(name);
+        sb.append(dm).append(sessionId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -81,19 +125,9 @@ public class BsCrawlingSession extends EsAbstractEntity {
         this.expiredTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -103,32 +137,11 @@ public class BsCrawlingSession extends EsAbstractEntity {
 
     public String getSessionId() {
         checkSpecifiedProperty("sessionId");
-        return sessionId;
+        return convertEmptyToNull(sessionId);
     }
 
     public void setSessionId(String value) {
         registerModifiedProperty("sessionId");
         this.sessionId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (expiredTime != null) {
-            sourceMap.put("expiredTime", expiredTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (sessionId != null) {
-            sourceMap.put("sessionId", sessionId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
index 8097914fdfcea62cbb42b76942e6b22bc47cc87d..26cda03a63853934b175967a7cebaae4f81e800f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionInfoDbm;
  */
 public class BsCrawlingSessionInfo extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public CrawlingSessionInfoDbm asDBMeta() {
-        return CrawlingSessionInfoDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "crawling_session_info";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -58,12 +51,63 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public CrawlingSessionInfoDbm asDBMeta() {
+        return CrawlingSessionInfoDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "crawling_session_info";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (crawlingSessionId != null) {
+            sourceMap.put("crawlingSessionId", crawlingSessionId);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (key != null) {
+            sourceMap.put("key", key);
+        }
+        if (value != null) {
+            sourceMap.put("value", value);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(crawlingSessionId);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(key);
+        sb.append(dm).append(value);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCrawlingSessionId() {
         checkSpecifiedProperty("crawlingSessionId");
-        return crawlingSessionId;
+        return convertEmptyToNull(crawlingSessionId);
     }
 
     public void setCrawlingSessionId(String value) {
@@ -81,19 +125,9 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getKey() {
         checkSpecifiedProperty("key");
-        return key;
+        return convertEmptyToNull(key);
     }
 
     public void setKey(String value) {
@@ -103,32 +137,11 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
 
     public String getValue() {
         checkSpecifiedProperty("value");
-        return value;
+        return convertEmptyToNull(value);
     }
 
     public void setValue(String value) {
         registerModifiedProperty("value");
         this.value = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (crawlingSessionId != null) {
-            sourceMap.put("crawlingSessionId", crawlingSessionId);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (key != null) {
-            sourceMap.put("key", key);
-        }
-        if (value != null) {
-            sourceMap.put("value", value);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
index bb2b8735127e3f09acfac0b73a7532b1eef20da2..66015b5eff5858337999feb03393a960e70ace67 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
  */
 public class BsDataConfig extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public DataConfigDbm asDBMeta() {
-        return DataConfigDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "data_config";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -79,6 +72,85 @@ public class BsDataConfig extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public DataConfigDbm asDBMeta() {
+        return DataConfigDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "data_config";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (available != null) {
+            sourceMap.put("available", available);
+        }
+        if (boost != null) {
+            sourceMap.put("boost", boost);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (handlerName != null) {
+            sourceMap.put("handlerName", handlerName);
+        }
+        if (handlerParameter != null) {
+            sourceMap.put("handlerParameter", handlerParameter);
+        }
+        if (handlerScript != null) {
+            sourceMap.put("handlerScript", handlerScript);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(available);
+        sb.append(dm).append(boost);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(handlerName);
+        sb.append(dm).append(handlerParameter);
+        sb.append(dm).append(handlerScript);
+        sb.append(dm).append(name);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -104,7 +176,7 @@ public class BsDataConfig extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -124,7 +196,7 @@ public class BsDataConfig extends EsAbstractEntity {
 
     public String getHandlerName() {
         checkSpecifiedProperty("handlerName");
-        return handlerName;
+        return convertEmptyToNull(handlerName);
     }
 
     public void setHandlerName(String value) {
@@ -134,7 +206,7 @@ public class BsDataConfig extends EsAbstractEntity {
 
     public String getHandlerParameter() {
         checkSpecifiedProperty("handlerParameter");
-        return handlerParameter;
+        return convertEmptyToNull(handlerParameter);
     }
 
     public void setHandlerParameter(String value) {
@@ -144,7 +216,7 @@ public class BsDataConfig extends EsAbstractEntity {
 
     public String getHandlerScript() {
         checkSpecifiedProperty("handlerScript");
-        return handlerScript;
+        return convertEmptyToNull(handlerScript);
     }
 
     public void setHandlerScript(String value) {
@@ -152,19 +224,9 @@ public class BsDataConfig extends EsAbstractEntity {
         this.handlerScript = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -184,7 +246,7 @@ public class BsDataConfig extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -201,46 +263,4 @@ public class BsDataConfig extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (available != null) {
-            sourceMap.put("available", available);
-        }
-        if (boost != null) {
-            sourceMap.put("boost", boost);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (handlerName != null) {
-            sourceMap.put("handlerName", handlerName);
-        }
-        if (handlerParameter != null) {
-            sourceMap.put("handlerParameter", handlerParameter);
-        }
-        if (handlerScript != null) {
-            sourceMap.put("handlerScript", handlerScript);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
index c26663c9767ab31b6e424caaf73aebc56a494b70..92cba0e780b52b58b022860f701b27e193c4b077 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
@@ -28,9 +28,26 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigToLabelDbm;
  */
 public class BsDataConfigToLabel extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** dataConfigId */
+    protected String dataConfigId;
+
+    /** labelTypeId */
+    protected String labelTypeId;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public DataConfigToLabelDbm asDBMeta() {
         return DataConfigToLabelDbm.getInstance();
@@ -42,22 +59,41 @@ public class BsDataConfigToLabel extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** dataConfigId */
-    protected String dataConfigId;
-
-    /** labelTypeId */
-    protected String labelTypeId;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (dataConfigId != null) {
+            sourceMap.put("dataConfigId", dataConfigId);
+        }
+        if (labelTypeId != null) {
+            sourceMap.put("labelTypeId", labelTypeId);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(dataConfigId);
+        sb.append(dm).append(labelTypeId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getDataConfigId() {
         checkSpecifiedProperty("dataConfigId");
-        return dataConfigId;
+        return convertEmptyToNull(dataConfigId);
     }
 
     public void setDataConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsDataConfigToLabel extends EsAbstractEntity {
         this.dataConfigId = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getLabelTypeId() {
         checkSpecifiedProperty("labelTypeId");
-        return labelTypeId;
+        return convertEmptyToNull(labelTypeId);
     }
 
     public void setLabelTypeId(String value) {
         registerModifiedProperty("labelTypeId");
         this.labelTypeId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (dataConfigId != null) {
-            sourceMap.put("dataConfigId", dataConfigId);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (labelTypeId != null) {
-            sourceMap.put("labelTypeId", labelTypeId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
index 2138433b464a6b2f5475f362123502fd3e5e2dec..4d9e6d7cc546f84e43db4240fdda7dde17ae69d2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
@@ -28,9 +28,26 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigToRoleDbm;
  */
 public class BsDataConfigToRole extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** dataConfigId */
+    protected String dataConfigId;
+
+    /** roleTypeId */
+    protected String roleTypeId;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public DataConfigToRoleDbm asDBMeta() {
         return DataConfigToRoleDbm.getInstance();
@@ -42,22 +59,41 @@ public class BsDataConfigToRole extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** dataConfigId */
-    protected String dataConfigId;
-
-    /** roleTypeId */
-    protected String roleTypeId;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (dataConfigId != null) {
+            sourceMap.put("dataConfigId", dataConfigId);
+        }
+        if (roleTypeId != null) {
+            sourceMap.put("roleTypeId", roleTypeId);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(dataConfigId);
+        sb.append(dm).append(roleTypeId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getDataConfigId() {
         checkSpecifiedProperty("dataConfigId");
-        return dataConfigId;
+        return convertEmptyToNull(dataConfigId);
     }
 
     public void setDataConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsDataConfigToRole extends EsAbstractEntity {
         this.dataConfigId = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getRoleTypeId() {
         checkSpecifiedProperty("roleTypeId");
-        return roleTypeId;
+        return convertEmptyToNull(roleTypeId);
     }
 
     public void setRoleTypeId(String value) {
         registerModifiedProperty("roleTypeId");
         this.roleTypeId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (dataConfigId != null) {
-            sourceMap.put("dataConfigId", dataConfigId);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (roleTypeId != null) {
-            sourceMap.put("roleTypeId", roleTypeId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
index f62439a86fbdd29d87f04b373e195da7c158d5c8..aaeb38525974a831009688b3d268473847cd202a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
  */
 public class BsFailureUrl extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public FailureUrlDbm asDBMeta() {
-        return FailureUrlDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "failure_url";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsFailureUrl extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public FailureUrlDbm asDBMeta() {
+        return FailureUrlDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "failure_url";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (configId != null) {
+            sourceMap.put("configId", configId);
+        }
+        if (errorCount != null) {
+            sourceMap.put("errorCount", errorCount);
+        }
+        if (errorLog != null) {
+            sourceMap.put("errorLog", errorLog);
+        }
+        if (errorName != null) {
+            sourceMap.put("errorName", errorName);
+        }
+        if (lastAccessTime != null) {
+            sourceMap.put("lastAccessTime", lastAccessTime);
+        }
+        if (threadName != null) {
+            sourceMap.put("threadName", threadName);
+        }
+        if (url != null) {
+            sourceMap.put("url", url);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(configId);
+        sb.append(dm).append(errorCount);
+        sb.append(dm).append(errorLog);
+        sb.append(dm).append(errorName);
+        sb.append(dm).append(lastAccessTime);
+        sb.append(dm).append(threadName);
+        sb.append(dm).append(url);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getConfigId() {
         checkSpecifiedProperty("configId");
-        return configId;
+        return convertEmptyToNull(configId);
     }
 
     public void setConfigId(String value) {
@@ -92,7 +148,7 @@ public class BsFailureUrl extends EsAbstractEntity {
 
     public String getErrorLog() {
         checkSpecifiedProperty("errorLog");
-        return errorLog;
+        return convertEmptyToNull(errorLog);
     }
 
     public void setErrorLog(String value) {
@@ -102,7 +158,7 @@ public class BsFailureUrl extends EsAbstractEntity {
 
     public String getErrorName() {
         checkSpecifiedProperty("errorName");
-        return errorName;
+        return convertEmptyToNull(errorName);
     }
 
     public void setErrorName(String value) {
@@ -110,16 +166,6 @@ public class BsFailureUrl extends EsAbstractEntity {
         this.errorName = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Long getLastAccessTime() {
         checkSpecifiedProperty("lastAccessTime");
         return lastAccessTime;
@@ -132,7 +178,7 @@ public class BsFailureUrl extends EsAbstractEntity {
 
     public String getThreadName() {
         checkSpecifiedProperty("threadName");
-        return threadName;
+        return convertEmptyToNull(threadName);
     }
 
     public void setThreadName(String value) {
@@ -142,41 +188,11 @@ public class BsFailureUrl extends EsAbstractEntity {
 
     public String getUrl() {
         checkSpecifiedProperty("url");
-        return url;
+        return convertEmptyToNull(url);
     }
 
     public void setUrl(String value) {
         registerModifiedProperty("url");
         this.url = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (configId != null) {
-            sourceMap.put("configId", configId);
-        }
-        if (errorCount != null) {
-            sourceMap.put("errorCount", errorCount);
-        }
-        if (errorLog != null) {
-            sourceMap.put("errorLog", errorLog);
-        }
-        if (errorName != null) {
-            sourceMap.put("errorName", errorName);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (lastAccessTime != null) {
-            sourceMap.put("lastAccessTime", lastAccessTime);
-        }
-        if (threadName != null) {
-            sourceMap.put("threadName", threadName);
-        }
-        if (url != null) {
-            sourceMap.put("url", url);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
index 2520a52951fdbc569cfdc544ffafbb66a274885c..ef8995ece60150ddb5c4c7389260cd70949c8816 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
  */
 public class BsFileAuthentication extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public FileAuthenticationDbm asDBMeta() {
-        return FileAuthenticationDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "file_authentication";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -79,12 +72,91 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public FileAuthenticationDbm asDBMeta() {
+        return FileAuthenticationDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "file_authentication";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (fileConfigId != null) {
+            sourceMap.put("fileConfigId", fileConfigId);
+        }
+        if (hostname != null) {
+            sourceMap.put("hostname", hostname);
+        }
+        if (parameters != null) {
+            sourceMap.put("parameters", parameters);
+        }
+        if (password != null) {
+            sourceMap.put("password", password);
+        }
+        if (port != null) {
+            sourceMap.put("port", port);
+        }
+        if (protocolScheme != null) {
+            sourceMap.put("protocolScheme", protocolScheme);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (username != null) {
+            sourceMap.put("username", username);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(fileConfigId);
+        sb.append(dm).append(hostname);
+        sb.append(dm).append(parameters);
+        sb.append(dm).append(password);
+        sb.append(dm).append(port);
+        sb.append(dm).append(protocolScheme);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(username);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -104,7 +176,7 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getFileConfigId() {
         checkSpecifiedProperty("fileConfigId");
-        return fileConfigId;
+        return convertEmptyToNull(fileConfigId);
     }
 
     public void setFileConfigId(String value) {
@@ -114,7 +186,7 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getHostname() {
         checkSpecifiedProperty("hostname");
-        return hostname;
+        return convertEmptyToNull(hostname);
     }
 
     public void setHostname(String value) {
@@ -122,19 +194,9 @@ public class BsFileAuthentication extends EsAbstractEntity {
         this.hostname = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getParameters() {
         checkSpecifiedProperty("parameters");
-        return parameters;
+        return convertEmptyToNull(parameters);
     }
 
     public void setParameters(String value) {
@@ -144,7 +206,7 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getPassword() {
         checkSpecifiedProperty("password");
-        return password;
+        return convertEmptyToNull(password);
     }
 
     public void setPassword(String value) {
@@ -164,7 +226,7 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getProtocolScheme() {
         checkSpecifiedProperty("protocolScheme");
-        return protocolScheme;
+        return convertEmptyToNull(protocolScheme);
     }
 
     public void setProtocolScheme(String value) {
@@ -174,7 +236,7 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -194,53 +256,11 @@ public class BsFileAuthentication extends EsAbstractEntity {
 
     public String getUsername() {
         checkSpecifiedProperty("username");
-        return username;
+        return convertEmptyToNull(username);
     }
 
     public void setUsername(String value) {
         registerModifiedProperty("username");
         this.username = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (fileConfigId != null) {
-            sourceMap.put("fileConfigId", fileConfigId);
-        }
-        if (hostname != null) {
-            sourceMap.put("hostname", hostname);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (parameters != null) {
-            sourceMap.put("parameters", parameters);
-        }
-        if (password != null) {
-            sourceMap.put("password", password);
-        }
-        if (port != null) {
-            sourceMap.put("port", port);
-        }
-        if (protocolScheme != null) {
-            sourceMap.put("protocolScheme", protocolScheme);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (username != null) {
-            sourceMap.put("username", username);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
index f19bbe7e790ef1093c3854d167e5870de609d866..26898898c4a850e9625bb21bb008c6c57a060385 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
  */
 public class BsFileConfig extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public FileConfigDbm asDBMeta() {
-        return FileConfigDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "file_config";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -100,6 +93,113 @@ public class BsFileConfig extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public FileConfigDbm asDBMeta() {
+        return FileConfigDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "file_config";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (available != null) {
+            sourceMap.put("available", available);
+        }
+        if (boost != null) {
+            sourceMap.put("boost", boost);
+        }
+        if (configParameter != null) {
+            sourceMap.put("configParameter", configParameter);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (depth != null) {
+            sourceMap.put("depth", depth);
+        }
+        if (excludedDocPaths != null) {
+            sourceMap.put("excludedDocPaths", excludedDocPaths);
+        }
+        if (excludedPaths != null) {
+            sourceMap.put("excludedPaths", excludedPaths);
+        }
+        if (includedDocPaths != null) {
+            sourceMap.put("includedDocPaths", includedDocPaths);
+        }
+        if (includedPaths != null) {
+            sourceMap.put("includedPaths", includedPaths);
+        }
+        if (intervalTime != null) {
+            sourceMap.put("intervalTime", intervalTime);
+        }
+        if (maxAccessCount != null) {
+            sourceMap.put("maxAccessCount", maxAccessCount);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (numOfThread != null) {
+            sourceMap.put("numOfThread", numOfThread);
+        }
+        if (paths != null) {
+            sourceMap.put("paths", paths);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(available);
+        sb.append(dm).append(boost);
+        sb.append(dm).append(configParameter);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(depth);
+        sb.append(dm).append(excludedDocPaths);
+        sb.append(dm).append(excludedPaths);
+        sb.append(dm).append(includedDocPaths);
+        sb.append(dm).append(includedPaths);
+        sb.append(dm).append(intervalTime);
+        sb.append(dm).append(maxAccessCount);
+        sb.append(dm).append(name);
+        sb.append(dm).append(numOfThread);
+        sb.append(dm).append(paths);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -125,7 +225,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getConfigParameter() {
         checkSpecifiedProperty("configParameter");
-        return configParameter;
+        return convertEmptyToNull(configParameter);
     }
 
     public void setConfigParameter(String value) {
@@ -135,7 +235,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -165,7 +265,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getExcludedDocPaths() {
         checkSpecifiedProperty("excludedDocPaths");
-        return excludedDocPaths;
+        return convertEmptyToNull(excludedDocPaths);
     }
 
     public void setExcludedDocPaths(String value) {
@@ -175,7 +275,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getExcludedPaths() {
         checkSpecifiedProperty("excludedPaths");
-        return excludedPaths;
+        return convertEmptyToNull(excludedPaths);
     }
 
     public void setExcludedPaths(String value) {
@@ -183,19 +283,9 @@ public class BsFileConfig extends EsAbstractEntity {
         this.excludedPaths = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getIncludedDocPaths() {
         checkSpecifiedProperty("includedDocPaths");
-        return includedDocPaths;
+        return convertEmptyToNull(includedDocPaths);
     }
 
     public void setIncludedDocPaths(String value) {
@@ -205,7 +295,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getIncludedPaths() {
         checkSpecifiedProperty("includedPaths");
-        return includedPaths;
+        return convertEmptyToNull(includedPaths);
     }
 
     public void setIncludedPaths(String value) {
@@ -235,7 +325,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -255,7 +345,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getPaths() {
         checkSpecifiedProperty("paths");
-        return paths;
+        return convertEmptyToNull(paths);
     }
 
     public void setPaths(String value) {
@@ -275,7 +365,7 @@ public class BsFileConfig extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -292,67 +382,4 @@ public class BsFileConfig extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (available != null) {
-            sourceMap.put("available", available);
-        }
-        if (boost != null) {
-            sourceMap.put("boost", boost);
-        }
-        if (configParameter != null) {
-            sourceMap.put("configParameter", configParameter);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (depth != null) {
-            sourceMap.put("depth", depth);
-        }
-        if (excludedDocPaths != null) {
-            sourceMap.put("excludedDocPaths", excludedDocPaths);
-        }
-        if (excludedPaths != null) {
-            sourceMap.put("excludedPaths", excludedPaths);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (includedDocPaths != null) {
-            sourceMap.put("includedDocPaths", includedDocPaths);
-        }
-        if (includedPaths != null) {
-            sourceMap.put("includedPaths", includedPaths);
-        }
-        if (intervalTime != null) {
-            sourceMap.put("intervalTime", intervalTime);
-        }
-        if (maxAccessCount != null) {
-            sourceMap.put("maxAccessCount", maxAccessCount);
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (numOfThread != null) {
-            sourceMap.put("numOfThread", numOfThread);
-        }
-        if (paths != null) {
-            sourceMap.put("paths", paths);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
index f55c0d7f561939efbdddbddff7f62213491859da..5ea1cd4419664b70bccb04c27e8ac96292503a0a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
@@ -28,9 +28,26 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigToLabelDbm;
  */
 public class BsFileConfigToLabel extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** fileConfigId */
+    protected String fileConfigId;
+
+    /** labelTypeId */
+    protected String labelTypeId;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public FileConfigToLabelDbm asDBMeta() {
         return FileConfigToLabelDbm.getInstance();
@@ -42,22 +59,41 @@ public class BsFileConfigToLabel extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** fileConfigId */
-    protected String fileConfigId;
-
-    /** labelTypeId */
-    protected String labelTypeId;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (fileConfigId != null) {
+            sourceMap.put("fileConfigId", fileConfigId);
+        }
+        if (labelTypeId != null) {
+            sourceMap.put("labelTypeId", labelTypeId);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(fileConfigId);
+        sb.append(dm).append(labelTypeId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getFileConfigId() {
         checkSpecifiedProperty("fileConfigId");
-        return fileConfigId;
+        return convertEmptyToNull(fileConfigId);
     }
 
     public void setFileConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsFileConfigToLabel extends EsAbstractEntity {
         this.fileConfigId = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getLabelTypeId() {
         checkSpecifiedProperty("labelTypeId");
-        return labelTypeId;
+        return convertEmptyToNull(labelTypeId);
     }
 
     public void setLabelTypeId(String value) {
         registerModifiedProperty("labelTypeId");
         this.labelTypeId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (fileConfigId != null) {
-            sourceMap.put("fileConfigId", fileConfigId);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (labelTypeId != null) {
-            sourceMap.put("labelTypeId", labelTypeId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
index 8e785eabc63bf8e2d5757e2db27b6aa82598457f..f9e815a4b8ff11e80b31989cb823422c572c80ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
@@ -28,9 +28,26 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigToRoleDbm;
  */
 public class BsFileConfigToRole extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** fileConfigId */
+    protected String fileConfigId;
+
+    /** roleTypeId */
+    protected String roleTypeId;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public FileConfigToRoleDbm asDBMeta() {
         return FileConfigToRoleDbm.getInstance();
@@ -42,22 +59,41 @@ public class BsFileConfigToRole extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** fileConfigId */
-    protected String fileConfigId;
-
-    /** roleTypeId */
-    protected String roleTypeId;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (fileConfigId != null) {
+            sourceMap.put("fileConfigId", fileConfigId);
+        }
+        if (roleTypeId != null) {
+            sourceMap.put("roleTypeId", roleTypeId);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(fileConfigId);
+        sb.append(dm).append(roleTypeId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getFileConfigId() {
         checkSpecifiedProperty("fileConfigId");
-        return fileConfigId;
+        return convertEmptyToNull(fileConfigId);
     }
 
     public void setFileConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsFileConfigToRole extends EsAbstractEntity {
         this.fileConfigId = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getRoleTypeId() {
         checkSpecifiedProperty("roleTypeId");
-        return roleTypeId;
+        return convertEmptyToNull(roleTypeId);
     }
 
     public void setRoleTypeId(String value) {
         registerModifiedProperty("roleTypeId");
         this.roleTypeId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (fileConfigId != null) {
-            sourceMap.put("fileConfigId", fileConfigId);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (roleTypeId != null) {
-            sourceMap.put("roleTypeId", roleTypeId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
index 65523c9c98e85abd1dcc471f797928cffb464045..a31cd7dd8e7470ce53a74c02a01f80a1f166f16e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
  */
 public class BsJobLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public JobLogDbm asDBMeta() {
-        return JobLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "job_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -70,6 +63,73 @@ public class BsJobLog extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public JobLogDbm asDBMeta() {
+        return JobLogDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "job_log";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (endTime != null) {
+            sourceMap.put("endTime", endTime);
+        }
+        if (jobName != null) {
+            sourceMap.put("jobName", jobName);
+        }
+        if (jobStatus != null) {
+            sourceMap.put("jobStatus", jobStatus);
+        }
+        if (scriptData != null) {
+            sourceMap.put("scriptData", scriptData);
+        }
+        if (scriptResult != null) {
+            sourceMap.put("scriptResult", scriptResult);
+        }
+        if (scriptType != null) {
+            sourceMap.put("scriptType", scriptType);
+        }
+        if (startTime != null) {
+            sourceMap.put("startTime", startTime);
+        }
+        if (target != null) {
+            sourceMap.put("target", target);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(endTime);
+        sb.append(dm).append(jobName);
+        sb.append(dm).append(jobStatus);
+        sb.append(dm).append(scriptData);
+        sb.append(dm).append(scriptResult);
+        sb.append(dm).append(scriptType);
+        sb.append(dm).append(startTime);
+        sb.append(dm).append(target);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -83,19 +143,9 @@ public class BsJobLog extends EsAbstractEntity {
         this.endTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getJobName() {
         checkSpecifiedProperty("jobName");
-        return jobName;
+        return convertEmptyToNull(jobName);
     }
 
     public void setJobName(String value) {
@@ -105,7 +155,7 @@ public class BsJobLog extends EsAbstractEntity {
 
     public String getJobStatus() {
         checkSpecifiedProperty("jobStatus");
-        return jobStatus;
+        return convertEmptyToNull(jobStatus);
     }
 
     public void setJobStatus(String value) {
@@ -115,7 +165,7 @@ public class BsJobLog extends EsAbstractEntity {
 
     public String getScriptData() {
         checkSpecifiedProperty("scriptData");
-        return scriptData;
+        return convertEmptyToNull(scriptData);
     }
 
     public void setScriptData(String value) {
@@ -125,7 +175,7 @@ public class BsJobLog extends EsAbstractEntity {
 
     public String getScriptResult() {
         checkSpecifiedProperty("scriptResult");
-        return scriptResult;
+        return convertEmptyToNull(scriptResult);
     }
 
     public void setScriptResult(String value) {
@@ -135,7 +185,7 @@ public class BsJobLog extends EsAbstractEntity {
 
     public String getScriptType() {
         checkSpecifiedProperty("scriptType");
-        return scriptType;
+        return convertEmptyToNull(scriptType);
     }
 
     public void setScriptType(String value) {
@@ -155,44 +205,11 @@ public class BsJobLog extends EsAbstractEntity {
 
     public String getTarget() {
         checkSpecifiedProperty("target");
-        return target;
+        return convertEmptyToNull(target);
     }
 
     public void setTarget(String value) {
         registerModifiedProperty("target");
         this.target = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (endTime != null) {
-            sourceMap.put("endTime", endTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (jobName != null) {
-            sourceMap.put("jobName", jobName);
-        }
-        if (jobStatus != null) {
-            sourceMap.put("jobStatus", jobStatus);
-        }
-        if (scriptData != null) {
-            sourceMap.put("scriptData", scriptData);
-        }
-        if (scriptResult != null) {
-            sourceMap.put("scriptResult", scriptResult);
-        }
-        if (scriptType != null) {
-            sourceMap.put("scriptType", scriptType);
-        }
-        if (startTime != null) {
-            sourceMap.put("startTime", startTime);
-        }
-        if (target != null) {
-            sourceMap.put("target", target);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
index c3ab9a46a608cdc7b6743fe6b4398a0e2aacc79a..ecd3b60772ff27ab3ce8d14b8485b7ed6d06f371 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
  */
 public class BsKeyMatch extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public KeyMatchDbm asDBMeta() {
-        return KeyMatchDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "key_match";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -70,6 +63,73 @@ public class BsKeyMatch extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public KeyMatchDbm asDBMeta() {
+        return KeyMatchDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "key_match";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (boost != null) {
+            sourceMap.put("boost", boost);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (maxSize != null) {
+            sourceMap.put("maxSize", maxSize);
+        }
+        if (query != null) {
+            sourceMap.put("query", query);
+        }
+        if (term != null) {
+            sourceMap.put("term", term);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(boost);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(maxSize);
+        sb.append(dm).append(query);
+        sb.append(dm).append(term);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -85,7 +145,7 @@ public class BsKeyMatch extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -103,16 +163,6 @@ public class BsKeyMatch extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Integer getMaxSize() {
         checkSpecifiedProperty("maxSize");
         return maxSize;
@@ -125,7 +175,7 @@ public class BsKeyMatch extends EsAbstractEntity {
 
     public String getQuery() {
         checkSpecifiedProperty("query");
-        return query;
+        return convertEmptyToNull(query);
     }
 
     public void setQuery(String value) {
@@ -135,7 +185,7 @@ public class BsKeyMatch extends EsAbstractEntity {
 
     public String getTerm() {
         checkSpecifiedProperty("term");
-        return term;
+        return convertEmptyToNull(term);
     }
 
     public void setTerm(String value) {
@@ -145,7 +195,7 @@ public class BsKeyMatch extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -162,37 +212,4 @@ public class BsKeyMatch extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (boost != null) {
-            sourceMap.put("boost", boost);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (maxSize != null) {
-            sourceMap.put("maxSize", maxSize);
-        }
-        if (query != null) {
-            sourceMap.put("query", query);
-        }
-        if (term != null) {
-            sourceMap.put("term", term);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
index 61a7493a7ea4aff119ec71aeb5252fd001baf366..d6579b8b718b1298ce7fdc5868a758880739d1f1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.LabelToRoleDbm;
  */
 public class BsLabelToRole extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public LabelToRoleDbm asDBMeta() {
-        return LabelToRoleDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "label_to_role";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -53,21 +46,54 @@ public class BsLabelToRole extends EsAbstractEntity {
     // [Referrers] *comment only
 
     // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public LabelToRoleDbm asDBMeta() {
+        return LabelToRoleDbm.getInstance();
     }
 
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
+    @Override
+    public String asTableDbName() {
+        return "label_to_role";
     }
 
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (labelTypeId != null) {
+            sourceMap.put("labelTypeId", labelTypeId);
+        }
+        if (roleTypeId != null) {
+            sourceMap.put("roleTypeId", roleTypeId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(labelTypeId);
+        sb.append(dm).append(roleTypeId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
     public String getLabelTypeId() {
         checkSpecifiedProperty("labelTypeId");
-        return labelTypeId;
+        return convertEmptyToNull(labelTypeId);
     }
 
     public void setLabelTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsLabelToRole extends EsAbstractEntity {
 
     public String getRoleTypeId() {
         checkSpecifiedProperty("roleTypeId");
-        return roleTypeId;
+        return convertEmptyToNull(roleTypeId);
     }
 
     public void setRoleTypeId(String value) {
         registerModifiedProperty("roleTypeId");
         this.roleTypeId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (labelTypeId != null) {
-            sourceMap.put("labelTypeId", labelTypeId);
-        }
-        if (roleTypeId != null) {
-            sourceMap.put("roleTypeId", roleTypeId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
index 64dd20d1d2fb26f3344af02ce9bfb15c182067b8..c78b3ac5126502aaf8e845d6029e7e5348f4da32 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
  */
 public class BsLabelType extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public LabelTypeDbm asDBMeta() {
-        return LabelTypeDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "label_type";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -73,12 +66,83 @@ public class BsLabelType extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public LabelTypeDbm asDBMeta() {
+        return LabelTypeDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "label_type";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (excludedPaths != null) {
+            sourceMap.put("excludedPaths", excludedPaths);
+        }
+        if (includedPaths != null) {
+            sourceMap.put("includedPaths", includedPaths);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (value != null) {
+            sourceMap.put("value", value);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(excludedPaths);
+        sb.append(dm).append(includedPaths);
+        sb.append(dm).append(name);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(value);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -98,7 +162,7 @@ public class BsLabelType extends EsAbstractEntity {
 
     public String getExcludedPaths() {
         checkSpecifiedProperty("excludedPaths");
-        return excludedPaths;
+        return convertEmptyToNull(excludedPaths);
     }
 
     public void setExcludedPaths(String value) {
@@ -106,19 +170,9 @@ public class BsLabelType extends EsAbstractEntity {
         this.excludedPaths = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getIncludedPaths() {
         checkSpecifiedProperty("includedPaths");
-        return includedPaths;
+        return convertEmptyToNull(includedPaths);
     }
 
     public void setIncludedPaths(String value) {
@@ -128,7 +182,7 @@ public class BsLabelType extends EsAbstractEntity {
 
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -148,7 +202,7 @@ public class BsLabelType extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -168,47 +222,11 @@ public class BsLabelType extends EsAbstractEntity {
 
     public String getValue() {
         checkSpecifiedProperty("value");
-        return value;
+        return convertEmptyToNull(value);
     }
 
     public void setValue(String value) {
         registerModifiedProperty("value");
         this.value = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (excludedPaths != null) {
-            sourceMap.put("excludedPaths", excludedPaths);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (includedPaths != null) {
-            sourceMap.put("includedPaths", includedPaths);
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (value != null) {
-            sourceMap.put("value", value);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
index 4c9e6a6a2445e5fa505029cadc5746612d193eea..952f0d4bfe10f5088f58b4f80cbd65f66e814f1a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.OverlappingHostDbm;
  */
 public class BsOverlappingHost extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public OverlappingHostDbm asDBMeta() {
-        return OverlappingHostDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "overlapping_host";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsOverlappingHost extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public OverlappingHostDbm asDBMeta() {
+        return OverlappingHostDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "overlapping_host";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (overlappingName != null) {
+            sourceMap.put("overlappingName", overlappingName);
+        }
+        if (regularName != null) {
+            sourceMap.put("regularName", regularName);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(overlappingName);
+        sb.append(dm).append(regularName);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsOverlappingHost extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getOverlappingName() {
         checkSpecifiedProperty("overlappingName");
-        return overlappingName;
+        return convertEmptyToNull(overlappingName);
     }
 
     public void setOverlappingName(String value) {
@@ -112,7 +158,7 @@ public class BsOverlappingHost extends EsAbstractEntity {
 
     public String getRegularName() {
         checkSpecifiedProperty("regularName");
-        return regularName;
+        return convertEmptyToNull(regularName);
     }
 
     public void setRegularName(String value) {
@@ -132,7 +178,7 @@ public class BsOverlappingHost extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -149,34 +195,4 @@ public class BsOverlappingHost extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (overlappingName != null) {
-            sourceMap.put("overlappingName", overlappingName);
-        }
-        if (regularName != null) {
-            sourceMap.put("regularName", regularName);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
index 9921946f8b406eba2d1baddf7549bdbf268f57fa..293be092853a985e654e5714b771365e1d3a12a9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
  */
 public class BsPathMapping extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public PathMappingDbm asDBMeta() {
-        return PathMappingDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "path_mapping";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -70,12 +63,79 @@ public class BsPathMapping extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public PathMappingDbm asDBMeta() {
+        return PathMappingDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "path_mapping";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (processType != null) {
+            sourceMap.put("processType", processType);
+        }
+        if (regex != null) {
+            sourceMap.put("regex", regex);
+        }
+        if (replacement != null) {
+            sourceMap.put("replacement", replacement);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(processType);
+        sb.append(dm).append(regex);
+        sb.append(dm).append(replacement);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -93,19 +153,9 @@ public class BsPathMapping extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getProcessType() {
         checkSpecifiedProperty("processType");
-        return processType;
+        return convertEmptyToNull(processType);
     }
 
     public void setProcessType(String value) {
@@ -115,7 +165,7 @@ public class BsPathMapping extends EsAbstractEntity {
 
     public String getRegex() {
         checkSpecifiedProperty("regex");
-        return regex;
+        return convertEmptyToNull(regex);
     }
 
     public void setRegex(String value) {
@@ -125,7 +175,7 @@ public class BsPathMapping extends EsAbstractEntity {
 
     public String getReplacement() {
         checkSpecifiedProperty("replacement");
-        return replacement;
+        return convertEmptyToNull(replacement);
     }
 
     public void setReplacement(String value) {
@@ -145,7 +195,7 @@ public class BsPathMapping extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -162,37 +212,4 @@ public class BsPathMapping extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (processType != null) {
-            sourceMap.put("processType", processType);
-        }
-        if (regex != null) {
-            sourceMap.put("regex", regex);
-        }
-        if (replacement != null) {
-            sourceMap.put("replacement", replacement);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
index 55249b97a9a32bb72f2afffe03c294d7101d0e5a..8dcd0fb9aa5ec31b51c7005f8886345e34401c96 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
  */
 public class BsRequestHeader extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public RequestHeaderDbm asDBMeta() {
-        return RequestHeaderDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "request_header";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsRequestHeader extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public RequestHeaderDbm asDBMeta() {
+        return RequestHeaderDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "request_header";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (value != null) {
+            sourceMap.put("value", value);
+        }
+        if (webConfigId != null) {
+            sourceMap.put("webConfigId", webConfigId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(name);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(value);
+        sb.append(dm).append(webConfigId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsRequestHeader extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -112,7 +158,7 @@ public class BsRequestHeader extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -132,7 +178,7 @@ public class BsRequestHeader extends EsAbstractEntity {
 
     public String getValue() {
         checkSpecifiedProperty("value");
-        return value;
+        return convertEmptyToNull(value);
     }
 
     public void setValue(String value) {
@@ -142,41 +188,11 @@ public class BsRequestHeader extends EsAbstractEntity {
 
     public String getWebConfigId() {
         checkSpecifiedProperty("webConfigId");
-        return webConfigId;
+        return convertEmptyToNull(webConfigId);
     }
 
     public void setWebConfigId(String value) {
         registerModifiedProperty("webConfigId");
         this.webConfigId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (value != null) {
-            sourceMap.put("value", value);
-        }
-        if (webConfigId != null) {
-            sourceMap.put("webConfigId", webConfigId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
index f7c2526fddd66a1531d0217195dce39ceab050b9..24633c0dec8e64f5cd6cdd3f5c5ec110c36b4fa8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
  */
 public class BsRoleType extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public RoleTypeDbm asDBMeta() {
-        return RoleTypeDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "role_type";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsRoleType extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public RoleTypeDbm asDBMeta() {
+        return RoleTypeDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "role_type";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (value != null) {
+            sourceMap.put("value", value);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(name);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(value);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsRoleType extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -122,7 +168,7 @@ public class BsRoleType extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -142,41 +188,11 @@ public class BsRoleType extends EsAbstractEntity {
 
     public String getValue() {
         checkSpecifiedProperty("value");
-        return value;
+        return convertEmptyToNull(value);
     }
 
     public void setValue(String value) {
         registerModifiedProperty("value");
         this.value = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (value != null) {
-            sourceMap.put("value", value);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
index e6fd4b994b618da1013fec5fe57198afa6af2862..32ed472baff633d55e21585d050c8e50697f9b62 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
  */
 public class BsScheduledJob extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public ScheduledJobDbm asDBMeta() {
-        return ScheduledJobDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "scheduled_job";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -85,6 +78,93 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public ScheduledJobDbm asDBMeta() {
+        return ScheduledJobDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "scheduled_job";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (available != null) {
+            sourceMap.put("available", available);
+        }
+        if (crawler != null) {
+            sourceMap.put("crawler", crawler);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (cronExpression != null) {
+            sourceMap.put("cronExpression", cronExpression);
+        }
+        if (jobLogging != null) {
+            sourceMap.put("jobLogging", jobLogging);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (scriptData != null) {
+            sourceMap.put("scriptData", scriptData);
+        }
+        if (scriptType != null) {
+            sourceMap.put("scriptType", scriptType);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (target != null) {
+            sourceMap.put("target", target);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(available);
+        sb.append(dm).append(crawler);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(cronExpression);
+        sb.append(dm).append(jobLogging);
+        sb.append(dm).append(name);
+        sb.append(dm).append(scriptData);
+        sb.append(dm).append(scriptType);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(target);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -110,7 +190,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -130,7 +210,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getCronExpression() {
         checkSpecifiedProperty("cronExpression");
-        return cronExpression;
+        return convertEmptyToNull(cronExpression);
     }
 
     public void setCronExpression(String value) {
@@ -138,16 +218,6 @@ public class BsScheduledJob extends EsAbstractEntity {
         this.cronExpression = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Boolean getJobLogging() {
         checkSpecifiedProperty("jobLogging");
         return jobLogging;
@@ -160,7 +230,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -170,7 +240,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getScriptData() {
         checkSpecifiedProperty("scriptData");
-        return scriptData;
+        return convertEmptyToNull(scriptData);
     }
 
     public void setScriptData(String value) {
@@ -180,7 +250,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getScriptType() {
         checkSpecifiedProperty("scriptType");
-        return scriptType;
+        return convertEmptyToNull(scriptType);
     }
 
     public void setScriptType(String value) {
@@ -200,7 +270,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getTarget() {
         checkSpecifiedProperty("target");
-        return target;
+        return convertEmptyToNull(target);
     }
 
     public void setTarget(String value) {
@@ -210,7 +280,7 @@ public class BsScheduledJob extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -227,52 +297,4 @@ public class BsScheduledJob extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (available != null) {
-            sourceMap.put("available", available);
-        }
-        if (crawler != null) {
-            sourceMap.put("crawler", crawler);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (cronExpression != null) {
-            sourceMap.put("cronExpression", cronExpression);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (jobLogging != null) {
-            sourceMap.put("jobLogging", jobLogging);
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (scriptData != null) {
-            sourceMap.put("scriptData", scriptData);
-        }
-        if (scriptType != null) {
-            sourceMap.put("scriptType", scriptType);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (target != null) {
-            sourceMap.put("target", target);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
index d5c14cf0059571c03451c49d95cca040b13488e0..88eb2e4e4873f2034172567790e1d996b8be890a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestBadWordDbm;
  */
 public class BsSuggestBadWord extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public SuggestBadWordDbm asDBMeta() {
-        return SuggestBadWordDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "suggest_bad_word";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -67,12 +60,75 @@ public class BsSuggestBadWord extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public SuggestBadWordDbm asDBMeta() {
+        return SuggestBadWordDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "suggest_bad_word";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (suggestWord != null) {
+            sourceMap.put("suggestWord", suggestWord);
+        }
+        if (targetLabel != null) {
+            sourceMap.put("targetLabel", targetLabel);
+        }
+        if (targetRole != null) {
+            sourceMap.put("targetRole", targetRole);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(suggestWord);
+        sb.append(dm).append(targetLabel);
+        sb.append(dm).append(targetRole);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsSuggestBadWord extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getSuggestWord() {
         checkSpecifiedProperty("suggestWord");
-        return suggestWord;
+        return convertEmptyToNull(suggestWord);
     }
 
     public void setSuggestWord(String value) {
@@ -112,7 +158,7 @@ public class BsSuggestBadWord extends EsAbstractEntity {
 
     public String getTargetLabel() {
         checkSpecifiedProperty("targetLabel");
-        return targetLabel;
+        return convertEmptyToNull(targetLabel);
     }
 
     public void setTargetLabel(String value) {
@@ -122,7 +168,7 @@ public class BsSuggestBadWord extends EsAbstractEntity {
 
     public String getTargetRole() {
         checkSpecifiedProperty("targetRole");
-        return targetRole;
+        return convertEmptyToNull(targetRole);
     }
 
     public void setTargetRole(String value) {
@@ -132,7 +178,7 @@ public class BsSuggestBadWord extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -149,34 +195,4 @@ public class BsSuggestBadWord extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (suggestWord != null) {
-            sourceMap.put("suggestWord", suggestWord);
-        }
-        if (targetLabel != null) {
-            sourceMap.put("targetLabel", targetLabel);
-        }
-        if (targetRole != null) {
-            sourceMap.put("targetRole", targetRole);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
index c3afe5473a693285e8558ae3b7cc16cafb1166ad..541df6042b283b65aaace33693194d1919fc6fbc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordDbm;
  */
 public class BsSuggestElevateWord extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public SuggestElevateWordDbm asDBMeta() {
-        return SuggestElevateWordDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "suggest_elevate_word";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -73,6 +66,77 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public SuggestElevateWordDbm asDBMeta() {
+        return SuggestElevateWordDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "suggest_elevate_word";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (boost != null) {
+            sourceMap.put("boost", boost);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (reading != null) {
+            sourceMap.put("reading", reading);
+        }
+        if (suggestWord != null) {
+            sourceMap.put("suggestWord", suggestWord);
+        }
+        if (targetLabel != null) {
+            sourceMap.put("targetLabel", targetLabel);
+        }
+        if (targetRole != null) {
+            sourceMap.put("targetRole", targetRole);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(boost);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(reading);
+        sb.append(dm).append(suggestWord);
+        sb.append(dm).append(targetLabel);
+        sb.append(dm).append(targetRole);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -88,7 +152,7 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -106,19 +170,9 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getReading() {
         checkSpecifiedProperty("reading");
-        return reading;
+        return convertEmptyToNull(reading);
     }
 
     public void setReading(String value) {
@@ -128,7 +182,7 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     public String getSuggestWord() {
         checkSpecifiedProperty("suggestWord");
-        return suggestWord;
+        return convertEmptyToNull(suggestWord);
     }
 
     public void setSuggestWord(String value) {
@@ -138,7 +192,7 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     public String getTargetLabel() {
         checkSpecifiedProperty("targetLabel");
-        return targetLabel;
+        return convertEmptyToNull(targetLabel);
     }
 
     public void setTargetLabel(String value) {
@@ -148,7 +202,7 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     public String getTargetRole() {
         checkSpecifiedProperty("targetRole");
-        return targetRole;
+        return convertEmptyToNull(targetRole);
     }
 
     public void setTargetRole(String value) {
@@ -158,7 +212,7 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -175,40 +229,4 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (boost != null) {
-            sourceMap.put("boost", boost);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (reading != null) {
-            sourceMap.put("reading", reading);
-        }
-        if (suggestWord != null) {
-            sourceMap.put("suggestWord", suggestWord);
-        }
-        if (targetLabel != null) {
-            sourceMap.put("targetLabel", targetLabel);
-        }
-        if (targetRole != null) {
-            sourceMap.put("targetRole", targetRole);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
index 7424707f2300fec3540fd12fbec30343a61a4cb5..ae1c0cc87d93b2193effbd1914b948334ee891df 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
  */
 public class BsWebAuthentication extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public WebAuthenticationDbm asDBMeta() {
-        return WebAuthenticationDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "web_authentication";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -82,12 +75,95 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public WebAuthenticationDbm asDBMeta() {
+        return WebAuthenticationDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "web_authentication";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (authRealm != null) {
+            sourceMap.put("authRealm", authRealm);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (hostname != null) {
+            sourceMap.put("hostname", hostname);
+        }
+        if (parameters != null) {
+            sourceMap.put("parameters", parameters);
+        }
+        if (password != null) {
+            sourceMap.put("password", password);
+        }
+        if (port != null) {
+            sourceMap.put("port", port);
+        }
+        if (protocolScheme != null) {
+            sourceMap.put("protocolScheme", protocolScheme);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (username != null) {
+            sourceMap.put("username", username);
+        }
+        if (webConfigId != null) {
+            sourceMap.put("webConfigId", webConfigId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(authRealm);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(hostname);
+        sb.append(dm).append(parameters);
+        sb.append(dm).append(password);
+        sb.append(dm).append(port);
+        sb.append(dm).append(protocolScheme);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(username);
+        sb.append(dm).append(webConfigId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getAuthRealm() {
         checkSpecifiedProperty("authRealm");
-        return authRealm;
+        return convertEmptyToNull(authRealm);
     }
 
     public void setAuthRealm(String value) {
@@ -97,7 +173,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -117,7 +193,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getHostname() {
         checkSpecifiedProperty("hostname");
-        return hostname;
+        return convertEmptyToNull(hostname);
     }
 
     public void setHostname(String value) {
@@ -125,19 +201,9 @@ public class BsWebAuthentication extends EsAbstractEntity {
         this.hostname = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getParameters() {
         checkSpecifiedProperty("parameters");
-        return parameters;
+        return convertEmptyToNull(parameters);
     }
 
     public void setParameters(String value) {
@@ -147,7 +213,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getPassword() {
         checkSpecifiedProperty("password");
-        return password;
+        return convertEmptyToNull(password);
     }
 
     public void setPassword(String value) {
@@ -167,7 +233,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getProtocolScheme() {
         checkSpecifiedProperty("protocolScheme");
-        return protocolScheme;
+        return convertEmptyToNull(protocolScheme);
     }
 
     public void setProtocolScheme(String value) {
@@ -177,7 +243,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -197,7 +263,7 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getUsername() {
         checkSpecifiedProperty("username");
-        return username;
+        return convertEmptyToNull(username);
     }
 
     public void setUsername(String value) {
@@ -207,56 +273,11 @@ public class BsWebAuthentication extends EsAbstractEntity {
 
     public String getWebConfigId() {
         checkSpecifiedProperty("webConfigId");
-        return webConfigId;
+        return convertEmptyToNull(webConfigId);
     }
 
     public void setWebConfigId(String value) {
         registerModifiedProperty("webConfigId");
         this.webConfigId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (authRealm != null) {
-            sourceMap.put("authRealm", authRealm);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (hostname != null) {
-            sourceMap.put("hostname", hostname);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (parameters != null) {
-            sourceMap.put("parameters", parameters);
-        }
-        if (password != null) {
-            sourceMap.put("password", password);
-        }
-        if (port != null) {
-            sourceMap.put("port", port);
-        }
-        if (protocolScheme != null) {
-            sourceMap.put("protocolScheme", protocolScheme);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (username != null) {
-            sourceMap.put("username", username);
-        }
-        if (webConfigId != null) {
-            sourceMap.put("webConfigId", webConfigId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
index 155b617057604c2bc92cc958c5cf4b5fdaf73751..53612c57068d9638f62d2e09db531a8c38fe47e8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
  */
 public class BsWebConfig extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public WebConfigDbm asDBMeta() {
-        return WebConfigDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "web_config";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -103,6 +96,117 @@ public class BsWebConfig extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public WebConfigDbm asDBMeta() {
+        return WebConfigDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "web_config";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (available != null) {
+            sourceMap.put("available", available);
+        }
+        if (boost != null) {
+            sourceMap.put("boost", boost);
+        }
+        if (configParameter != null) {
+            sourceMap.put("configParameter", configParameter);
+        }
+        if (createdBy != null) {
+            sourceMap.put("createdBy", createdBy);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (depth != null) {
+            sourceMap.put("depth", depth);
+        }
+        if (excludedDocUrls != null) {
+            sourceMap.put("excludedDocUrls", excludedDocUrls);
+        }
+        if (excludedUrls != null) {
+            sourceMap.put("excludedUrls", excludedUrls);
+        }
+        if (includedDocUrls != null) {
+            sourceMap.put("includedDocUrls", includedDocUrls);
+        }
+        if (includedUrls != null) {
+            sourceMap.put("includedUrls", includedUrls);
+        }
+        if (intervalTime != null) {
+            sourceMap.put("intervalTime", intervalTime);
+        }
+        if (maxAccessCount != null) {
+            sourceMap.put("maxAccessCount", maxAccessCount);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (numOfThread != null) {
+            sourceMap.put("numOfThread", numOfThread);
+        }
+        if (sortOrder != null) {
+            sourceMap.put("sortOrder", sortOrder);
+        }
+        if (updatedBy != null) {
+            sourceMap.put("updatedBy", updatedBy);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        if (urls != null) {
+            sourceMap.put("urls", urls);
+        }
+        if (userAgent != null) {
+            sourceMap.put("userAgent", userAgent);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(available);
+        sb.append(dm).append(boost);
+        sb.append(dm).append(configParameter);
+        sb.append(dm).append(createdBy);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(depth);
+        sb.append(dm).append(excludedDocUrls);
+        sb.append(dm).append(excludedUrls);
+        sb.append(dm).append(includedDocUrls);
+        sb.append(dm).append(includedUrls);
+        sb.append(dm).append(intervalTime);
+        sb.append(dm).append(maxAccessCount);
+        sb.append(dm).append(name);
+        sb.append(dm).append(numOfThread);
+        sb.append(dm).append(sortOrder);
+        sb.append(dm).append(updatedBy);
+        sb.append(dm).append(updatedTime);
+        sb.append(dm).append(urls);
+        sb.append(dm).append(userAgent);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -128,7 +232,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getConfigParameter() {
         checkSpecifiedProperty("configParameter");
-        return configParameter;
+        return convertEmptyToNull(configParameter);
     }
 
     public void setConfigParameter(String value) {
@@ -138,7 +242,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -168,7 +272,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getExcludedDocUrls() {
         checkSpecifiedProperty("excludedDocUrls");
-        return excludedDocUrls;
+        return convertEmptyToNull(excludedDocUrls);
     }
 
     public void setExcludedDocUrls(String value) {
@@ -178,7 +282,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getExcludedUrls() {
         checkSpecifiedProperty("excludedUrls");
-        return excludedUrls;
+        return convertEmptyToNull(excludedUrls);
     }
 
     public void setExcludedUrls(String value) {
@@ -186,19 +290,9 @@ public class BsWebConfig extends EsAbstractEntity {
         this.excludedUrls = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getIncludedDocUrls() {
         checkSpecifiedProperty("includedDocUrls");
-        return includedDocUrls;
+        return convertEmptyToNull(includedDocUrls);
     }
 
     public void setIncludedDocUrls(String value) {
@@ -208,7 +302,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getIncludedUrls() {
         checkSpecifiedProperty("includedUrls");
-        return includedUrls;
+        return convertEmptyToNull(includedUrls);
     }
 
     public void setIncludedUrls(String value) {
@@ -238,7 +332,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -268,7 +362,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
-        return updatedBy;
+        return convertEmptyToNull(updatedBy);
     }
 
     public void setUpdatedBy(String value) {
@@ -288,7 +382,7 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getUrls() {
         checkSpecifiedProperty("urls");
-        return urls;
+        return convertEmptyToNull(urls);
     }
 
     public void setUrls(String value) {
@@ -298,77 +392,11 @@ public class BsWebConfig extends EsAbstractEntity {
 
     public String getUserAgent() {
         checkSpecifiedProperty("userAgent");
-        return userAgent;
+        return convertEmptyToNull(userAgent);
     }
 
     public void setUserAgent(String value) {
         registerModifiedProperty("userAgent");
         this.userAgent = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (available != null) {
-            sourceMap.put("available", available);
-        }
-        if (boost != null) {
-            sourceMap.put("boost", boost);
-        }
-        if (configParameter != null) {
-            sourceMap.put("configParameter", configParameter);
-        }
-        if (createdBy != null) {
-            sourceMap.put("createdBy", createdBy);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (depth != null) {
-            sourceMap.put("depth", depth);
-        }
-        if (excludedDocUrls != null) {
-            sourceMap.put("excludedDocUrls", excludedDocUrls);
-        }
-        if (excludedUrls != null) {
-            sourceMap.put("excludedUrls", excludedUrls);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (includedDocUrls != null) {
-            sourceMap.put("includedDocUrls", includedDocUrls);
-        }
-        if (includedUrls != null) {
-            sourceMap.put("includedUrls", includedUrls);
-        }
-        if (intervalTime != null) {
-            sourceMap.put("intervalTime", intervalTime);
-        }
-        if (maxAccessCount != null) {
-            sourceMap.put("maxAccessCount", maxAccessCount);
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (numOfThread != null) {
-            sourceMap.put("numOfThread", numOfThread);
-        }
-        if (sortOrder != null) {
-            sourceMap.put("sortOrder", sortOrder);
-        }
-        if (updatedBy != null) {
-            sourceMap.put("updatedBy", updatedBy);
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        if (urls != null) {
-            sourceMap.put("urls", urls);
-        }
-        if (userAgent != null) {
-            sourceMap.put("userAgent", userAgent);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
index 1cbc88fd99fb9e43b5f18d27271395555be40886..0c826c8dcd1b3e3bfad30f7b628b9dd66b832d09 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigToLabelDbm;
  */
 public class BsWebConfigToLabel extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public WebConfigToLabelDbm asDBMeta() {
-        return WebConfigToLabelDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "web_config_to_label";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -53,21 +46,54 @@ public class BsWebConfigToLabel extends EsAbstractEntity {
     // [Referrers] *comment only
 
     // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public WebConfigToLabelDbm asDBMeta() {
+        return WebConfigToLabelDbm.getInstance();
     }
 
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
+    @Override
+    public String asTableDbName() {
+        return "web_config_to_label";
     }
 
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (labelTypeId != null) {
+            sourceMap.put("labelTypeId", labelTypeId);
+        }
+        if (webConfigId != null) {
+            sourceMap.put("webConfigId", webConfigId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(labelTypeId);
+        sb.append(dm).append(webConfigId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
     public String getLabelTypeId() {
         checkSpecifiedProperty("labelTypeId");
-        return labelTypeId;
+        return convertEmptyToNull(labelTypeId);
     }
 
     public void setLabelTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsWebConfigToLabel extends EsAbstractEntity {
 
     public String getWebConfigId() {
         checkSpecifiedProperty("webConfigId");
-        return webConfigId;
+        return convertEmptyToNull(webConfigId);
     }
 
     public void setWebConfigId(String value) {
         registerModifiedProperty("webConfigId");
         this.webConfigId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (labelTypeId != null) {
-            sourceMap.put("labelTypeId", labelTypeId);
-        }
-        if (webConfigId != null) {
-            sourceMap.put("webConfigId", webConfigId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
index e520ac9a115b010ab6f134c10e12f5353d40960f..064169ca5686b4124a56353c4faf6370ad50e8d7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigToRoleDbm;
  */
 public class BsWebConfigToRole extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public WebConfigToRoleDbm asDBMeta() {
-        return WebConfigToRoleDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "web_config_to_role";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -53,21 +46,54 @@ public class BsWebConfigToRole extends EsAbstractEntity {
     // [Referrers] *comment only
 
     // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public WebConfigToRoleDbm asDBMeta() {
+        return WebConfigToRoleDbm.getInstance();
     }
 
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
+    @Override
+    public String asTableDbName() {
+        return "web_config_to_role";
     }
 
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (roleTypeId != null) {
+            sourceMap.put("roleTypeId", roleTypeId);
+        }
+        if (webConfigId != null) {
+            sourceMap.put("webConfigId", webConfigId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(roleTypeId);
+        sb.append(dm).append(webConfigId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
     public String getRoleTypeId() {
         checkSpecifiedProperty("roleTypeId");
-        return roleTypeId;
+        return convertEmptyToNull(roleTypeId);
     }
 
     public void setRoleTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsWebConfigToRole extends EsAbstractEntity {
 
     public String getWebConfigId() {
         checkSpecifiedProperty("webConfigId");
-        return webConfigId;
+        return convertEmptyToNull(webConfigId);
     }
 
     public void setWebConfigId(String value) {
         registerModifiedProperty("webConfigId");
         this.webConfigId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (roleTypeId != null) {
-            sourceMap.put("roleTypeId", roleTypeId);
-        }
-        if (webConfigId != null) {
-            sourceMap.put("webConfigId", webConfigId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
index 63b225d24685e7e56a836bae1cf77e4f581221dc..eaa82c472a06489c324cd52b3c7cde1ed42b9bce 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
@@ -85,7 +85,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
                 (et, vl) -> ((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedTime(),
                 (et, vl) -> ((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getId(), (et, vl) -> ((BoostDocumentRule) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getSortOrder(),
                 (et, vl) -> ((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
         setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedBy(),
@@ -136,8 +135,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
@@ -159,10 +156,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnSortOrder() {
         return _columnSortOrder;
     }
@@ -184,7 +177,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
         ls.add(columnBoostExpr());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnSortOrder());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
index 4b46505c7f82c40776e8011185f1a3ab2f99371c..07aa67cfc81b2388bc054876712fced19ad87984 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
@@ -83,7 +83,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
                 (et, vl) -> ((CrawlingSession) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
         setupEpg(_epgMap, et -> ((CrawlingSession) et).getExpiredTime(),
                 (et, vl) -> ((CrawlingSession) et).setExpiredTime(DfTypeUtil.toLong(vl)), "expiredTime");
-        setupEpg(_epgMap, et -> ((CrawlingSession) et).getId(), (et, vl) -> ((CrawlingSession) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((CrawlingSession) et).getName(), (et, vl) -> ((CrawlingSession) et).setName(DfTypeUtil.toString(vl)),
                 "name");
         setupEpg(_epgMap, et -> ((CrawlingSession) et).getSessionId(),
@@ -128,8 +127,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false,
@@ -143,10 +140,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
         return _columnExpiredTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -159,7 +152,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedTime());
         ls.add(columnExpiredTime());
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnSessionId());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
index b7f290ca9aaea904051d70ecc5c44465b6e2a3ed..162097288a3fcf895e7f5161ee5b5eb4892d5bd4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
@@ -83,8 +83,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
                 (et, vl) -> ((CrawlingSessionInfo) et).setCrawlingSessionId(DfTypeUtil.toString(vl)), "crawlingSessionId");
         setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getCreatedTime(),
                 (et, vl) -> ((CrawlingSessionInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getId(), (et, vl) -> ((CrawlingSessionInfo) et).setId(DfTypeUtil.toString(vl)),
-                "id");
         setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getKey(),
                 (et, vl) -> ((CrawlingSessionInfo) et).setKey(DfTypeUtil.toString(vl)), "key");
         setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getValue(),
@@ -129,8 +127,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
             "crawlingSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0,
             null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
@@ -144,10 +140,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnKey() {
         return _columnKey;
     }
@@ -160,7 +152,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCrawlingSessionId());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnKey());
         ls.add(columnValue());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
index 53f4c0b48181157c2b53f85058031eaf038d8a34..8e890e5cf8d83fda877daf2352c6164a291c5f89 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
@@ -92,7 +92,6 @@ public class DataConfigDbm extends AbstractDBMeta {
                 (et, vl) -> ((DataConfig) et).setHandlerParameter(DfTypeUtil.toString(vl)), "handlerParameter");
         setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerScript(),
                 (et, vl) -> ((DataConfig) et).setHandlerScript(DfTypeUtil.toString(vl)), "handlerScript");
-        setupEpg(_epgMap, et -> ((DataConfig) et).getId(), (et, vl) -> ((DataConfig) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((DataConfig) et).getName(), (et, vl) -> ((DataConfig) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((DataConfig) et).getSortOrder(), (et, vl) -> ((DataConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
@@ -150,8 +149,6 @@ public class DataConfigDbm extends AbstractDBMeta {
             "handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript",
             null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
@@ -189,10 +186,6 @@ public class DataConfigDbm extends AbstractDBMeta {
         return _columnHandlerScript;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -218,7 +211,6 @@ public class DataConfigDbm extends AbstractDBMeta {
         ls.add(columnHandlerName());
         ls.add(columnHandlerParameter());
         ls.add(columnHandlerScript());
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnSortOrder());
         ls.add(columnUpdatedBy());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
index cbf0f4d51cea62b9d8c23971c07d3872e12cedae..1663b8f96e762f105b50c494f081d37481092810 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
@@ -81,7 +81,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getDataConfigId(),
                 (et, vl) -> ((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId");
-        setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getId(), (et, vl) -> ((DataConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getLabelTypeId(),
                 (et, vl) -> ((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
     }
@@ -122,8 +121,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
@@ -131,10 +128,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
         return _columnDataConfigId;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
     }
@@ -142,7 +135,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnDataConfigId());
-        ls.add(columnId());
         ls.add(columnLabelTypeId());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
index 5cb18d57708848c98cd8be0c5da972c374282927..f9308cea9442be75f14b83cea463b579c7cb711c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
@@ -81,7 +81,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((DataConfigToRole) et).getDataConfigId(),
                 (et, vl) -> ((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId");
-        setupEpg(_epgMap, et -> ((DataConfigToRole) et).getId(), (et, vl) -> ((DataConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((DataConfigToRole) et).getRoleTypeId(),
                 (et, vl) -> ((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
     }
@@ -122,8 +121,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
@@ -131,10 +128,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
         return _columnDataConfigId;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnRoleTypeId() {
         return _columnRoleTypeId;
     }
@@ -142,7 +135,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnDataConfigId());
-        ls.add(columnId());
         ls.add(columnRoleTypeId());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
index cfe22a65beae2f93fe18fd637e26c06a6ca15567..12952b846cf0609c1e00b46d01a13cfd24fa7d1e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
@@ -87,7 +87,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
                 "errorLog");
         setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorName(), (et, vl) -> ((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)),
                 "errorName");
-        setupEpg(_epgMap, et -> ((FailureUrl) et).getId(), (et, vl) -> ((FailureUrl) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((FailureUrl) et).getLastAccessTime(),
                 (et, vl) -> ((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime");
         setupEpg(_epgMap, et -> ((FailureUrl) et).getThreadName(), (et, vl) -> ((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)),
@@ -137,8 +136,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false,
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime",
             null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false,
@@ -162,10 +159,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
         return _columnErrorName;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnLastAccessTime() {
         return _columnLastAccessTime;
     }
@@ -184,7 +177,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
         ls.add(columnErrorCount());
         ls.add(columnErrorLog());
         ls.add(columnErrorName());
-        ls.add(columnId());
         ls.add(columnLastAccessTime());
         ls.add(columnThreadName());
         ls.add(columnUrl());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
index 07e417955b1dcf5a06a7fea34018a35c4059c11f..40099ecdac6986df5382741f6bbecbb345a10439 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
@@ -87,8 +87,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
                 (et, vl) -> ((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
         setupEpg(_epgMap, et -> ((FileAuthentication) et).getHostname(),
                 (et, vl) -> ((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
-        setupEpg(_epgMap, et -> ((FileAuthentication) et).getId(), (et, vl) -> ((FileAuthentication) et).setId(DfTypeUtil.toString(vl)),
-                "id");
         setupEpg(_epgMap, et -> ((FileAuthentication) et).getParameters(),
                 (et, vl) -> ((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
         setupEpg(_epgMap, et -> ((FileAuthentication) et).getPassword(),
@@ -147,8 +145,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
@@ -180,10 +176,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
         return _columnHostname;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnParameters() {
         return _columnParameters;
     }
@@ -218,7 +210,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
         ls.add(columnCreatedTime());
         ls.add(columnFileConfigId());
         ls.add(columnHostname());
-        ls.add(columnId());
         ls.add(columnParameters());
         ls.add(columnPassword());
         ls.add(columnPort());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
index 4f73a1561fabef5f0a5cf9be989011b5383735b5..b5fd64a1c23ffac47bfb8e669ff36707583049c0 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
@@ -93,7 +93,6 @@ public class FileConfigDbm extends AbstractDBMeta {
                 (et, vl) -> ((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths");
         setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedPaths(),
                 (et, vl) -> ((FileConfig) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
-        setupEpg(_epgMap, et -> ((FileConfig) et).getId(), (et, vl) -> ((FileConfig) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedDocPaths(),
                 (et, vl) -> ((FileConfig) et).setIncludedDocPaths(DfTypeUtil.toString(vl)), "includedDocPaths");
         setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedPaths(),
@@ -164,8 +163,6 @@ public class FileConfigDbm extends AbstractDBMeta {
             "excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
             null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class,
             "includedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
@@ -219,10 +216,6 @@ public class FileConfigDbm extends AbstractDBMeta {
         return _columnExcludedPaths;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnIncludedDocPaths() {
         return _columnIncludedDocPaths;
     }
@@ -273,7 +266,6 @@ public class FileConfigDbm extends AbstractDBMeta {
         ls.add(columnDepth());
         ls.add(columnExcludedDocPaths());
         ls.add(columnExcludedPaths());
-        ls.add(columnId());
         ls.add(columnIncludedDocPaths());
         ls.add(columnIncludedPaths());
         ls.add(columnIntervalTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
index c176de7f1d70dcac78fa5e8c17cb6baccfee0df8..e969392f81cd1b23a580ef6399b6a500c0934baa 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
@@ -81,7 +81,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getFileConfigId(),
                 (et, vl) -> ((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
-        setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getId(), (et, vl) -> ((FileConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getLabelTypeId(),
                 (et, vl) -> ((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
     }
@@ -122,8 +121,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
@@ -131,10 +128,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
         return _columnFileConfigId;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
     }
@@ -142,7 +135,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnFileConfigId());
-        ls.add(columnId());
         ls.add(columnLabelTypeId());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
index 3c486dd1441f781608507d43b62e6ff2f622bcd0..22165b55630f2e95b7fc55141b2242079cb1a55a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
@@ -81,7 +81,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((FileConfigToRole) et).getFileConfigId(),
                 (et, vl) -> ((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
-        setupEpg(_epgMap, et -> ((FileConfigToRole) et).getId(), (et, vl) -> ((FileConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((FileConfigToRole) et).getRoleTypeId(),
                 (et, vl) -> ((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
     }
@@ -122,8 +121,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
@@ -131,10 +128,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
         return _columnFileConfigId;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnRoleTypeId() {
         return _columnRoleTypeId;
     }
@@ -142,7 +135,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnFileConfigId());
-        ls.add(columnId());
         ls.add(columnRoleTypeId());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
index ea0e26502d812995d0f68f43badde490de7cba46..6af58ca00fb34f516a799684843ab8129d5dbce3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
@@ -80,7 +80,6 @@ public class JobLogDbm extends AbstractDBMeta {
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
         setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime");
-        setupEpg(_epgMap, et -> ((JobLog) et).getId(), (et, vl) -> ((JobLog) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName");
         setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus");
         setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)),
@@ -129,8 +128,6 @@ public class JobLogDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false,
             "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false,
             "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false,
@@ -150,10 +147,6 @@ public class JobLogDbm extends AbstractDBMeta {
         return _columnEndTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnJobName() {
         return _columnJobName;
     }
@@ -185,7 +178,6 @@ public class JobLogDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnEndTime());
-        ls.add(columnId());
         ls.add(columnJobName());
         ls.add(columnJobStatus());
         ls.add(columnScriptData());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
index 156404d6d6c31850dcf14d6fef8622cdfef9cc32..193ab6d95d985ed5e2165ddb5b3c26ad845e45aa 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
@@ -84,7 +84,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedTime(), (et, vl) -> ((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getId(), (et, vl) -> ((KeyMatch) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query");
         setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term");
@@ -134,8 +133,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String",
@@ -159,10 +156,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnMaxSize() {
         return _columnMaxSize;
     }
@@ -188,7 +181,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
         ls.add(columnBoost());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnMaxSize());
         ls.add(columnQuery());
         ls.add(columnTerm());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
index c469e3ea4bb92d08e1fe6888d4ed15a2e3a9885e..f0ee70f82d6cf2c9623cdb77e41593ec6b87674d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
@@ -79,7 +79,6 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((LabelToRole) et).getId(), (et, vl) -> ((LabelToRole) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((LabelToRole) et).getLabelTypeId(),
                 (et, vl) -> ((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
         setupEpg(_epgMap, et -> ((LabelToRole) et).getRoleTypeId(), (et, vl) -> ((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)),
@@ -120,17 +119,11 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
     }
@@ -141,7 +134,6 @@ public class LabelToRoleDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnLabelTypeId());
         ls.add(columnRoleTypeId());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
index 0d6a2e0aeeca55957adb7eaf8ca7b4da09d3f908..d9ba285b0680783d89456fd13eec47f3c14626b5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
@@ -85,7 +85,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
                 "createdTime");
         setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(),
                 (et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
-        setupEpg(_epgMap, et -> ((LabelType) et).getId(), (et, vl) -> ((LabelType) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(),
                 (et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
         setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -138,8 +137,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
             null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
             null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
@@ -165,10 +162,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
         return _columnExcludedPaths;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnIncludedPaths() {
         return _columnIncludedPaths;
     }
@@ -198,7 +191,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
         ls.add(columnExcludedPaths());
-        ls.add(columnId());
         ls.add(columnIncludedPaths());
         ls.add(columnName());
         ls.add(columnSortOrder());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
index 971abd1f66e6de019c823c046598ce0f823e6498..c35f2fdcd25cea8cbfa3a7298accfb9dc24caf67 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
@@ -83,7 +83,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
                 (et, vl) -> ((OverlappingHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((OverlappingHost) et).getCreatedTime(),
                 (et, vl) -> ((OverlappingHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((OverlappingHost) et).getId(), (et, vl) -> ((OverlappingHost) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((OverlappingHost) et).getOverlappingName(),
                 (et, vl) -> ((OverlappingHost) et).setOverlappingName(DfTypeUtil.toString(vl)), "overlappingName");
         setupEpg(_epgMap, et -> ((OverlappingHost) et).getRegularName(),
@@ -134,8 +133,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnOverlappingName = cci("overlappingName", "overlappingName", null, null, String.class,
             "overlappingName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false,
@@ -155,10 +152,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnOverlappingName() {
         return _columnOverlappingName;
     }
@@ -183,7 +176,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnOverlappingName());
         ls.add(columnRegularName());
         ls.add(columnSortOrder());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
index dc0c496bb836b6a27815268759eccb0f35de47d0..7eae7f6052077d1510f06aea2154c50db941898f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
@@ -83,7 +83,6 @@ public class PathMappingDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getId(), (et, vl) -> ((PathMapping) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(),
                 (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType");
         setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex");
@@ -135,8 +134,6 @@ public class PathMappingDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String",
@@ -158,10 +155,6 @@ public class PathMappingDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnProcessType() {
         return _columnProcessType;
     }
@@ -190,7 +183,6 @@ public class PathMappingDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnProcessType());
         ls.add(columnRegex());
         ls.add(columnReplacement());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
index 802ec7abdb5aa1a76787e6ee185314b40d2fa608..3e89d49cceeec9a1f6ff55162b4773060e685c7e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
@@ -83,7 +83,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
                 (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(),
                 (et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getId(), (et, vl) -> ((RequestHeader) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(),
                 (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
@@ -133,8 +132,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
@@ -154,10 +151,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -182,7 +175,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
index f0f114bdcc1ace1b780f78afc8e8fa4246f26769..dadc4456d24c358699dbf39e14529d01c4ecc836 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
@@ -83,7 +83,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((RoleType) et).getCreatedTime(), (et, vl) -> ((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
-        setupEpg(_epgMap, et -> ((RoleType) et).getId(), (et, vl) -> ((RoleType) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((RoleType) et).getName(), (et, vl) -> ((RoleType) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((RoleType) et).getSortOrder(), (et, vl) -> ((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
@@ -132,8 +131,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
@@ -153,10 +150,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -181,7 +174,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnSortOrder());
         ls.add(columnUpdatedBy());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
index 3964dbbf6a968441cefff8e97b2b129a8fdd079e..f1184888a604a04a0684898d08c1a2b6250104e6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
@@ -89,7 +89,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
                 (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
         setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(),
                 (et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getId(), (et, vl) -> ((ScheduledJob) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(),
                 (et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging");
         setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -151,8 +150,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression",
             null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false,
             false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
@@ -190,10 +187,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
         return _columnCronExpression;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnJobLogging() {
         return _columnJobLogging;
     }
@@ -233,7 +226,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
         ls.add(columnCronExpression());
-        ls.add(columnId());
         ls.add(columnJobLogging());
         ls.add(columnName());
         ls.add(columnScriptData());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
index d8982f54ea7856a53af8c023d108abadab5d867c..e76de36acaddf561222866706c6b88246ea92732 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
@@ -83,7 +83,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
                 (et, vl) -> ((SuggestBadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedTime(),
                 (et, vl) -> ((SuggestBadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((SuggestBadWord) et).getId(), (et, vl) -> ((SuggestBadWord) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((SuggestBadWord) et).getSuggestWord(),
                 (et, vl) -> ((SuggestBadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
         setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetLabel(),
@@ -134,8 +133,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
@@ -155,10 +152,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnSuggestWord() {
         return _columnSuggestWord;
     }
@@ -183,7 +176,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnSuggestWord());
         ls.add(columnTargetLabel());
         ls.add(columnTargetRole());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
index 6c6c9e7d2c085a4f16e1bfb912c8fcac7fc1c706..e6f250e0d2c26aac2047a5090517744d690d269b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
@@ -85,8 +85,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
                 (et, vl) -> ((SuggestElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
         setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedTime(),
                 (et, vl) -> ((SuggestElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getId(), (et, vl) -> ((SuggestElevateWord) et).setId(DfTypeUtil.toString(vl)),
-                "id");
         setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getReading(),
                 (et, vl) -> ((SuggestElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading");
         setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getSuggestWord(),
@@ -141,8 +139,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
             "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
@@ -168,10 +164,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnReading() {
         return _columnReading;
     }
@@ -201,7 +193,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
         ls.add(columnBoost());
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnReading());
         ls.add(columnSuggestWord());
         ls.add(columnTargetLabel());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
index a5442ea11ebdc4dd7ae2ac67f71f2fafb3ca0754..2ca0e904c58c6b74a5b65f95de32a0762e5d64a5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
@@ -87,7 +87,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
                 (et, vl) -> ((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
         setupEpg(_epgMap, et -> ((WebAuthentication) et).getHostname(),
                 (et, vl) -> ((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getId(), (et, vl) -> ((WebAuthentication) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((WebAuthentication) et).getParameters(),
                 (et, vl) -> ((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
         setupEpg(_epgMap, et -> ((WebAuthentication) et).getPassword(),
@@ -148,8 +147,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
@@ -183,10 +180,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
         return _columnHostname;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnParameters() {
         return _columnParameters;
     }
@@ -225,7 +218,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
         ls.add(columnCreatedBy());
         ls.add(columnCreatedTime());
         ls.add(columnHostname());
-        ls.add(columnId());
         ls.add(columnParameters());
         ls.add(columnPassword());
         ls.add(columnPort());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
index ddebddce0d56de4ac579ff1d19514a1f20cd01f2..6dddf6509aa101efd50cdc30cede7704ac6cd175 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
@@ -93,7 +93,6 @@ public class WebConfigDbm extends AbstractDBMeta {
                 (et, vl) -> ((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls");
         setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedUrls(), (et, vl) -> ((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)),
                 "excludedUrls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getId(), (et, vl) -> ((WebConfig) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedDocUrls(),
                 (et, vl) -> ((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls");
         setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedUrls(), (et, vl) -> ((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)),
@@ -166,8 +165,6 @@ public class WebConfigDbm extends AbstractDBMeta {
             "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null,
             false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class,
             "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null,
@@ -223,10 +220,6 @@ public class WebConfigDbm extends AbstractDBMeta {
         return _columnExcludedUrls;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnIncludedDocUrls() {
         return _columnIncludedDocUrls;
     }
@@ -281,7 +274,6 @@ public class WebConfigDbm extends AbstractDBMeta {
         ls.add(columnDepth());
         ls.add(columnExcludedDocUrls());
         ls.add(columnExcludedUrls());
-        ls.add(columnId());
         ls.add(columnIncludedDocUrls());
         ls.add(columnIncludedUrls());
         ls.add(columnIntervalTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
index f321ac3f9a90f7f4faa0d853e18476cecdfed467..10c7bb6d530aa3a341c7e7d4f5622fbdea9ca356 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
@@ -79,7 +79,6 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getId(), (et, vl) -> ((WebConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getLabelTypeId(),
                 (et, vl) -> ((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
         setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getWebConfigId(),
@@ -120,17 +119,11 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
     }
@@ -141,7 +134,6 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnLabelTypeId());
         ls.add(columnWebConfigId());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
index a1f08c0b8190180223f184ee5f3ffb1cf24d87c6..6a19ef2ee718d6c1769ac8408448d945365a5993 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
@@ -79,7 +79,6 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebConfigToRole) et).getId(), (et, vl) -> ((WebConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((WebConfigToRole) et).getRoleTypeId(),
                 (et, vl) -> ((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
         setupEpg(_epgMap, et -> ((WebConfigToRole) et).getWebConfigId(),
@@ -120,17 +119,11 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
             false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnRoleTypeId() {
         return _columnRoleTypeId;
     }
@@ -141,7 +134,6 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnRoleTypeId());
         ls.add(columnWebConfigId());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
index eae7be6aeb3ec2b6f6013c8e8e2f27045a65f7e0..252ab500adf974952132eeced14bbbf64f7efb8d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -154,6 +154,10 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnBoostExpr() {
             doColumn("boostExpr");
         }
@@ -166,10 +170,6 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
index 4dc462d4abea202b6db82d076988e66e4407bcac..744f9fac4d732c5e74e480e19247b08194903f5b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
@@ -154,6 +154,10 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
@@ -162,10 +166,6 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean {
             doColumn("expiredTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnName() {
             doColumn("name");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
index 8a729b18904ba313827748084724acd99b8cd5bd..6d0263914726f3b0b9fe8416a0e8710c5a66d6e9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
@@ -154,6 +154,10 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCrawlingSessionId() {
             doColumn("crawlingSessionId");
         }
@@ -162,10 +166,6 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnKey() {
             doColumn("key");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index ea96ddadf682caef68ef6cdcc754d97c70a5ecb2..e1487f0206ccac615490be64c1f21485579f50d3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -154,6 +154,10 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAvailable() {
             doColumn("available");
         }
@@ -182,10 +186,6 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
             doColumn("handlerScript");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnName() {
             doColumn("name");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
index 8acb14d5b12f4c49744c45655dde832f025303d3..b1c641d691b45fdd7006491fac7808a42641a5d0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
@@ -154,12 +154,12 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnDataConfigId() {
-            doColumn("dataConfigId");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnDataConfigId() {
+            doColumn("dataConfigId");
         }
 
         public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
index 4a878cf985fc3c21f83f3c5709d938f2fc7317f1..0207e5156c12ac8bee70a15c37d7a550e1a1164d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
@@ -154,12 +154,12 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnDataConfigId() {
-            doColumn("dataConfigId");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnDataConfigId() {
+            doColumn("dataConfigId");
         }
 
         public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
index 33820f1d72b8ae3ffcdc7ca4a7fa73693c29290e..e5d8baa0057e6320e2df9c05043429084eefabee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
@@ -154,6 +154,10 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnConfigId() {
             doColumn("configId");
         }
@@ -170,10 +174,6 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
             doColumn("errorName");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnLastAccessTime() {
             doColumn("lastAccessTime");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
index f33ed404840767d637615e5ff596d618b92b9c54..0cb3ea71d667eec4461142b51c84fa481ceca79a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
@@ -154,6 +154,10 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -170,10 +174,6 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
             doColumn("hostname");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnParameters() {
             doColumn("parameters");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index ff521c44fee730331f989ab27b25bfc0cc9b9f3c..2e2da9ad405f36406986f270623257d8e40103e0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -154,6 +154,10 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAvailable() {
             doColumn("available");
         }
@@ -186,10 +190,6 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
             doColumn("excludedPaths");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnIncludedDocPaths() {
             doColumn("includedDocPaths");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
index f1520c540b795e96bf1daf49c4553f8ba590dc55..4c3458e20c53687d1387a1c78aac52caa3f66b97 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
@@ -154,12 +154,12 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnFileConfigId() {
-            doColumn("fileConfigId");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnFileConfigId() {
+            doColumn("fileConfigId");
         }
 
         public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
index 016a03cc39f35405cda198bc6b5261a86f386027..58aaf217ff23b23ae1ef74f390d8132ba31dc1be 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
@@ -154,12 +154,12 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnFileConfigId() {
-            doColumn("fileConfigId");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnFileConfigId() {
+            doColumn("fileConfigId");
         }
 
         public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index 3e8a6315ee20e7d154e160966745997f892c1a9a..3f986a100f03329b91ae3d818cbd3b06c9999269 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -154,12 +154,12 @@ public class BsJobLogCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnEndTime() {
-            doColumn("endTime");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnEndTime() {
+            doColumn("endTime");
         }
 
         public void columnJobName() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index b8fe864748839f99553c13dc6172363094b74f46..d0e1d54fe3e4bfe183035dc10151545be1d8c542 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -154,6 +154,10 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnBoost() {
             doColumn("boost");
         }
@@ -166,10 +170,6 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnMaxSize() {
             doColumn("maxSize");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
index 115655354213161889c61360ebc62c6676f28ec0..a606d5fa67a95c5ca9d1714b47d877d2814cdca5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
@@ -155,7 +155,7 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index 6b5d7a88efa2b338a263f7895e045eeadece0795..c7283c5768bd79d2e91c09666212a0f515502d21 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -154,6 +154,10 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -166,10 +170,6 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
             doColumn("excludedPaths");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnIncludedPaths() {
             doColumn("includedPaths");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
index 0df30599487a08ad78e788f03efd80aeac790b10..169207008082fd96f427719091a50485172aa146 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
@@ -154,6 +154,10 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -162,10 +166,6 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnOverlappingName() {
             doColumn("overlappingName");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index fceca163284884fc73cf51f45850cdaffb088206..1ab5c924ccdaa52b84f84af54d5b04ff9951dcea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -154,6 +154,10 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -162,10 +166,6 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnProcessType() {
             doColumn("processType");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
index 39e81a9a204fa18bfd5738ce279903af1b112a78..6937b041baf455630a95425de5bcf5494a3dcdba 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
@@ -154,6 +154,10 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -162,10 +166,6 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnName() {
             doColumn("name");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
index 2ef478c7c323b488cacdc6cf9ebff12aba73e774..9b8904c7c0c52c93671e9844ce741b9e2c29e009 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
@@ -154,6 +154,10 @@ public class BsRoleTypeCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -162,10 +166,6 @@ public class BsRoleTypeCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnName() {
             doColumn("name");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
index 1a1e8e2555925d2fc9d27065bc6c4e45de565a27..e303bc9f258bf0d0874524f521f103fc34b2b6e6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
@@ -154,6 +154,10 @@ public class BsScheduledJobCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAvailable() {
             doColumn("available");
         }
@@ -174,10 +178,6 @@ public class BsScheduledJobCB extends EsAbstractConditionBean {
             doColumn("cronExpression");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnJobLogging() {
             doColumn("jobLogging");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
index bccac9ec96e7a5f883a57deaa4244655e497b6d8..7613509053a351c7e399aa9558f9c07d5d3c4450 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
@@ -154,6 +154,10 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
@@ -162,10 +166,6 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnSuggestWord() {
             doColumn("suggestWord");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
index 4b4614de631cac9113aeecfee591b3460a4c384d..346246df21bd90f15fbfc894ecc479cdb9341d33 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
@@ -154,6 +154,10 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnBoost() {
             doColumn("boost");
         }
@@ -166,10 +170,6 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnReading() {
             doColumn("reading");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
index 76f00617c21e846b78ee1b50eb8f561fece80303..1e43b69cb52c082aa5573cfe7b8f5cfebcbb12de 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
@@ -154,6 +154,10 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAuthRealm() {
             doColumn("authRealm");
         }
@@ -170,10 +174,6 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean {
             doColumn("hostname");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnParameters() {
             doColumn("parameters");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index 1d4f933144cc55e3e3b4e77b77e2c59f35639999..7c1811783b71de3a7653cbcca292fd39080e73e4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -154,6 +154,10 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAvailable() {
             doColumn("available");
         }
@@ -186,10 +190,6 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
             doColumn("excludedUrls");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnIncludedDocUrls() {
             doColumn("includedDocUrls");
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
index cfd64264131315c270d00945b8326ea83ed45f54..5c6d8928118cdb19304f21282fa14658d52e1717 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
@@ -155,7 +155,7 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
index e47e6c8b0b14e1b831fb0ad90048dc7ee3551683..2b3f5e9b69a97067a780507011f8b0eea69397b6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
@@ -155,7 +155,7 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java
deleted file mode 100644
index 25fef90dec44411c936b67108862e424658df587..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsBoostDocumentRuleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class BoostDocumentRuleCF extends BsBoostDocumentRuleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java
deleted file mode 100644
index 45d149f9aa75fc0c506898064be7146edba51064..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsCrawlingSessionCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class CrawlingSessionCF extends BsCrawlingSessionCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java
deleted file mode 100644
index dd08f9cc180db160ea8cbb83d8f33cb9a33c1630..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsCrawlingSessionInfoCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class CrawlingSessionInfoCF extends BsCrawlingSessionInfoCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java
deleted file mode 100644
index 902141edd2d3361e1628b0c690d7b68a57374737..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigCF extends BsDataConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java
deleted file mode 100644
index c8e578314398c29daf342972a2a2e41137fd3391..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigToLabelCF extends BsDataConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java
deleted file mode 100644
index 63b945322974c4ce064d261d8977da9b9ba7fdc2..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigToRoleCF extends BsDataConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java
deleted file mode 100644
index ad907b3fee0c9ddbe865dc0ff7ee65fe3ac10f04..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFailureUrlCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FailureUrlCF extends BsFailureUrlCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java
deleted file mode 100644
index c1eddd5317f0355d1c5b55052da96fc8fd123bdc..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileAuthenticationCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileAuthenticationCF extends BsFileAuthenticationCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java
deleted file mode 100644
index 9d02026cd5fed079eae3705e4b91718e12f0ea9f..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigCF extends BsFileConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java
deleted file mode 100644
index 025fca7e6ef8a7960f1a574e86ebf64b030ddb45..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigToLabelCF extends BsFileConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java
deleted file mode 100644
index ab758e270b7a53071f432cc99f645e6ab08a0548..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigToRoleCF extends BsFileConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java
deleted file mode 100644
index dcd15f409374f900651f5390a3a9fa271522ea59..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsJobLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class JobLogCF extends BsJobLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java
deleted file mode 100644
index 2f851afbc21da943b0d892e99e687028649a2693..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsKeyMatchCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class KeyMatchCF extends BsKeyMatchCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java
deleted file mode 100644
index ba702c5b6a251496d438e2374638f5c6676a0fbc..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsLabelToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class LabelToRoleCF extends BsLabelToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java
deleted file mode 100644
index 02a733154daadc716aaab427c1844f415e7cb18a..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsLabelTypeCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class LabelTypeCF extends BsLabelTypeCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java
deleted file mode 100644
index 9a0dfa7154cde3cbaf9601d89f5a558e5eae13a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsOverlappingHostCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class OverlappingHostCF extends BsOverlappingHostCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java
deleted file mode 100644
index 5cb3dfb0be2007bd742246ff39d9b642ba944f97..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsPathMappingCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class PathMappingCF extends BsPathMappingCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java
deleted file mode 100644
index 2c6e131c57e54f3c881d79f213cc5e4428d424fd..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsRequestHeaderCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class RequestHeaderCF extends BsRequestHeaderCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java
deleted file mode 100644
index 1d010422164426a77d09219c5dc0936be0ed6f10..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsRoleTypeCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class RoleTypeCF extends BsRoleTypeCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java
deleted file mode 100644
index d2b61e28d90e8151a80ca5c681ffc5a9daf84c0c..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsScheduledJobCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class ScheduledJobCF extends BsScheduledJobCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java
deleted file mode 100644
index 2cdf128447b42f2170aaebd1de860701ebcd1d91..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsSuggestBadWordCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SuggestBadWordCF extends BsSuggestBadWordCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java
deleted file mode 100644
index 9e346d138e783958e407d5dd943ad59f6e47d380..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsSuggestElevateWordCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SuggestElevateWordCF extends BsSuggestElevateWordCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java
deleted file mode 100644
index 00187906be81d27ef863dd6d7e582727dd34531f..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebAuthenticationCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebAuthenticationCF extends BsWebAuthenticationCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java
deleted file mode 100644
index 346398d4dcdb8c3cb2584620c0c0bbf85c2be432..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigCF extends BsWebConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java
deleted file mode 100644
index 5f4bfa048c4d3a08d9ebfd2644723838e4d44d6a..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigToLabelCF extends BsWebConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java
deleted file mode 100644
index 8e6851c90d05ea10fcf78c190310aea823749668..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigToRoleCF extends BsWebConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java
deleted file mode 100644
index 41125034fd8f403555fb243ab92389bb7d982a62..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.BoostDocumentRuleCF;
-import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsBoostDocumentRuleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<BoostDocumentRuleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<BoostDocumentRuleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        BoostDocumentRuleCF mustFilter = new BoostDocumentRuleCF();
-        BoostDocumentRuleCF shouldFilter = new BoostDocumentRuleCF();
-        BoostDocumentRuleCF mustNotFilter = new BoostDocumentRuleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<BoostDocumentRuleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<BoostDocumentRuleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        BoostDocumentRuleCF andFilter = new BoostDocumentRuleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<BoostDocumentRuleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<BoostDocumentRuleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        BoostDocumentRuleCF orFilter = new BoostDocumentRuleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<BoostDocumentRuleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<BoostDocumentRuleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        BoostDocumentRuleCF notFilter = new BoostDocumentRuleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<BoostDocumentRuleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<BoostDocumentRuleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        BoostDocumentRuleCQ query = new BoostDocumentRuleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setBoostExpr_NotEqual(String boostExpr) {
-        setBoostExpr_NotEqual(boostExpr, null, null);
-    }
-
-    public void setBoostExpr_NotEqual(String boostExpr, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoostExpr_Equal(boostExpr, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoostExpr_Equal(String boostExpr) {
-        setBoostExpr_Term(boostExpr, null);
-    }
-
-    public void setBoostExpr_Equal(String boostExpr, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoostExpr_Term(boostExpr, opLambda);
-    }
-
-    public void setBoostExpr_Term(String boostExpr) {
-        setBoostExpr_Term(boostExpr, null);
-    }
-
-    public void setBoostExpr_Term(String boostExpr, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boostExpr", boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_Terms(Collection<String> boostExprList) {
-        setBoostExpr_Terms(boostExprList, null);
-    }
-
-    public void setBoostExpr_Terms(Collection<String> boostExprList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boostExpr", boostExprList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_InScope(Collection<String> boostExprList) {
-        setBoostExpr_Terms(boostExprList, null);
-    }
-
-    public void setBoostExpr_InScope(Collection<String> boostExprList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoostExpr_Terms(boostExprList, opLambda);
-    }
-
-    public void setBoostExpr_Prefix(String boostExpr) {
-        setBoostExpr_Prefix(boostExpr, null);
-    }
-
-    public void setBoostExpr_Prefix(String boostExpr, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("boostExpr", boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_Exists() {
-        setBoostExpr_Exists(null);
-    }
-
-    public void setBoostExpr_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boostExpr");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_Missing() {
-        setBoostExpr_Missing(null);
-    }
-
-    public void setBoostExpr_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boostExpr");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_GreaterThan(String boostExpr) {
-        setBoostExpr_GreaterThan(boostExpr, null);
-    }
-
-    public void setBoostExpr_GreaterThan(String boostExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_GREATER_THAN, boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_LessThan(String boostExpr) {
-        setBoostExpr_LessThan(boostExpr, null);
-    }
-
-    public void setBoostExpr_LessThan(String boostExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_LESS_THAN, boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_GreaterEqual(String boostExpr) {
-        setBoostExpr_GreaterEqual(boostExpr, null);
-    }
-
-    public void setBoostExpr_GreaterEqual(String boostExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_GREATER_EQUAL, boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoostExpr_LessEqual(String boostExpr) {
-        setBoostExpr_LessEqual(boostExpr, null);
-    }
-
-    public void setBoostExpr_LessEqual(String boostExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_LESS_EQUAL, boostExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_NotEqual(String urlExpr) {
-        setUrlExpr_NotEqual(urlExpr, null, null);
-    }
-
-    public void setUrlExpr_NotEqual(String urlExpr, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUrlExpr_Equal(urlExpr, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUrlExpr_Equal(String urlExpr) {
-        setUrlExpr_Term(urlExpr, null);
-    }
-
-    public void setUrlExpr_Equal(String urlExpr, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUrlExpr_Term(urlExpr, opLambda);
-    }
-
-    public void setUrlExpr_Term(String urlExpr) {
-        setUrlExpr_Term(urlExpr, null);
-    }
-
-    public void setUrlExpr_Term(String urlExpr, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("urlExpr", urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_Terms(Collection<String> urlExprList) {
-        setUrlExpr_Terms(urlExprList, null);
-    }
-
-    public void setUrlExpr_Terms(Collection<String> urlExprList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("urlExpr", urlExprList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_InScope(Collection<String> urlExprList) {
-        setUrlExpr_Terms(urlExprList, null);
-    }
-
-    public void setUrlExpr_InScope(Collection<String> urlExprList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUrlExpr_Terms(urlExprList, opLambda);
-    }
-
-    public void setUrlExpr_Prefix(String urlExpr) {
-        setUrlExpr_Prefix(urlExpr, null);
-    }
-
-    public void setUrlExpr_Prefix(String urlExpr, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("urlExpr", urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_Exists() {
-        setUrlExpr_Exists(null);
-    }
-
-    public void setUrlExpr_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("urlExpr");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_Missing() {
-        setUrlExpr_Missing(null);
-    }
-
-    public void setUrlExpr_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("urlExpr");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_GreaterThan(String urlExpr) {
-        setUrlExpr_GreaterThan(urlExpr, null);
-    }
-
-    public void setUrlExpr_GreaterThan(String urlExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urlExpr", ConditionKey.CK_GREATER_THAN, urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_LessThan(String urlExpr) {
-        setUrlExpr_LessThan(urlExpr, null);
-    }
-
-    public void setUrlExpr_LessThan(String urlExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urlExpr", ConditionKey.CK_LESS_THAN, urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_GreaterEqual(String urlExpr) {
-        setUrlExpr_GreaterEqual(urlExpr, null);
-    }
-
-    public void setUrlExpr_GreaterEqual(String urlExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urlExpr", ConditionKey.CK_GREATER_EQUAL, urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrlExpr_LessEqual(String urlExpr) {
-        setUrlExpr_LessEqual(urlExpr, null);
-    }
-
-    public void setUrlExpr_LessEqual(String urlExpr, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urlExpr", ConditionKey.CK_LESS_EQUAL, urlExpr);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionCF.java
deleted file mode 100644
index bd322bc12280acf882d68a2e8ff6d728f0a25259..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionCF.java
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.CrawlingSessionCF;
-import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsCrawlingSessionCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<CrawlingSessionCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<CrawlingSessionCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        CrawlingSessionCF mustFilter = new CrawlingSessionCF();
-        CrawlingSessionCF shouldFilter = new CrawlingSessionCF();
-        CrawlingSessionCF mustNotFilter = new CrawlingSessionCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<CrawlingSessionCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<CrawlingSessionCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        CrawlingSessionCF andFilter = new CrawlingSessionCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<CrawlingSessionCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<CrawlingSessionCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        CrawlingSessionCF orFilter = new CrawlingSessionCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<CrawlingSessionCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<CrawlingSessionCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        CrawlingSessionCF notFilter = new CrawlingSessionCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<CrawlingSessionCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<CrawlingSessionCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        CrawlingSessionCQ query = new CrawlingSessionCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_NotEqual(Long expiredTime) {
-        setExpiredTime_NotEqual(expiredTime, null, null);
-    }
-
-    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExpiredTime_Equal(expiredTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExpiredTime_Equal(Long expiredTime) {
-        setExpiredTime_Term(expiredTime, null);
-    }
-
-    public void setExpiredTime_Equal(Long expiredTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExpiredTime_Term(expiredTime, opLambda);
-    }
-
-    public void setExpiredTime_Term(Long expiredTime) {
-        setExpiredTime_Term(expiredTime, null);
-    }
-
-    public void setExpiredTime_Term(Long expiredTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("expiredTime", expiredTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_Terms(Collection<Long> expiredTimeList) {
-        setExpiredTime_Terms(expiredTimeList, null);
-    }
-
-    public void setExpiredTime_Terms(Collection<Long> expiredTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("expiredTime", expiredTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_InScope(Collection<Long> expiredTimeList) {
-        setExpiredTime_Terms(expiredTimeList, null);
-    }
-
-    public void setExpiredTime_InScope(Collection<Long> expiredTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExpiredTime_Terms(expiredTimeList, opLambda);
-    }
-
-    public void setExpiredTime_Exists() {
-        setExpiredTime_Exists(null);
-    }
-
-    public void setExpiredTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("expiredTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_Missing() {
-        setExpiredTime_Missing(null);
-    }
-
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("expiredTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_GreaterThan(Long expiredTime) {
-        setExpiredTime_GreaterThan(expiredTime, null);
-    }
-
-    public void setExpiredTime_GreaterThan(Long expiredTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("expiredTime", ConditionKey.CK_GREATER_THAN, expiredTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_LessThan(Long expiredTime) {
-        setExpiredTime_LessThan(expiredTime, null);
-    }
-
-    public void setExpiredTime_LessThan(Long expiredTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("expiredTime", ConditionKey.CK_LESS_THAN, expiredTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_GreaterEqual(Long expiredTime) {
-        setExpiredTime_GreaterEqual(expiredTime, null);
-    }
-
-    public void setExpiredTime_GreaterEqual(Long expiredTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("expiredTime", ConditionKey.CK_GREATER_EQUAL, expiredTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExpiredTime_LessEqual(Long expiredTime) {
-        setExpiredTime_LessEqual(expiredTime, null);
-    }
-
-    public void setExpiredTime_LessEqual(Long expiredTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("expiredTime", ConditionKey.CK_LESS_EQUAL, expiredTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_NotEqual(String sessionId) {
-        setSessionId_NotEqual(sessionId, null, null);
-    }
-
-    public void setSessionId_NotEqual(String sessionId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSessionId_Equal(sessionId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSessionId_Equal(String sessionId) {
-        setSessionId_Term(sessionId, null);
-    }
-
-    public void setSessionId_Equal(String sessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSessionId_Term(sessionId, opLambda);
-    }
-
-    public void setSessionId_Term(String sessionId) {
-        setSessionId_Term(sessionId, null);
-    }
-
-    public void setSessionId_Term(String sessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sessionId", sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_Terms(Collection<String> sessionIdList) {
-        setSessionId_Terms(sessionIdList, null);
-    }
-
-    public void setSessionId_Terms(Collection<String> sessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sessionId", sessionIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_InScope(Collection<String> sessionIdList) {
-        setSessionId_Terms(sessionIdList, null);
-    }
-
-    public void setSessionId_InScope(Collection<String> sessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSessionId_Terms(sessionIdList, opLambda);
-    }
-
-    public void setSessionId_Prefix(String sessionId) {
-        setSessionId_Prefix(sessionId, null);
-    }
-
-    public void setSessionId_Prefix(String sessionId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("sessionId", sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_Exists() {
-        setSessionId_Exists(null);
-    }
-
-    public void setSessionId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_Missing() {
-        setSessionId_Missing(null);
-    }
-
-    public void setSessionId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_GreaterThan(String sessionId) {
-        setSessionId_GreaterThan(sessionId, null);
-    }
-
-    public void setSessionId_GreaterThan(String sessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sessionId", ConditionKey.CK_GREATER_THAN, sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_LessThan(String sessionId) {
-        setSessionId_LessThan(sessionId, null);
-    }
-
-    public void setSessionId_LessThan(String sessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sessionId", ConditionKey.CK_LESS_THAN, sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_GreaterEqual(String sessionId) {
-        setSessionId_GreaterEqual(sessionId, null);
-    }
-
-    public void setSessionId_GreaterEqual(String sessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sessionId", ConditionKey.CK_GREATER_EQUAL, sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSessionId_LessEqual(String sessionId) {
-        setSessionId_LessEqual(sessionId, null);
-    }
-
-    public void setSessionId_LessEqual(String sessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sessionId", ConditionKey.CK_LESS_EQUAL, sessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionInfoCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionInfoCF.java
deleted file mode 100644
index e8816b9ba883c1c00831a7ccc1bd2a1c2b67d551..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsCrawlingSessionInfoCF.java
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.CrawlingSessionInfoCF;
-import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionInfoCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsCrawlingSessionInfoCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<CrawlingSessionInfoCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<CrawlingSessionInfoCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        CrawlingSessionInfoCF mustFilter = new CrawlingSessionInfoCF();
-        CrawlingSessionInfoCF shouldFilter = new CrawlingSessionInfoCF();
-        CrawlingSessionInfoCF mustNotFilter = new CrawlingSessionInfoCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<CrawlingSessionInfoCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<CrawlingSessionInfoCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        CrawlingSessionInfoCF andFilter = new CrawlingSessionInfoCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<CrawlingSessionInfoCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<CrawlingSessionInfoCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        CrawlingSessionInfoCF orFilter = new CrawlingSessionInfoCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<CrawlingSessionInfoCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<CrawlingSessionInfoCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        CrawlingSessionInfoCF notFilter = new CrawlingSessionInfoCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<CrawlingSessionInfoCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<CrawlingSessionInfoCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        CrawlingSessionInfoCQ query = new CrawlingSessionInfoCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCrawlingSessionId_NotEqual(String crawlingSessionId) {
-        setCrawlingSessionId_NotEqual(crawlingSessionId, null, null);
-    }
-
-    public void setCrawlingSessionId_NotEqual(String crawlingSessionId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCrawlingSessionId_Equal(crawlingSessionId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCrawlingSessionId_Equal(String crawlingSessionId) {
-        setCrawlingSessionId_Term(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_Equal(String crawlingSessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCrawlingSessionId_Term(crawlingSessionId, opLambda);
-    }
-
-    public void setCrawlingSessionId_Term(String crawlingSessionId) {
-        setCrawlingSessionId_Term(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_Term(String crawlingSessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("crawlingSessionId", crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_Terms(Collection<String> crawlingSessionIdList) {
-        setCrawlingSessionId_Terms(crawlingSessionIdList, null);
-    }
-
-    public void setCrawlingSessionId_Terms(Collection<String> crawlingSessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("crawlingSessionId", crawlingSessionIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_InScope(Collection<String> crawlingSessionIdList) {
-        setCrawlingSessionId_Terms(crawlingSessionIdList, null);
-    }
-
-    public void setCrawlingSessionId_InScope(Collection<String> crawlingSessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCrawlingSessionId_Terms(crawlingSessionIdList, opLambda);
-    }
-
-    public void setCrawlingSessionId_Prefix(String crawlingSessionId) {
-        setCrawlingSessionId_Prefix(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_Prefix(String crawlingSessionId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("crawlingSessionId", crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_Exists() {
-        setCrawlingSessionId_Exists(null);
-    }
-
-    public void setCrawlingSessionId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("crawlingSessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_Missing() {
-        setCrawlingSessionId_Missing(null);
-    }
-
-    public void setCrawlingSessionId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("crawlingSessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_GreaterThan(String crawlingSessionId) {
-        setCrawlingSessionId_GreaterThan(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_GreaterThan(String crawlingSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawlingSessionId", ConditionKey.CK_GREATER_THAN, crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_LessThan(String crawlingSessionId) {
-        setCrawlingSessionId_LessThan(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_LessThan(String crawlingSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawlingSessionId", ConditionKey.CK_LESS_THAN, crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_GreaterEqual(String crawlingSessionId) {
-        setCrawlingSessionId_GreaterEqual(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_GreaterEqual(String crawlingSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawlingSessionId", ConditionKey.CK_GREATER_EQUAL, crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawlingSessionId_LessEqual(String crawlingSessionId) {
-        setCrawlingSessionId_LessEqual(crawlingSessionId, null);
-    }
-
-    public void setCrawlingSessionId_LessEqual(String crawlingSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawlingSessionId", ConditionKey.CK_LESS_EQUAL, crawlingSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_NotEqual(String key) {
-        setKey_NotEqual(key, null, null);
-    }
-
-    public void setKey_NotEqual(String key, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setKey_Equal(key, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setKey_Equal(String key) {
-        setKey_Term(key, null);
-    }
-
-    public void setKey_Equal(String key, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setKey_Term(key, opLambda);
-    }
-
-    public void setKey_Term(String key) {
-        setKey_Term(key, null);
-    }
-
-    public void setKey_Term(String key, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("key", key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_Terms(Collection<String> keyList) {
-        setKey_Terms(keyList, null);
-    }
-
-    public void setKey_Terms(Collection<String> keyList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("key", keyList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_InScope(Collection<String> keyList) {
-        setKey_Terms(keyList, null);
-    }
-
-    public void setKey_InScope(Collection<String> keyList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setKey_Terms(keyList, opLambda);
-    }
-
-    public void setKey_Prefix(String key) {
-        setKey_Prefix(key, null);
-    }
-
-    public void setKey_Prefix(String key, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("key", key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_Exists() {
-        setKey_Exists(null);
-    }
-
-    public void setKey_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("key");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_Missing() {
-        setKey_Missing(null);
-    }
-
-    public void setKey_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("key");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_GreaterThan(String key) {
-        setKey_GreaterThan(key, null);
-    }
-
-    public void setKey_GreaterThan(String key, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("key", ConditionKey.CK_GREATER_THAN, key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_LessThan(String key) {
-        setKey_LessThan(key, null);
-    }
-
-    public void setKey_LessThan(String key, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("key", ConditionKey.CK_LESS_THAN, key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_GreaterEqual(String key) {
-        setKey_GreaterEqual(key, null);
-    }
-
-    public void setKey_GreaterEqual(String key, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("key", ConditionKey.CK_GREATER_EQUAL, key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setKey_LessEqual(String key) {
-        setKey_LessEqual(key, null);
-    }
-
-    public void setKey_LessEqual(String key, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("key", ConditionKey.CK_LESS_EQUAL, key);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_NotEqual(String value) {
-        setValue_NotEqual(value, null, null);
-    }
-
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setValue_Equal(value, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setValue_Equal(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Equal(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setValue_Term(value, opLambda);
-    }
-
-    public void setValue_Term(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Term(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Terms(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_Terms(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("value", valueList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_InScope(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_InScope(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setValue_Terms(valueList, opLambda);
-    }
-
-    public void setValue_Prefix(String value) {
-        setValue_Prefix(value, null);
-    }
-
-    public void setValue_Prefix(String value, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Exists() {
-        setValue_Exists(null);
-    }
-
-    public void setValue_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Missing() {
-        setValue_Missing(null);
-    }
-
-    public void setValue_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterThan(String value) {
-        setValue_GreaterThan(value, null);
-    }
-
-    public void setValue_GreaterThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessThan(String value) {
-        setValue_LessThan(value, null);
-    }
-
-    public void setValue_LessThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterEqual(String value) {
-        setValue_GreaterEqual(value, null);
-    }
-
-    public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessEqual(String value) {
-        setValue_LessEqual(value, null);
-    }
-
-    public void setValue_LessEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigCF.java
deleted file mode 100644
index b29708f7f4cf3280daabc61086852d6c39b527c0..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigCF.java
+++ /dev/null
@@ -1,1591 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigCF;
-import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsDataConfigCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<DataConfigCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<DataConfigCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        DataConfigCF mustFilter = new DataConfigCF();
-        DataConfigCF shouldFilter = new DataConfigCF();
-        DataConfigCF mustNotFilter = new DataConfigCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<DataConfigCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<DataConfigCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        DataConfigCF andFilter = new DataConfigCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<DataConfigCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<DataConfigCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        DataConfigCF orFilter = new DataConfigCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<DataConfigCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<DataConfigCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        DataConfigCF notFilter = new DataConfigCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        DataConfigCQ query = new DataConfigCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAvailable_NotEqual(Boolean available) {
-        setAvailable_NotEqual(available, null, null);
-    }
-
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAvailable_Equal(available, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAvailable_Equal(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Equal(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAvailable_Term(available, opLambda);
-    }
-
-    public void setAvailable_Term(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Term(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("available", available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("available", availableList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAvailable_Terms(availableList, opLambda);
-    }
-
-    public void setAvailable_Exists() {
-        setAvailable_Exists(null);
-    }
-
-    public void setAvailable_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Missing() {
-        setAvailable_Missing(null);
-    }
-
-    public void setAvailable_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterThan(Boolean available) {
-        setAvailable_GreaterThan(available, null);
-    }
-
-    public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessThan(Boolean available) {
-        setAvailable_LessThan(available, null);
-    }
-
-    public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available) {
-        setAvailable_GreaterEqual(available, null);
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessEqual(Boolean available) {
-        setAvailable_LessEqual(available, null);
-    }
-
-    public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_NotEqual(Float boost) {
-        setBoost_NotEqual(boost, null, null);
-    }
-
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoost_Equal(boost, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoost_Equal(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Equal(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoost_Term(boost, opLambda);
-    }
-
-    public void setBoost_Term(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Term(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boost", boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boost", boostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoost_Terms(boostList, opLambda);
-    }
-
-    public void setBoost_Exists() {
-        setBoost_Exists(null);
-    }
-
-    public void setBoost_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Missing() {
-        setBoost_Missing(null);
-    }
-
-    public void setBoost_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterThan(Float boost) {
-        setBoost_GreaterThan(boost, null);
-    }
-
-    public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessThan(Float boost) {
-        setBoost_LessThan(boost, null);
-    }
-
-    public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterEqual(Float boost) {
-        setBoost_GreaterEqual(boost, null);
-    }
-
-    public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessEqual(Float boost) {
-        setBoost_LessEqual(boost, null);
-    }
-
-    public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_NotEqual(String handlerName) {
-        setHandlerName_NotEqual(handlerName, null, null);
-    }
-
-    public void setHandlerName_NotEqual(String handlerName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHandlerName_Equal(handlerName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHandlerName_Equal(String handlerName) {
-        setHandlerName_Term(handlerName, null);
-    }
-
-    public void setHandlerName_Equal(String handlerName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHandlerName_Term(handlerName, opLambda);
-    }
-
-    public void setHandlerName_Term(String handlerName) {
-        setHandlerName_Term(handlerName, null);
-    }
-
-    public void setHandlerName_Term(String handlerName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("handlerName", handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_Terms(Collection<String> handlerNameList) {
-        setHandlerName_Terms(handlerNameList, null);
-    }
-
-    public void setHandlerName_Terms(Collection<String> handlerNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("handlerName", handlerNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_InScope(Collection<String> handlerNameList) {
-        setHandlerName_Terms(handlerNameList, null);
-    }
-
-    public void setHandlerName_InScope(Collection<String> handlerNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHandlerName_Terms(handlerNameList, opLambda);
-    }
-
-    public void setHandlerName_Prefix(String handlerName) {
-        setHandlerName_Prefix(handlerName, null);
-    }
-
-    public void setHandlerName_Prefix(String handlerName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("handlerName", handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_Exists() {
-        setHandlerName_Exists(null);
-    }
-
-    public void setHandlerName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("handlerName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_Missing() {
-        setHandlerName_Missing(null);
-    }
-
-    public void setHandlerName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("handlerName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_GreaterThan(String handlerName) {
-        setHandlerName_GreaterThan(handlerName, null);
-    }
-
-    public void setHandlerName_GreaterThan(String handlerName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerName", ConditionKey.CK_GREATER_THAN, handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_LessThan(String handlerName) {
-        setHandlerName_LessThan(handlerName, null);
-    }
-
-    public void setHandlerName_LessThan(String handlerName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerName", ConditionKey.CK_LESS_THAN, handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_GreaterEqual(String handlerName) {
-        setHandlerName_GreaterEqual(handlerName, null);
-    }
-
-    public void setHandlerName_GreaterEqual(String handlerName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerName", ConditionKey.CK_GREATER_EQUAL, handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerName_LessEqual(String handlerName) {
-        setHandlerName_LessEqual(handlerName, null);
-    }
-
-    public void setHandlerName_LessEqual(String handlerName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerName", ConditionKey.CK_LESS_EQUAL, handlerName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_NotEqual(String handlerParameter) {
-        setHandlerParameter_NotEqual(handlerParameter, null, null);
-    }
-
-    public void setHandlerParameter_NotEqual(String handlerParameter, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHandlerParameter_Equal(handlerParameter, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHandlerParameter_Equal(String handlerParameter) {
-        setHandlerParameter_Term(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_Equal(String handlerParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHandlerParameter_Term(handlerParameter, opLambda);
-    }
-
-    public void setHandlerParameter_Term(String handlerParameter) {
-        setHandlerParameter_Term(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_Term(String handlerParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("handlerParameter", handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_Terms(Collection<String> handlerParameterList) {
-        setHandlerParameter_Terms(handlerParameterList, null);
-    }
-
-    public void setHandlerParameter_Terms(Collection<String> handlerParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("handlerParameter", handlerParameterList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_InScope(Collection<String> handlerParameterList) {
-        setHandlerParameter_Terms(handlerParameterList, null);
-    }
-
-    public void setHandlerParameter_InScope(Collection<String> handlerParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHandlerParameter_Terms(handlerParameterList, opLambda);
-    }
-
-    public void setHandlerParameter_Prefix(String handlerParameter) {
-        setHandlerParameter_Prefix(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_Prefix(String handlerParameter, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("handlerParameter", handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_Exists() {
-        setHandlerParameter_Exists(null);
-    }
-
-    public void setHandlerParameter_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("handlerParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_Missing() {
-        setHandlerParameter_Missing(null);
-    }
-
-    public void setHandlerParameter_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("handlerParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_GreaterThan(String handlerParameter) {
-        setHandlerParameter_GreaterThan(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_GreaterThan(String handlerParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerParameter", ConditionKey.CK_GREATER_THAN, handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_LessThan(String handlerParameter) {
-        setHandlerParameter_LessThan(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_LessThan(String handlerParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerParameter", ConditionKey.CK_LESS_THAN, handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_GreaterEqual(String handlerParameter) {
-        setHandlerParameter_GreaterEqual(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_GreaterEqual(String handlerParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerParameter", ConditionKey.CK_GREATER_EQUAL, handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerParameter_LessEqual(String handlerParameter) {
-        setHandlerParameter_LessEqual(handlerParameter, null);
-    }
-
-    public void setHandlerParameter_LessEqual(String handlerParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerParameter", ConditionKey.CK_LESS_EQUAL, handlerParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_NotEqual(String handlerScript) {
-        setHandlerScript_NotEqual(handlerScript, null, null);
-    }
-
-    public void setHandlerScript_NotEqual(String handlerScript, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHandlerScript_Equal(handlerScript, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHandlerScript_Equal(String handlerScript) {
-        setHandlerScript_Term(handlerScript, null);
-    }
-
-    public void setHandlerScript_Equal(String handlerScript, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHandlerScript_Term(handlerScript, opLambda);
-    }
-
-    public void setHandlerScript_Term(String handlerScript) {
-        setHandlerScript_Term(handlerScript, null);
-    }
-
-    public void setHandlerScript_Term(String handlerScript, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("handlerScript", handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_Terms(Collection<String> handlerScriptList) {
-        setHandlerScript_Terms(handlerScriptList, null);
-    }
-
-    public void setHandlerScript_Terms(Collection<String> handlerScriptList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("handlerScript", handlerScriptList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_InScope(Collection<String> handlerScriptList) {
-        setHandlerScript_Terms(handlerScriptList, null);
-    }
-
-    public void setHandlerScript_InScope(Collection<String> handlerScriptList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHandlerScript_Terms(handlerScriptList, opLambda);
-    }
-
-    public void setHandlerScript_Prefix(String handlerScript) {
-        setHandlerScript_Prefix(handlerScript, null);
-    }
-
-    public void setHandlerScript_Prefix(String handlerScript, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("handlerScript", handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_Exists() {
-        setHandlerScript_Exists(null);
-    }
-
-    public void setHandlerScript_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("handlerScript");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_Missing() {
-        setHandlerScript_Missing(null);
-    }
-
-    public void setHandlerScript_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("handlerScript");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_GreaterThan(String handlerScript) {
-        setHandlerScript_GreaterThan(handlerScript, null);
-    }
-
-    public void setHandlerScript_GreaterThan(String handlerScript, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerScript", ConditionKey.CK_GREATER_THAN, handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_LessThan(String handlerScript) {
-        setHandlerScript_LessThan(handlerScript, null);
-    }
-
-    public void setHandlerScript_LessThan(String handlerScript, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerScript", ConditionKey.CK_LESS_THAN, handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_GreaterEqual(String handlerScript) {
-        setHandlerScript_GreaterEqual(handlerScript, null);
-    }
-
-    public void setHandlerScript_GreaterEqual(String handlerScript, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerScript", ConditionKey.CK_GREATER_EQUAL, handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHandlerScript_LessEqual(String handlerScript) {
-        setHandlerScript_LessEqual(handlerScript, null);
-    }
-
-    public void setHandlerScript_LessEqual(String handlerScript, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("handlerScript", ConditionKey.CK_LESS_EQUAL, handlerScript);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToLabelCF.java
deleted file mode 100644
index 6051827c3b5283a6df6b5553610228e34fa82ba8..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToLabelCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigToLabelCF;
-import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsDataConfigToLabelCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<DataConfigToLabelCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<DataConfigToLabelCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        DataConfigToLabelCF mustFilter = new DataConfigToLabelCF();
-        DataConfigToLabelCF shouldFilter = new DataConfigToLabelCF();
-        DataConfigToLabelCF mustNotFilter = new DataConfigToLabelCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<DataConfigToLabelCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<DataConfigToLabelCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        DataConfigToLabelCF andFilter = new DataConfigToLabelCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<DataConfigToLabelCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<DataConfigToLabelCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        DataConfigToLabelCF orFilter = new DataConfigToLabelCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<DataConfigToLabelCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<DataConfigToLabelCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        DataConfigToLabelCF notFilter = new DataConfigToLabelCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigToLabelCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigToLabelCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        DataConfigToLabelCQ query = new DataConfigToLabelCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setDataConfigId_NotEqual(String dataConfigId) {
-        setDataConfigId_NotEqual(dataConfigId, null, null);
-    }
-
-    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setDataConfigId_Equal(dataConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setDataConfigId_Equal(String dataConfigId) {
-        setDataConfigId_Term(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Equal(String dataConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setDataConfigId_Term(dataConfigId, opLambda);
-    }
-
-    public void setDataConfigId_Term(String dataConfigId) {
-        setDataConfigId_Term(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Term(String dataConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("dataConfigId", dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
-        setDataConfigId_Terms(dataConfigIdList, null);
-    }
-
-    public void setDataConfigId_Terms(Collection<String> dataConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("dataConfigId", dataConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_InScope(Collection<String> dataConfigIdList) {
-        setDataConfigId_Terms(dataConfigIdList, null);
-    }
-
-    public void setDataConfigId_InScope(Collection<String> dataConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setDataConfigId_Terms(dataConfigIdList, opLambda);
-    }
-
-    public void setDataConfigId_Prefix(String dataConfigId) {
-        setDataConfigId_Prefix(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Prefix(String dataConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("dataConfigId", dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Exists() {
-        setDataConfigId_Exists(null);
-    }
-
-    public void setDataConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("dataConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Missing() {
-        setDataConfigId_Missing(null);
-    }
-
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("dataConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_GreaterThan(String dataConfigId) {
-        setDataConfigId_GreaterThan(dataConfigId, null);
-    }
-
-    public void setDataConfigId_GreaterThan(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_GREATER_THAN, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_LessThan(String dataConfigId) {
-        setDataConfigId_LessThan(dataConfigId, null);
-    }
-
-    public void setDataConfigId_LessThan(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_LESS_THAN, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_GreaterEqual(String dataConfigId) {
-        setDataConfigId_GreaterEqual(dataConfigId, null);
-    }
-
-    public void setDataConfigId_GreaterEqual(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_GREATER_EQUAL, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_LessEqual(String dataConfigId) {
-        setDataConfigId_LessEqual(dataConfigId, null);
-    }
-
-    public void setDataConfigId_LessEqual(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_LESS_EQUAL, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId) {
-        setLabelTypeId_NotEqual(labelTypeId, null, null);
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setLabelTypeId_Equal(labelTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("labelTypeId", labelTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setLabelTypeId_Terms(labelTypeIdList, opLambda);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId) {
-        setLabelTypeId_Prefix(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Exists() {
-        setLabelTypeId_Exists(null);
-    }
-
-    public void setLabelTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Missing() {
-        setLabelTypeId_Missing(null);
-    }
-
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId) {
-        setLabelTypeId_GreaterThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId) {
-        setLabelTypeId_LessThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId) {
-        setLabelTypeId_GreaterEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId) {
-        setLabelTypeId_LessEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToRoleCF.java
deleted file mode 100644
index dc6cec2722af56705c757c3da205216f6acd91ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsDataConfigToRoleCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigToRoleCF;
-import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsDataConfigToRoleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<DataConfigToRoleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<DataConfigToRoleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        DataConfigToRoleCF mustFilter = new DataConfigToRoleCF();
-        DataConfigToRoleCF shouldFilter = new DataConfigToRoleCF();
-        DataConfigToRoleCF mustNotFilter = new DataConfigToRoleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<DataConfigToRoleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<DataConfigToRoleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        DataConfigToRoleCF andFilter = new DataConfigToRoleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<DataConfigToRoleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<DataConfigToRoleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        DataConfigToRoleCF orFilter = new DataConfigToRoleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<DataConfigToRoleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<DataConfigToRoleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        DataConfigToRoleCF notFilter = new DataConfigToRoleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigToRoleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<DataConfigToRoleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        DataConfigToRoleCQ query = new DataConfigToRoleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setDataConfigId_NotEqual(String dataConfigId) {
-        setDataConfigId_NotEqual(dataConfigId, null, null);
-    }
-
-    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setDataConfigId_Equal(dataConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setDataConfigId_Equal(String dataConfigId) {
-        setDataConfigId_Term(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Equal(String dataConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setDataConfigId_Term(dataConfigId, opLambda);
-    }
-
-    public void setDataConfigId_Term(String dataConfigId) {
-        setDataConfigId_Term(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Term(String dataConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("dataConfigId", dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
-        setDataConfigId_Terms(dataConfigIdList, null);
-    }
-
-    public void setDataConfigId_Terms(Collection<String> dataConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("dataConfigId", dataConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_InScope(Collection<String> dataConfigIdList) {
-        setDataConfigId_Terms(dataConfigIdList, null);
-    }
-
-    public void setDataConfigId_InScope(Collection<String> dataConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setDataConfigId_Terms(dataConfigIdList, opLambda);
-    }
-
-    public void setDataConfigId_Prefix(String dataConfigId) {
-        setDataConfigId_Prefix(dataConfigId, null);
-    }
-
-    public void setDataConfigId_Prefix(String dataConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("dataConfigId", dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Exists() {
-        setDataConfigId_Exists(null);
-    }
-
-    public void setDataConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("dataConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_Missing() {
-        setDataConfigId_Missing(null);
-    }
-
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("dataConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_GreaterThan(String dataConfigId) {
-        setDataConfigId_GreaterThan(dataConfigId, null);
-    }
-
-    public void setDataConfigId_GreaterThan(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_GREATER_THAN, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_LessThan(String dataConfigId) {
-        setDataConfigId_LessThan(dataConfigId, null);
-    }
-
-    public void setDataConfigId_LessThan(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_LESS_THAN, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_GreaterEqual(String dataConfigId) {
-        setDataConfigId_GreaterEqual(dataConfigId, null);
-    }
-
-    public void setDataConfigId_GreaterEqual(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_GREATER_EQUAL, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDataConfigId_LessEqual(String dataConfigId) {
-        setDataConfigId_LessEqual(dataConfigId, null);
-    }
-
-    public void setDataConfigId_LessEqual(String dataConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("dataConfigId", ConditionKey.CK_LESS_EQUAL, dataConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId) {
-        setRoleTypeId_NotEqual(roleTypeId, null, null);
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRoleTypeId_Equal(roleTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("roleTypeId", roleTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRoleTypeId_Terms(roleTypeIdList, opLambda);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId) {
-        setRoleTypeId_Prefix(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Exists() {
-        setRoleTypeId_Exists(null);
-    }
-
-    public void setRoleTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Missing() {
-        setRoleTypeId_Missing(null);
-    }
-
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId) {
-        setRoleTypeId_GreaterThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId) {
-        setRoleTypeId_LessThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId) {
-        setRoleTypeId_GreaterEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId) {
-        setRoleTypeId_LessEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFailureUrlCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFailureUrlCF.java
deleted file mode 100644
index b12823f563580f806df81f8cf0065724696077a7..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFailureUrlCF.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.FailureUrlCF;
-import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFailureUrlCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FailureUrlCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FailureUrlCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FailureUrlCF mustFilter = new FailureUrlCF();
-        FailureUrlCF shouldFilter = new FailureUrlCF();
-        FailureUrlCF mustNotFilter = new FailureUrlCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FailureUrlCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FailureUrlCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FailureUrlCF andFilter = new FailureUrlCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FailureUrlCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FailureUrlCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FailureUrlCF orFilter = new FailureUrlCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FailureUrlCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FailureUrlCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FailureUrlCF notFilter = new FailureUrlCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FailureUrlCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FailureUrlCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FailureUrlCQ query = new FailureUrlCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setConfigId_NotEqual(String configId) {
-        setConfigId_NotEqual(configId, null, null);
-    }
-
-    public void setConfigId_NotEqual(String configId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setConfigId_Equal(configId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setConfigId_Equal(String configId) {
-        setConfigId_Term(configId, null);
-    }
-
-    public void setConfigId_Equal(String configId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setConfigId_Term(configId, opLambda);
-    }
-
-    public void setConfigId_Term(String configId) {
-        setConfigId_Term(configId, null);
-    }
-
-    public void setConfigId_Term(String configId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("configId", configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_Terms(Collection<String> configIdList) {
-        setConfigId_Terms(configIdList, null);
-    }
-
-    public void setConfigId_Terms(Collection<String> configIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("configId", configIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_InScope(Collection<String> configIdList) {
-        setConfigId_Terms(configIdList, null);
-    }
-
-    public void setConfigId_InScope(Collection<String> configIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setConfigId_Terms(configIdList, opLambda);
-    }
-
-    public void setConfigId_Prefix(String configId) {
-        setConfigId_Prefix(configId, null);
-    }
-
-    public void setConfigId_Prefix(String configId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("configId", configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_Exists() {
-        setConfigId_Exists(null);
-    }
-
-    public void setConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("configId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_Missing() {
-        setConfigId_Missing(null);
-    }
-
-    public void setConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("configId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_GreaterThan(String configId) {
-        setConfigId_GreaterThan(configId, null);
-    }
-
-    public void setConfigId_GreaterThan(String configId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configId", ConditionKey.CK_GREATER_THAN, configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_LessThan(String configId) {
-        setConfigId_LessThan(configId, null);
-    }
-
-    public void setConfigId_LessThan(String configId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configId", ConditionKey.CK_LESS_THAN, configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_GreaterEqual(String configId) {
-        setConfigId_GreaterEqual(configId, null);
-    }
-
-    public void setConfigId_GreaterEqual(String configId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configId", ConditionKey.CK_GREATER_EQUAL, configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigId_LessEqual(String configId) {
-        setConfigId_LessEqual(configId, null);
-    }
-
-    public void setConfigId_LessEqual(String configId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configId", ConditionKey.CK_LESS_EQUAL, configId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_NotEqual(Integer errorCount) {
-        setErrorCount_NotEqual(errorCount, null, null);
-    }
-
-    public void setErrorCount_NotEqual(Integer errorCount, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setErrorCount_Equal(errorCount, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setErrorCount_Equal(Integer errorCount) {
-        setErrorCount_Term(errorCount, null);
-    }
-
-    public void setErrorCount_Equal(Integer errorCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setErrorCount_Term(errorCount, opLambda);
-    }
-
-    public void setErrorCount_Term(Integer errorCount) {
-        setErrorCount_Term(errorCount, null);
-    }
-
-    public void setErrorCount_Term(Integer errorCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("errorCount", errorCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_Terms(Collection<Integer> errorCountList) {
-        setErrorCount_Terms(errorCountList, null);
-    }
-
-    public void setErrorCount_Terms(Collection<Integer> errorCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("errorCount", errorCountList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_InScope(Collection<Integer> errorCountList) {
-        setErrorCount_Terms(errorCountList, null);
-    }
-
-    public void setErrorCount_InScope(Collection<Integer> errorCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setErrorCount_Terms(errorCountList, opLambda);
-    }
-
-    public void setErrorCount_Exists() {
-        setErrorCount_Exists(null);
-    }
-
-    public void setErrorCount_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("errorCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_Missing() {
-        setErrorCount_Missing(null);
-    }
-
-    public void setErrorCount_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("errorCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_GreaterThan(Integer errorCount) {
-        setErrorCount_GreaterThan(errorCount, null);
-    }
-
-    public void setErrorCount_GreaterThan(Integer errorCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorCount", ConditionKey.CK_GREATER_THAN, errorCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_LessThan(Integer errorCount) {
-        setErrorCount_LessThan(errorCount, null);
-    }
-
-    public void setErrorCount_LessThan(Integer errorCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorCount", ConditionKey.CK_LESS_THAN, errorCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_GreaterEqual(Integer errorCount) {
-        setErrorCount_GreaterEqual(errorCount, null);
-    }
-
-    public void setErrorCount_GreaterEqual(Integer errorCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorCount", ConditionKey.CK_GREATER_EQUAL, errorCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorCount_LessEqual(Integer errorCount) {
-        setErrorCount_LessEqual(errorCount, null);
-    }
-
-    public void setErrorCount_LessEqual(Integer errorCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorCount", ConditionKey.CK_LESS_EQUAL, errorCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_NotEqual(String errorLog) {
-        setErrorLog_NotEqual(errorLog, null, null);
-    }
-
-    public void setErrorLog_NotEqual(String errorLog, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setErrorLog_Equal(errorLog, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setErrorLog_Equal(String errorLog) {
-        setErrorLog_Term(errorLog, null);
-    }
-
-    public void setErrorLog_Equal(String errorLog, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setErrorLog_Term(errorLog, opLambda);
-    }
-
-    public void setErrorLog_Term(String errorLog) {
-        setErrorLog_Term(errorLog, null);
-    }
-
-    public void setErrorLog_Term(String errorLog, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("errorLog", errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_Terms(Collection<String> errorLogList) {
-        setErrorLog_Terms(errorLogList, null);
-    }
-
-    public void setErrorLog_Terms(Collection<String> errorLogList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("errorLog", errorLogList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_InScope(Collection<String> errorLogList) {
-        setErrorLog_Terms(errorLogList, null);
-    }
-
-    public void setErrorLog_InScope(Collection<String> errorLogList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setErrorLog_Terms(errorLogList, opLambda);
-    }
-
-    public void setErrorLog_Prefix(String errorLog) {
-        setErrorLog_Prefix(errorLog, null);
-    }
-
-    public void setErrorLog_Prefix(String errorLog, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("errorLog", errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_Exists() {
-        setErrorLog_Exists(null);
-    }
-
-    public void setErrorLog_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("errorLog");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_Missing() {
-        setErrorLog_Missing(null);
-    }
-
-    public void setErrorLog_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("errorLog");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_GreaterThan(String errorLog) {
-        setErrorLog_GreaterThan(errorLog, null);
-    }
-
-    public void setErrorLog_GreaterThan(String errorLog, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorLog", ConditionKey.CK_GREATER_THAN, errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_LessThan(String errorLog) {
-        setErrorLog_LessThan(errorLog, null);
-    }
-
-    public void setErrorLog_LessThan(String errorLog, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorLog", ConditionKey.CK_LESS_THAN, errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_GreaterEqual(String errorLog) {
-        setErrorLog_GreaterEqual(errorLog, null);
-    }
-
-    public void setErrorLog_GreaterEqual(String errorLog, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorLog", ConditionKey.CK_GREATER_EQUAL, errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorLog_LessEqual(String errorLog) {
-        setErrorLog_LessEqual(errorLog, null);
-    }
-
-    public void setErrorLog_LessEqual(String errorLog, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorLog", ConditionKey.CK_LESS_EQUAL, errorLog);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_NotEqual(String errorName) {
-        setErrorName_NotEqual(errorName, null, null);
-    }
-
-    public void setErrorName_NotEqual(String errorName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setErrorName_Equal(errorName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setErrorName_Equal(String errorName) {
-        setErrorName_Term(errorName, null);
-    }
-
-    public void setErrorName_Equal(String errorName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setErrorName_Term(errorName, opLambda);
-    }
-
-    public void setErrorName_Term(String errorName) {
-        setErrorName_Term(errorName, null);
-    }
-
-    public void setErrorName_Term(String errorName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("errorName", errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_Terms(Collection<String> errorNameList) {
-        setErrorName_Terms(errorNameList, null);
-    }
-
-    public void setErrorName_Terms(Collection<String> errorNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("errorName", errorNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_InScope(Collection<String> errorNameList) {
-        setErrorName_Terms(errorNameList, null);
-    }
-
-    public void setErrorName_InScope(Collection<String> errorNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setErrorName_Terms(errorNameList, opLambda);
-    }
-
-    public void setErrorName_Prefix(String errorName) {
-        setErrorName_Prefix(errorName, null);
-    }
-
-    public void setErrorName_Prefix(String errorName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("errorName", errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_Exists() {
-        setErrorName_Exists(null);
-    }
-
-    public void setErrorName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("errorName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_Missing() {
-        setErrorName_Missing(null);
-    }
-
-    public void setErrorName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("errorName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_GreaterThan(String errorName) {
-        setErrorName_GreaterThan(errorName, null);
-    }
-
-    public void setErrorName_GreaterThan(String errorName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorName", ConditionKey.CK_GREATER_THAN, errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_LessThan(String errorName) {
-        setErrorName_LessThan(errorName, null);
-    }
-
-    public void setErrorName_LessThan(String errorName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorName", ConditionKey.CK_LESS_THAN, errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_GreaterEqual(String errorName) {
-        setErrorName_GreaterEqual(errorName, null);
-    }
-
-    public void setErrorName_GreaterEqual(String errorName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorName", ConditionKey.CK_GREATER_EQUAL, errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setErrorName_LessEqual(String errorName) {
-        setErrorName_LessEqual(errorName, null);
-    }
-
-    public void setErrorName_LessEqual(String errorName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("errorName", ConditionKey.CK_LESS_EQUAL, errorName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_NotEqual(Long lastAccessTime) {
-        setLastAccessTime_NotEqual(lastAccessTime, null, null);
-    }
-
-    public void setLastAccessTime_NotEqual(Long lastAccessTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setLastAccessTime_Equal(lastAccessTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setLastAccessTime_Equal(Long lastAccessTime) {
-        setLastAccessTime_Term(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_Equal(Long lastAccessTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setLastAccessTime_Term(lastAccessTime, opLambda);
-    }
-
-    public void setLastAccessTime_Term(Long lastAccessTime) {
-        setLastAccessTime_Term(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_Term(Long lastAccessTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("lastAccessTime", lastAccessTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_Terms(Collection<Long> lastAccessTimeList) {
-        setLastAccessTime_Terms(lastAccessTimeList, null);
-    }
-
-    public void setLastAccessTime_Terms(Collection<Long> lastAccessTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("lastAccessTime", lastAccessTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_InScope(Collection<Long> lastAccessTimeList) {
-        setLastAccessTime_Terms(lastAccessTimeList, null);
-    }
-
-    public void setLastAccessTime_InScope(Collection<Long> lastAccessTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setLastAccessTime_Terms(lastAccessTimeList, opLambda);
-    }
-
-    public void setLastAccessTime_Exists() {
-        setLastAccessTime_Exists(null);
-    }
-
-    public void setLastAccessTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("lastAccessTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_Missing() {
-        setLastAccessTime_Missing(null);
-    }
-
-    public void setLastAccessTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("lastAccessTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_GreaterThan(Long lastAccessTime) {
-        setLastAccessTime_GreaterThan(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_GreaterThan(Long lastAccessTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("lastAccessTime", ConditionKey.CK_GREATER_THAN, lastAccessTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_LessThan(Long lastAccessTime) {
-        setLastAccessTime_LessThan(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_LessThan(Long lastAccessTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("lastAccessTime", ConditionKey.CK_LESS_THAN, lastAccessTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_GreaterEqual(Long lastAccessTime) {
-        setLastAccessTime_GreaterEqual(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_GreaterEqual(Long lastAccessTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("lastAccessTime", ConditionKey.CK_GREATER_EQUAL, lastAccessTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLastAccessTime_LessEqual(Long lastAccessTime) {
-        setLastAccessTime_LessEqual(lastAccessTime, null);
-    }
-
-    public void setLastAccessTime_LessEqual(Long lastAccessTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("lastAccessTime", ConditionKey.CK_LESS_EQUAL, lastAccessTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_NotEqual(String threadName) {
-        setThreadName_NotEqual(threadName, null, null);
-    }
-
-    public void setThreadName_NotEqual(String threadName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setThreadName_Equal(threadName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setThreadName_Equal(String threadName) {
-        setThreadName_Term(threadName, null);
-    }
-
-    public void setThreadName_Equal(String threadName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setThreadName_Term(threadName, opLambda);
-    }
-
-    public void setThreadName_Term(String threadName) {
-        setThreadName_Term(threadName, null);
-    }
-
-    public void setThreadName_Term(String threadName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("threadName", threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_Terms(Collection<String> threadNameList) {
-        setThreadName_Terms(threadNameList, null);
-    }
-
-    public void setThreadName_Terms(Collection<String> threadNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("threadName", threadNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_InScope(Collection<String> threadNameList) {
-        setThreadName_Terms(threadNameList, null);
-    }
-
-    public void setThreadName_InScope(Collection<String> threadNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setThreadName_Terms(threadNameList, opLambda);
-    }
-
-    public void setThreadName_Prefix(String threadName) {
-        setThreadName_Prefix(threadName, null);
-    }
-
-    public void setThreadName_Prefix(String threadName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("threadName", threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_Exists() {
-        setThreadName_Exists(null);
-    }
-
-    public void setThreadName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("threadName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_Missing() {
-        setThreadName_Missing(null);
-    }
-
-    public void setThreadName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("threadName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_GreaterThan(String threadName) {
-        setThreadName_GreaterThan(threadName, null);
-    }
-
-    public void setThreadName_GreaterThan(String threadName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("threadName", ConditionKey.CK_GREATER_THAN, threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_LessThan(String threadName) {
-        setThreadName_LessThan(threadName, null);
-    }
-
-    public void setThreadName_LessThan(String threadName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("threadName", ConditionKey.CK_LESS_THAN, threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_GreaterEqual(String threadName) {
-        setThreadName_GreaterEqual(threadName, null);
-    }
-
-    public void setThreadName_GreaterEqual(String threadName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("threadName", ConditionKey.CK_GREATER_EQUAL, threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setThreadName_LessEqual(String threadName) {
-        setThreadName_LessEqual(threadName, null);
-    }
-
-    public void setThreadName_LessEqual(String threadName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("threadName", ConditionKey.CK_LESS_EQUAL, threadName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_NotEqual(String url) {
-        setUrl_NotEqual(url, null, null);
-    }
-
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUrl_Equal(url, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUrl_Equal(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Equal(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUrl_Term(url, opLambda);
-    }
-
-    public void setUrl_Term(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Term(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Terms(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_Terms(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("url", urlList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_InScope(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_InScope(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUrl_Terms(urlList, opLambda);
-    }
-
-    public void setUrl_Prefix(String url) {
-        setUrl_Prefix(url, null);
-    }
-
-    public void setUrl_Prefix(String url, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Exists() {
-        setUrl_Exists(null);
-    }
-
-    public void setUrl_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Missing() {
-        setUrl_Missing(null);
-    }
-
-    public void setUrl_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterThan(String url) {
-        setUrl_GreaterThan(url, null);
-    }
-
-    public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessThan(String url) {
-        setUrl_LessThan(url, null);
-    }
-
-    public void setUrl_LessThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterEqual(String url) {
-        setUrl_GreaterEqual(url, null);
-    }
-
-    public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessEqual(String url) {
-        setUrl_LessEqual(url, null);
-    }
-
-    public void setUrl_LessEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileAuthenticationCF.java
deleted file mode 100644
index 9f1297e515e485bd352e2db7b0c9c9d7c79af2e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileAuthenticationCF.java
+++ /dev/null
@@ -1,1613 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.FileAuthenticationCF;
-import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFileAuthenticationCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FileAuthenticationCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FileAuthenticationCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FileAuthenticationCF mustFilter = new FileAuthenticationCF();
-        FileAuthenticationCF shouldFilter = new FileAuthenticationCF();
-        FileAuthenticationCF mustNotFilter = new FileAuthenticationCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FileAuthenticationCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FileAuthenticationCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FileAuthenticationCF andFilter = new FileAuthenticationCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FileAuthenticationCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FileAuthenticationCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FileAuthenticationCF orFilter = new FileAuthenticationCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FileAuthenticationCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FileAuthenticationCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FileAuthenticationCF notFilter = new FileAuthenticationCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileAuthenticationCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileAuthenticationCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FileAuthenticationCQ query = new FileAuthenticationCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_NotEqual(String fileConfigId) {
-        setFileConfigId_NotEqual(fileConfigId, null, null);
-    }
-
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setFileConfigId_Equal(fileConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setFileConfigId_Term(fileConfigId, opLambda);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("fileConfigId", fileConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setFileConfigId_Terms(fileConfigIdList, opLambda);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId) {
-        setFileConfigId_Prefix(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Exists() {
-        setFileConfigId_Exists(null);
-    }
-
-    public void setFileConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Missing() {
-        setFileConfigId_Missing(null);
-    }
-
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId) {
-        setFileConfigId_GreaterThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId) {
-        setFileConfigId_LessThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId) {
-        setFileConfigId_GreaterEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId) {
-        setFileConfigId_LessEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_NotEqual(String hostname) {
-        setHostname_NotEqual(hostname, null, null);
-    }
-
-    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHostname_Equal(hostname, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHostname_Equal(String hostname) {
-        setHostname_Term(hostname, null);
-    }
-
-    public void setHostname_Equal(String hostname, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHostname_Term(hostname, opLambda);
-    }
-
-    public void setHostname_Term(String hostname) {
-        setHostname_Term(hostname, null);
-    }
-
-    public void setHostname_Term(String hostname, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("hostname", hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Terms(Collection<String> hostnameList) {
-        setHostname_Terms(hostnameList, null);
-    }
-
-    public void setHostname_Terms(Collection<String> hostnameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("hostname", hostnameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_InScope(Collection<String> hostnameList) {
-        setHostname_Terms(hostnameList, null);
-    }
-
-    public void setHostname_InScope(Collection<String> hostnameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHostname_Terms(hostnameList, opLambda);
-    }
-
-    public void setHostname_Prefix(String hostname) {
-        setHostname_Prefix(hostname, null);
-    }
-
-    public void setHostname_Prefix(String hostname, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("hostname", hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Exists() {
-        setHostname_Exists(null);
-    }
-
-    public void setHostname_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("hostname");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Missing() {
-        setHostname_Missing(null);
-    }
-
-    public void setHostname_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("hostname");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_GreaterThan(String hostname) {
-        setHostname_GreaterThan(hostname, null);
-    }
-
-    public void setHostname_GreaterThan(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_GREATER_THAN, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_LessThan(String hostname) {
-        setHostname_LessThan(hostname, null);
-    }
-
-    public void setHostname_LessThan(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_LESS_THAN, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_GreaterEqual(String hostname) {
-        setHostname_GreaterEqual(hostname, null);
-    }
-
-    public void setHostname_GreaterEqual(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_GREATER_EQUAL, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_LessEqual(String hostname) {
-        setHostname_LessEqual(hostname, null);
-    }
-
-    public void setHostname_LessEqual(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_LESS_EQUAL, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_NotEqual(String parameters) {
-        setParameters_NotEqual(parameters, null, null);
-    }
-
-    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setParameters_Equal(parameters, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setParameters_Equal(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Equal(String parameters, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setParameters_Term(parameters, opLambda);
-    }
-
-    public void setParameters_Term(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Term(String parameters, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("parameters", parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Terms(Collection<String> parametersList) {
-        setParameters_Terms(parametersList, null);
-    }
-
-    public void setParameters_Terms(Collection<String> parametersList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("parameters", parametersList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_InScope(Collection<String> parametersList) {
-        setParameters_Terms(parametersList, null);
-    }
-
-    public void setParameters_InScope(Collection<String> parametersList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setParameters_Terms(parametersList, opLambda);
-    }
-
-    public void setParameters_Prefix(String parameters) {
-        setParameters_Prefix(parameters, null);
-    }
-
-    public void setParameters_Prefix(String parameters, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("parameters", parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Exists() {
-        setParameters_Exists(null);
-    }
-
-    public void setParameters_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("parameters");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Missing() {
-        setParameters_Missing(null);
-    }
-
-    public void setParameters_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("parameters");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_GreaterThan(String parameters) {
-        setParameters_GreaterThan(parameters, null);
-    }
-
-    public void setParameters_GreaterThan(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_GREATER_THAN, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_LessThan(String parameters) {
-        setParameters_LessThan(parameters, null);
-    }
-
-    public void setParameters_LessThan(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_LESS_THAN, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_GreaterEqual(String parameters) {
-        setParameters_GreaterEqual(parameters, null);
-    }
-
-    public void setParameters_GreaterEqual(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_GREATER_EQUAL, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_LessEqual(String parameters) {
-        setParameters_LessEqual(parameters, null);
-    }
-
-    public void setParameters_LessEqual(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_LESS_EQUAL, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_NotEqual(String password) {
-        setPassword_NotEqual(password, null, null);
-    }
-
-    public void setPassword_NotEqual(String password, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPassword_Equal(password, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPassword_Equal(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Equal(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPassword_Term(password, opLambda);
-    }
-
-    public void setPassword_Term(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Term(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("password", passwordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPassword_Terms(passwordList, opLambda);
-    }
-
-    public void setPassword_Prefix(String password) {
-        setPassword_Prefix(password, null);
-    }
-
-    public void setPassword_Prefix(String password, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Exists() {
-        setPassword_Exists(null);
-    }
-
-    public void setPassword_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Missing() {
-        setPassword_Missing(null);
-    }
-
-    public void setPassword_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterThan(String password) {
-        setPassword_GreaterThan(password, null);
-    }
-
-    public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessThan(String password) {
-        setPassword_LessThan(password, null);
-    }
-
-    public void setPassword_LessThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterEqual(String password) {
-        setPassword_GreaterEqual(password, null);
-    }
-
-    public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessEqual(String password) {
-        setPassword_LessEqual(password, null);
-    }
-
-    public void setPassword_LessEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_NotEqual(Integer port) {
-        setPort_NotEqual(port, null, null);
-    }
-
-    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPort_Equal(port, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPort_Equal(Integer port) {
-        setPort_Term(port, null);
-    }
-
-    public void setPort_Equal(Integer port, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPort_Term(port, opLambda);
-    }
-
-    public void setPort_Term(Integer port) {
-        setPort_Term(port, null);
-    }
-
-    public void setPort_Term(Integer port, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("port", port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_Terms(Collection<Integer> portList) {
-        setPort_Terms(portList, null);
-    }
-
-    public void setPort_Terms(Collection<Integer> portList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("port", portList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_InScope(Collection<Integer> portList) {
-        setPort_Terms(portList, null);
-    }
-
-    public void setPort_InScope(Collection<Integer> portList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPort_Terms(portList, opLambda);
-    }
-
-    public void setPort_Exists() {
-        setPort_Exists(null);
-    }
-
-    public void setPort_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("port");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_Missing() {
-        setPort_Missing(null);
-    }
-
-    public void setPort_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("port");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_GreaterThan(Integer port) {
-        setPort_GreaterThan(port, null);
-    }
-
-    public void setPort_GreaterThan(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_GREATER_THAN, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_LessThan(Integer port) {
-        setPort_LessThan(port, null);
-    }
-
-    public void setPort_LessThan(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_LESS_THAN, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_GreaterEqual(Integer port) {
-        setPort_GreaterEqual(port, null);
-    }
-
-    public void setPort_GreaterEqual(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_GREATER_EQUAL, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_LessEqual(Integer port) {
-        setPort_LessEqual(port, null);
-    }
-
-    public void setPort_LessEqual(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_LESS_EQUAL, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_NotEqual(String protocolScheme) {
-        setProtocolScheme_NotEqual(protocolScheme, null, null);
-    }
-
-    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setProtocolScheme_Equal(protocolScheme, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setProtocolScheme_Equal(String protocolScheme) {
-        setProtocolScheme_Term(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Equal(String protocolScheme, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setProtocolScheme_Term(protocolScheme, opLambda);
-    }
-
-    public void setProtocolScheme_Term(String protocolScheme) {
-        setProtocolScheme_Term(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Term(String protocolScheme, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("protocolScheme", protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
-        setProtocolScheme_Terms(protocolSchemeList, null);
-    }
-
-    public void setProtocolScheme_Terms(Collection<String> protocolSchemeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("protocolScheme", protocolSchemeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_InScope(Collection<String> protocolSchemeList) {
-        setProtocolScheme_Terms(protocolSchemeList, null);
-    }
-
-    public void setProtocolScheme_InScope(Collection<String> protocolSchemeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setProtocolScheme_Terms(protocolSchemeList, opLambda);
-    }
-
-    public void setProtocolScheme_Prefix(String protocolScheme) {
-        setProtocolScheme_Prefix(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Prefix(String protocolScheme, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("protocolScheme", protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Exists() {
-        setProtocolScheme_Exists(null);
-    }
-
-    public void setProtocolScheme_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("protocolScheme");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Missing() {
-        setProtocolScheme_Missing(null);
-    }
-
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("protocolScheme");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_GreaterThan(String protocolScheme) {
-        setProtocolScheme_GreaterThan(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_GreaterThan(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_GREATER_THAN, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_LessThan(String protocolScheme) {
-        setProtocolScheme_LessThan(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_LessThan(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_LESS_THAN, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_GreaterEqual(String protocolScheme) {
-        setProtocolScheme_GreaterEqual(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_GreaterEqual(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_GREATER_EQUAL, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_LessEqual(String protocolScheme) {
-        setProtocolScheme_LessEqual(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_LessEqual(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_LESS_EQUAL, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_NotEqual(String username) {
-        setUsername_NotEqual(username, null, null);
-    }
-
-    public void setUsername_NotEqual(String username, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUsername_Equal(username, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUsername_Equal(String username) {
-        setUsername_Term(username, null);
-    }
-
-    public void setUsername_Equal(String username, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUsername_Term(username, opLambda);
-    }
-
-    public void setUsername_Term(String username) {
-        setUsername_Term(username, null);
-    }
-
-    public void setUsername_Term(String username, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("username", username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Terms(Collection<String> usernameList) {
-        setUsername_Terms(usernameList, null);
-    }
-
-    public void setUsername_Terms(Collection<String> usernameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("username", usernameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_InScope(Collection<String> usernameList) {
-        setUsername_Terms(usernameList, null);
-    }
-
-    public void setUsername_InScope(Collection<String> usernameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUsername_Terms(usernameList, opLambda);
-    }
-
-    public void setUsername_Prefix(String username) {
-        setUsername_Prefix(username, null);
-    }
-
-    public void setUsername_Prefix(String username, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("username", username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Exists() {
-        setUsername_Exists(null);
-    }
-
-    public void setUsername_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("username");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Missing() {
-        setUsername_Missing(null);
-    }
-
-    public void setUsername_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("username");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_GreaterThan(String username) {
-        setUsername_GreaterThan(username, null);
-    }
-
-    public void setUsername_GreaterThan(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_GREATER_THAN, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_LessThan(String username) {
-        setUsername_LessThan(username, null);
-    }
-
-    public void setUsername_LessThan(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_LESS_THAN, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_GreaterEqual(String username) {
-        setUsername_GreaterEqual(username, null);
-    }
-
-    public void setUsername_GreaterEqual(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_GREATER_EQUAL, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_LessEqual(String username) {
-        setUsername_LessEqual(username, null);
-    }
-
-    public void setUsername_LessEqual(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_LESS_EQUAL, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigCF.java
deleted file mode 100644
index 931612d49355ff6233c84b35786f210ecadc8e70..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigCF.java
+++ /dev/null
@@ -1,2429 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigCF;
-import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFileConfigCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FileConfigCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FileConfigCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FileConfigCF mustFilter = new FileConfigCF();
-        FileConfigCF shouldFilter = new FileConfigCF();
-        FileConfigCF mustNotFilter = new FileConfigCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FileConfigCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FileConfigCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FileConfigCF andFilter = new FileConfigCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FileConfigCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FileConfigCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FileConfigCF orFilter = new FileConfigCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FileConfigCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FileConfigCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FileConfigCF notFilter = new FileConfigCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FileConfigCQ query = new FileConfigCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAvailable_NotEqual(Boolean available) {
-        setAvailable_NotEqual(available, null, null);
-    }
-
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAvailable_Equal(available, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAvailable_Equal(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Equal(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAvailable_Term(available, opLambda);
-    }
-
-    public void setAvailable_Term(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Term(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("available", available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("available", availableList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAvailable_Terms(availableList, opLambda);
-    }
-
-    public void setAvailable_Exists() {
-        setAvailable_Exists(null);
-    }
-
-    public void setAvailable_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Missing() {
-        setAvailable_Missing(null);
-    }
-
-    public void setAvailable_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterThan(Boolean available) {
-        setAvailable_GreaterThan(available, null);
-    }
-
-    public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessThan(Boolean available) {
-        setAvailable_LessThan(available, null);
-    }
-
-    public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available) {
-        setAvailable_GreaterEqual(available, null);
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessEqual(Boolean available) {
-        setAvailable_LessEqual(available, null);
-    }
-
-    public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_NotEqual(Float boost) {
-        setBoost_NotEqual(boost, null, null);
-    }
-
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoost_Equal(boost, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoost_Equal(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Equal(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoost_Term(boost, opLambda);
-    }
-
-    public void setBoost_Term(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Term(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boost", boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boost", boostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoost_Terms(boostList, opLambda);
-    }
-
-    public void setBoost_Exists() {
-        setBoost_Exists(null);
-    }
-
-    public void setBoost_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Missing() {
-        setBoost_Missing(null);
-    }
-
-    public void setBoost_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterThan(Float boost) {
-        setBoost_GreaterThan(boost, null);
-    }
-
-    public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessThan(Float boost) {
-        setBoost_LessThan(boost, null);
-    }
-
-    public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterEqual(Float boost) {
-        setBoost_GreaterEqual(boost, null);
-    }
-
-    public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessEqual(Float boost) {
-        setBoost_LessEqual(boost, null);
-    }
-
-    public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_NotEqual(String configParameter) {
-        setConfigParameter_NotEqual(configParameter, null, null);
-    }
-
-    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setConfigParameter_Equal(configParameter, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setConfigParameter_Equal(String configParameter) {
-        setConfigParameter_Term(configParameter, null);
-    }
-
-    public void setConfigParameter_Equal(String configParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setConfigParameter_Term(configParameter, opLambda);
-    }
-
-    public void setConfigParameter_Term(String configParameter) {
-        setConfigParameter_Term(configParameter, null);
-    }
-
-    public void setConfigParameter_Term(String configParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("configParameter", configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Terms(Collection<String> configParameterList) {
-        setConfigParameter_Terms(configParameterList, null);
-    }
-
-    public void setConfigParameter_Terms(Collection<String> configParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("configParameter", configParameterList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_InScope(Collection<String> configParameterList) {
-        setConfigParameter_Terms(configParameterList, null);
-    }
-
-    public void setConfigParameter_InScope(Collection<String> configParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setConfigParameter_Terms(configParameterList, opLambda);
-    }
-
-    public void setConfigParameter_Prefix(String configParameter) {
-        setConfigParameter_Prefix(configParameter, null);
-    }
-
-    public void setConfigParameter_Prefix(String configParameter, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("configParameter", configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Exists() {
-        setConfigParameter_Exists(null);
-    }
-
-    public void setConfigParameter_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("configParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Missing() {
-        setConfigParameter_Missing(null);
-    }
-
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("configParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_GreaterThan(String configParameter) {
-        setConfigParameter_GreaterThan(configParameter, null);
-    }
-
-    public void setConfigParameter_GreaterThan(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_GREATER_THAN, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_LessThan(String configParameter) {
-        setConfigParameter_LessThan(configParameter, null);
-    }
-
-    public void setConfigParameter_LessThan(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_LESS_THAN, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_GreaterEqual(String configParameter) {
-        setConfigParameter_GreaterEqual(configParameter, null);
-    }
-
-    public void setConfigParameter_GreaterEqual(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_GREATER_EQUAL, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_LessEqual(String configParameter) {
-        setConfigParameter_LessEqual(configParameter, null);
-    }
-
-    public void setConfigParameter_LessEqual(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_LESS_EQUAL, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_NotEqual(Integer depth) {
-        setDepth_NotEqual(depth, null, null);
-    }
-
-    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setDepth_Equal(depth, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setDepth_Equal(Integer depth) {
-        setDepth_Term(depth, null);
-    }
-
-    public void setDepth_Equal(Integer depth, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setDepth_Term(depth, opLambda);
-    }
-
-    public void setDepth_Term(Integer depth) {
-        setDepth_Term(depth, null);
-    }
-
-    public void setDepth_Term(Integer depth, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("depth", depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_Terms(Collection<Integer> depthList) {
-        setDepth_Terms(depthList, null);
-    }
-
-    public void setDepth_Terms(Collection<Integer> depthList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("depth", depthList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_InScope(Collection<Integer> depthList) {
-        setDepth_Terms(depthList, null);
-    }
-
-    public void setDepth_InScope(Collection<Integer> depthList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setDepth_Terms(depthList, opLambda);
-    }
-
-    public void setDepth_Exists() {
-        setDepth_Exists(null);
-    }
-
-    public void setDepth_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("depth");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_Missing() {
-        setDepth_Missing(null);
-    }
-
-    public void setDepth_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("depth");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_GreaterThan(Integer depth) {
-        setDepth_GreaterThan(depth, null);
-    }
-
-    public void setDepth_GreaterThan(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_GREATER_THAN, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_LessThan(Integer depth) {
-        setDepth_LessThan(depth, null);
-    }
-
-    public void setDepth_LessThan(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_LESS_THAN, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_GreaterEqual(Integer depth) {
-        setDepth_GreaterEqual(depth, null);
-    }
-
-    public void setDepth_GreaterEqual(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_GREATER_EQUAL, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_LessEqual(Integer depth) {
-        setDepth_LessEqual(depth, null);
-    }
-
-    public void setDepth_LessEqual(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_LESS_EQUAL, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_NotEqual(String excludedDocPaths) {
-        setExcludedDocPaths_NotEqual(excludedDocPaths, null, null);
-    }
-
-    public void setExcludedDocPaths_NotEqual(String excludedDocPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExcludedDocPaths_Equal(excludedDocPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExcludedDocPaths_Equal(String excludedDocPaths) {
-        setExcludedDocPaths_Term(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_Equal(String excludedDocPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExcludedDocPaths_Term(excludedDocPaths, opLambda);
-    }
-
-    public void setExcludedDocPaths_Term(String excludedDocPaths) {
-        setExcludedDocPaths_Term(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_Term(String excludedDocPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("excludedDocPaths", excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_Terms(Collection<String> excludedDocPathsList) {
-        setExcludedDocPaths_Terms(excludedDocPathsList, null);
-    }
-
-    public void setExcludedDocPaths_Terms(Collection<String> excludedDocPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("excludedDocPaths", excludedDocPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_InScope(Collection<String> excludedDocPathsList) {
-        setExcludedDocPaths_Terms(excludedDocPathsList, null);
-    }
-
-    public void setExcludedDocPaths_InScope(Collection<String> excludedDocPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExcludedDocPaths_Terms(excludedDocPathsList, opLambda);
-    }
-
-    public void setExcludedDocPaths_Prefix(String excludedDocPaths) {
-        setExcludedDocPaths_Prefix(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_Prefix(String excludedDocPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("excludedDocPaths", excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_Exists() {
-        setExcludedDocPaths_Exists(null);
-    }
-
-    public void setExcludedDocPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("excludedDocPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_Missing() {
-        setExcludedDocPaths_Missing(null);
-    }
-
-    public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("excludedDocPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_GreaterThan(String excludedDocPaths) {
-        setExcludedDocPaths_GreaterThan(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_GreaterThan(String excludedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocPaths", ConditionKey.CK_GREATER_THAN, excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_LessThan(String excludedDocPaths) {
-        setExcludedDocPaths_LessThan(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_LessThan(String excludedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocPaths", ConditionKey.CK_LESS_THAN, excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_GreaterEqual(String excludedDocPaths) {
-        setExcludedDocPaths_GreaterEqual(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_GreaterEqual(String excludedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocPaths", ConditionKey.CK_GREATER_EQUAL, excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocPaths_LessEqual(String excludedDocPaths) {
-        setExcludedDocPaths_LessEqual(excludedDocPaths, null);
-    }
-
-    public void setExcludedDocPaths_LessEqual(String excludedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocPaths", ConditionKey.CK_LESS_EQUAL, excludedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_NotEqual(String excludedPaths) {
-        setExcludedPaths_NotEqual(excludedPaths, null, null);
-    }
-
-    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExcludedPaths_Equal(excludedPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExcludedPaths_Equal(String excludedPaths) {
-        setExcludedPaths_Term(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Equal(String excludedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExcludedPaths_Term(excludedPaths, opLambda);
-    }
-
-    public void setExcludedPaths_Term(String excludedPaths) {
-        setExcludedPaths_Term(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Term(String excludedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("excludedPaths", excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
-        setExcludedPaths_Terms(excludedPathsList, null);
-    }
-
-    public void setExcludedPaths_Terms(Collection<String> excludedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("excludedPaths", excludedPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_InScope(Collection<String> excludedPathsList) {
-        setExcludedPaths_Terms(excludedPathsList, null);
-    }
-
-    public void setExcludedPaths_InScope(Collection<String> excludedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExcludedPaths_Terms(excludedPathsList, opLambda);
-    }
-
-    public void setExcludedPaths_Prefix(String excludedPaths) {
-        setExcludedPaths_Prefix(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Prefix(String excludedPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("excludedPaths", excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Exists() {
-        setExcludedPaths_Exists(null);
-    }
-
-    public void setExcludedPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("excludedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Missing() {
-        setExcludedPaths_Missing(null);
-    }
-
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("excludedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_GreaterThan(String excludedPaths) {
-        setExcludedPaths_GreaterThan(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_GreaterThan(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_GREATER_THAN, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_LessThan(String excludedPaths) {
-        setExcludedPaths_LessThan(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_LessThan(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_LESS_THAN, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_GreaterEqual(String excludedPaths) {
-        setExcludedPaths_GreaterEqual(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_GreaterEqual(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_GREATER_EQUAL, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_LessEqual(String excludedPaths) {
-        setExcludedPaths_LessEqual(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_LessEqual(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_LESS_EQUAL, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_NotEqual(String includedDocPaths) {
-        setIncludedDocPaths_NotEqual(includedDocPaths, null, null);
-    }
-
-    public void setIncludedDocPaths_NotEqual(String includedDocPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIncludedDocPaths_Equal(includedDocPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIncludedDocPaths_Equal(String includedDocPaths) {
-        setIncludedDocPaths_Term(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_Equal(String includedDocPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIncludedDocPaths_Term(includedDocPaths, opLambda);
-    }
-
-    public void setIncludedDocPaths_Term(String includedDocPaths) {
-        setIncludedDocPaths_Term(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_Term(String includedDocPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("includedDocPaths", includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_Terms(Collection<String> includedDocPathsList) {
-        setIncludedDocPaths_Terms(includedDocPathsList, null);
-    }
-
-    public void setIncludedDocPaths_Terms(Collection<String> includedDocPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("includedDocPaths", includedDocPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_InScope(Collection<String> includedDocPathsList) {
-        setIncludedDocPaths_Terms(includedDocPathsList, null);
-    }
-
-    public void setIncludedDocPaths_InScope(Collection<String> includedDocPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIncludedDocPaths_Terms(includedDocPathsList, opLambda);
-    }
-
-    public void setIncludedDocPaths_Prefix(String includedDocPaths) {
-        setIncludedDocPaths_Prefix(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_Prefix(String includedDocPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("includedDocPaths", includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_Exists() {
-        setIncludedDocPaths_Exists(null);
-    }
-
-    public void setIncludedDocPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("includedDocPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_Missing() {
-        setIncludedDocPaths_Missing(null);
-    }
-
-    public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("includedDocPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_GreaterThan(String includedDocPaths) {
-        setIncludedDocPaths_GreaterThan(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_GreaterThan(String includedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocPaths", ConditionKey.CK_GREATER_THAN, includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_LessThan(String includedDocPaths) {
-        setIncludedDocPaths_LessThan(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_LessThan(String includedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocPaths", ConditionKey.CK_LESS_THAN, includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_GreaterEqual(String includedDocPaths) {
-        setIncludedDocPaths_GreaterEqual(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_GreaterEqual(String includedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocPaths", ConditionKey.CK_GREATER_EQUAL, includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocPaths_LessEqual(String includedDocPaths) {
-        setIncludedDocPaths_LessEqual(includedDocPaths, null);
-    }
-
-    public void setIncludedDocPaths_LessEqual(String includedDocPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocPaths", ConditionKey.CK_LESS_EQUAL, includedDocPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_NotEqual(String includedPaths) {
-        setIncludedPaths_NotEqual(includedPaths, null, null);
-    }
-
-    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIncludedPaths_Equal(includedPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIncludedPaths_Equal(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Equal(String includedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIncludedPaths_Term(includedPaths, opLambda);
-    }
-
-    public void setIncludedPaths_Term(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Term(String includedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("includedPaths", includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Terms(Collection<String> includedPathsList) {
-        setIncludedPaths_Terms(includedPathsList, null);
-    }
-
-    public void setIncludedPaths_Terms(Collection<String> includedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("includedPaths", includedPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_InScope(Collection<String> includedPathsList) {
-        setIncludedPaths_Terms(includedPathsList, null);
-    }
-
-    public void setIncludedPaths_InScope(Collection<String> includedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIncludedPaths_Terms(includedPathsList, opLambda);
-    }
-
-    public void setIncludedPaths_Prefix(String includedPaths) {
-        setIncludedPaths_Prefix(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Prefix(String includedPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("includedPaths", includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Exists() {
-        setIncludedPaths_Exists(null);
-    }
-
-    public void setIncludedPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("includedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Missing() {
-        setIncludedPaths_Missing(null);
-    }
-
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("includedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_GreaterThan(String includedPaths) {
-        setIncludedPaths_GreaterThan(includedPaths, null);
-    }
-
-    public void setIncludedPaths_GreaterThan(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_GREATER_THAN, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_LessThan(String includedPaths) {
-        setIncludedPaths_LessThan(includedPaths, null);
-    }
-
-    public void setIncludedPaths_LessThan(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_LESS_THAN, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_GreaterEqual(String includedPaths) {
-        setIncludedPaths_GreaterEqual(includedPaths, null);
-    }
-
-    public void setIncludedPaths_GreaterEqual(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_GREATER_EQUAL, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_LessEqual(String includedPaths) {
-        setIncludedPaths_LessEqual(includedPaths, null);
-    }
-
-    public void setIncludedPaths_LessEqual(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_LESS_EQUAL, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_NotEqual(Integer intervalTime) {
-        setIntervalTime_NotEqual(intervalTime, null, null);
-    }
-
-    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIntervalTime_Equal(intervalTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIntervalTime_Equal(Integer intervalTime) {
-        setIntervalTime_Term(intervalTime, null);
-    }
-
-    public void setIntervalTime_Equal(Integer intervalTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIntervalTime_Term(intervalTime, opLambda);
-    }
-
-    public void setIntervalTime_Term(Integer intervalTime) {
-        setIntervalTime_Term(intervalTime, null);
-    }
-
-    public void setIntervalTime_Term(Integer intervalTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("intervalTime", intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
-        setIntervalTime_Terms(intervalTimeList, null);
-    }
-
-    public void setIntervalTime_Terms(Collection<Integer> intervalTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("intervalTime", intervalTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_InScope(Collection<Integer> intervalTimeList) {
-        setIntervalTime_Terms(intervalTimeList, null);
-    }
-
-    public void setIntervalTime_InScope(Collection<Integer> intervalTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIntervalTime_Terms(intervalTimeList, opLambda);
-    }
-
-    public void setIntervalTime_Exists() {
-        setIntervalTime_Exists(null);
-    }
-
-    public void setIntervalTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("intervalTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_Missing() {
-        setIntervalTime_Missing(null);
-    }
-
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("intervalTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_GreaterThan(Integer intervalTime) {
-        setIntervalTime_GreaterThan(intervalTime, null);
-    }
-
-    public void setIntervalTime_GreaterThan(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_GREATER_THAN, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_LessThan(Integer intervalTime) {
-        setIntervalTime_LessThan(intervalTime, null);
-    }
-
-    public void setIntervalTime_LessThan(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_LESS_THAN, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_GreaterEqual(Integer intervalTime) {
-        setIntervalTime_GreaterEqual(intervalTime, null);
-    }
-
-    public void setIntervalTime_GreaterEqual(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_GREATER_EQUAL, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_LessEqual(Integer intervalTime) {
-        setIntervalTime_LessEqual(intervalTime, null);
-    }
-
-    public void setIntervalTime_LessEqual(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_LESS_EQUAL, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount) {
-        setMaxAccessCount_NotEqual(maxAccessCount, null, null);
-    }
-
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setMaxAccessCount_Equal(maxAccessCount, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setMaxAccessCount_Equal(Long maxAccessCount) {
-        setMaxAccessCount_Term(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_Equal(Long maxAccessCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setMaxAccessCount_Term(maxAccessCount, opLambda);
-    }
-
-    public void setMaxAccessCount_Term(Long maxAccessCount) {
-        setMaxAccessCount_Term(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_Term(Long maxAccessCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("maxAccessCount", maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
-        setMaxAccessCount_Terms(maxAccessCountList, null);
-    }
-
-    public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("maxAccessCount", maxAccessCountList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_InScope(Collection<Long> maxAccessCountList) {
-        setMaxAccessCount_Terms(maxAccessCountList, null);
-    }
-
-    public void setMaxAccessCount_InScope(Collection<Long> maxAccessCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setMaxAccessCount_Terms(maxAccessCountList, opLambda);
-    }
-
-    public void setMaxAccessCount_Exists() {
-        setMaxAccessCount_Exists(null);
-    }
-
-    public void setMaxAccessCount_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("maxAccessCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_Missing() {
-        setMaxAccessCount_Missing(null);
-    }
-
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("maxAccessCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_GreaterThan(Long maxAccessCount) {
-        setMaxAccessCount_GreaterThan(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_GreaterThan(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_GREATER_THAN, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_LessThan(Long maxAccessCount) {
-        setMaxAccessCount_LessThan(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_LessThan(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_LESS_THAN, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_GreaterEqual(Long maxAccessCount) {
-        setMaxAccessCount_GreaterEqual(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_GreaterEqual(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_LessEqual(Long maxAccessCount) {
-        setMaxAccessCount_LessEqual(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_LessEqual(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_LESS_EQUAL, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_NotEqual(Integer numOfThread) {
-        setNumOfThread_NotEqual(numOfThread, null, null);
-    }
-
-    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setNumOfThread_Equal(numOfThread, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setNumOfThread_Equal(Integer numOfThread) {
-        setNumOfThread_Term(numOfThread, null);
-    }
-
-    public void setNumOfThread_Equal(Integer numOfThread, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setNumOfThread_Term(numOfThread, opLambda);
-    }
-
-    public void setNumOfThread_Term(Integer numOfThread) {
-        setNumOfThread_Term(numOfThread, null);
-    }
-
-    public void setNumOfThread_Term(Integer numOfThread, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("numOfThread", numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
-        setNumOfThread_Terms(numOfThreadList, null);
-    }
-
-    public void setNumOfThread_Terms(Collection<Integer> numOfThreadList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("numOfThread", numOfThreadList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_InScope(Collection<Integer> numOfThreadList) {
-        setNumOfThread_Terms(numOfThreadList, null);
-    }
-
-    public void setNumOfThread_InScope(Collection<Integer> numOfThreadList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setNumOfThread_Terms(numOfThreadList, opLambda);
-    }
-
-    public void setNumOfThread_Exists() {
-        setNumOfThread_Exists(null);
-    }
-
-    public void setNumOfThread_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("numOfThread");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_Missing() {
-        setNumOfThread_Missing(null);
-    }
-
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("numOfThread");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_GreaterThan(Integer numOfThread) {
-        setNumOfThread_GreaterThan(numOfThread, null);
-    }
-
-    public void setNumOfThread_GreaterThan(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_GREATER_THAN, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_LessThan(Integer numOfThread) {
-        setNumOfThread_LessThan(numOfThread, null);
-    }
-
-    public void setNumOfThread_LessThan(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_LESS_THAN, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_GreaterEqual(Integer numOfThread) {
-        setNumOfThread_GreaterEqual(numOfThread, null);
-    }
-
-    public void setNumOfThread_GreaterEqual(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_GREATER_EQUAL, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_LessEqual(Integer numOfThread) {
-        setNumOfThread_LessEqual(numOfThread, null);
-    }
-
-    public void setNumOfThread_LessEqual(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_LESS_EQUAL, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_NotEqual(String paths) {
-        setPaths_NotEqual(paths, null, null);
-    }
-
-    public void setPaths_NotEqual(String paths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPaths_Equal(paths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPaths_Equal(String paths) {
-        setPaths_Term(paths, null);
-    }
-
-    public void setPaths_Equal(String paths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPaths_Term(paths, opLambda);
-    }
-
-    public void setPaths_Term(String paths) {
-        setPaths_Term(paths, null);
-    }
-
-    public void setPaths_Term(String paths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("paths", paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_Terms(Collection<String> pathsList) {
-        setPaths_Terms(pathsList, null);
-    }
-
-    public void setPaths_Terms(Collection<String> pathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("paths", pathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_InScope(Collection<String> pathsList) {
-        setPaths_Terms(pathsList, null);
-    }
-
-    public void setPaths_InScope(Collection<String> pathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPaths_Terms(pathsList, opLambda);
-    }
-
-    public void setPaths_Prefix(String paths) {
-        setPaths_Prefix(paths, null);
-    }
-
-    public void setPaths_Prefix(String paths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("paths", paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_Exists() {
-        setPaths_Exists(null);
-    }
-
-    public void setPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("paths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_Missing() {
-        setPaths_Missing(null);
-    }
-
-    public void setPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("paths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_GreaterThan(String paths) {
-        setPaths_GreaterThan(paths, null);
-    }
-
-    public void setPaths_GreaterThan(String paths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("paths", ConditionKey.CK_GREATER_THAN, paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_LessThan(String paths) {
-        setPaths_LessThan(paths, null);
-    }
-
-    public void setPaths_LessThan(String paths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("paths", ConditionKey.CK_LESS_THAN, paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_GreaterEqual(String paths) {
-        setPaths_GreaterEqual(paths, null);
-    }
-
-    public void setPaths_GreaterEqual(String paths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("paths", ConditionKey.CK_GREATER_EQUAL, paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPaths_LessEqual(String paths) {
-        setPaths_LessEqual(paths, null);
-    }
-
-    public void setPaths_LessEqual(String paths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("paths", ConditionKey.CK_LESS_EQUAL, paths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToLabelCF.java
deleted file mode 100644
index ece5bec3c874b23f644fb910d35de49a70e6cbb1..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToLabelCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigToLabelCF;
-import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFileConfigToLabelCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FileConfigToLabelCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FileConfigToLabelCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FileConfigToLabelCF mustFilter = new FileConfigToLabelCF();
-        FileConfigToLabelCF shouldFilter = new FileConfigToLabelCF();
-        FileConfigToLabelCF mustNotFilter = new FileConfigToLabelCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FileConfigToLabelCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FileConfigToLabelCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FileConfigToLabelCF andFilter = new FileConfigToLabelCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FileConfigToLabelCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FileConfigToLabelCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FileConfigToLabelCF orFilter = new FileConfigToLabelCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FileConfigToLabelCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FileConfigToLabelCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FileConfigToLabelCF notFilter = new FileConfigToLabelCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigToLabelCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigToLabelCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FileConfigToLabelCQ query = new FileConfigToLabelCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setFileConfigId_NotEqual(String fileConfigId) {
-        setFileConfigId_NotEqual(fileConfigId, null, null);
-    }
-
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setFileConfigId_Equal(fileConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setFileConfigId_Term(fileConfigId, opLambda);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("fileConfigId", fileConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setFileConfigId_Terms(fileConfigIdList, opLambda);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId) {
-        setFileConfigId_Prefix(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Exists() {
-        setFileConfigId_Exists(null);
-    }
-
-    public void setFileConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Missing() {
-        setFileConfigId_Missing(null);
-    }
-
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId) {
-        setFileConfigId_GreaterThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId) {
-        setFileConfigId_LessThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId) {
-        setFileConfigId_GreaterEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId) {
-        setFileConfigId_LessEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId) {
-        setLabelTypeId_NotEqual(labelTypeId, null, null);
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setLabelTypeId_Equal(labelTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("labelTypeId", labelTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setLabelTypeId_Terms(labelTypeIdList, opLambda);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId) {
-        setLabelTypeId_Prefix(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Exists() {
-        setLabelTypeId_Exists(null);
-    }
-
-    public void setLabelTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Missing() {
-        setLabelTypeId_Missing(null);
-    }
-
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId) {
-        setLabelTypeId_GreaterThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId) {
-        setLabelTypeId_LessThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId) {
-        setLabelTypeId_GreaterEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId) {
-        setLabelTypeId_LessEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToRoleCF.java
deleted file mode 100644
index b74e67de44200e5cb40182c920363486ff34b3a0..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsFileConfigToRoleCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigToRoleCF;
-import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFileConfigToRoleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FileConfigToRoleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FileConfigToRoleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FileConfigToRoleCF mustFilter = new FileConfigToRoleCF();
-        FileConfigToRoleCF shouldFilter = new FileConfigToRoleCF();
-        FileConfigToRoleCF mustNotFilter = new FileConfigToRoleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FileConfigToRoleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FileConfigToRoleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FileConfigToRoleCF andFilter = new FileConfigToRoleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FileConfigToRoleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FileConfigToRoleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FileConfigToRoleCF orFilter = new FileConfigToRoleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FileConfigToRoleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FileConfigToRoleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FileConfigToRoleCF notFilter = new FileConfigToRoleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigToRoleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<FileConfigToRoleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FileConfigToRoleCQ query = new FileConfigToRoleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setFileConfigId_NotEqual(String fileConfigId) {
-        setFileConfigId_NotEqual(fileConfigId, null, null);
-    }
-
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setFileConfigId_Equal(fileConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Equal(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setFileConfigId_Term(fileConfigId, opLambda);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId) {
-        setFileConfigId_Term(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Term(String fileConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_Terms(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("fileConfigId", fileConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList) {
-        setFileConfigId_Terms(fileConfigIdList, null);
-    }
-
-    public void setFileConfigId_InScope(Collection<String> fileConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setFileConfigId_Terms(fileConfigIdList, opLambda);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId) {
-        setFileConfigId_Prefix(fileConfigId, null);
-    }
-
-    public void setFileConfigId_Prefix(String fileConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("fileConfigId", fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Exists() {
-        setFileConfigId_Exists(null);
-    }
-
-    public void setFileConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_Missing() {
-        setFileConfigId_Missing(null);
-    }
-
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("fileConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId) {
-        setFileConfigId_GreaterThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId) {
-        setFileConfigId_LessThan(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId) {
-        setFileConfigId_GreaterEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId) {
-        setFileConfigId_LessEqual(fileConfigId, null);
-    }
-
-    public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId) {
-        setRoleTypeId_NotEqual(roleTypeId, null, null);
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRoleTypeId_Equal(roleTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("roleTypeId", roleTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRoleTypeId_Terms(roleTypeIdList, opLambda);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId) {
-        setRoleTypeId_Prefix(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Exists() {
-        setRoleTypeId_Exists(null);
-    }
-
-    public void setRoleTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Missing() {
-        setRoleTypeId_Missing(null);
-    }
-
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId) {
-        setRoleTypeId_GreaterThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId) {
-        setRoleTypeId_LessThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId) {
-        setRoleTypeId_GreaterEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId) {
-        setRoleTypeId_LessEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsJobLogCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsJobLogCF.java
deleted file mode 100644
index c7ba9ca4fb846f68bb41718ffdc098fca635e1de..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsJobLogCF.java
+++ /dev/null
@@ -1,1246 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.JobLogCF;
-import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsJobLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<JobLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<JobLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        JobLogCF mustFilter = new JobLogCF();
-        JobLogCF shouldFilter = new JobLogCF();
-        JobLogCF mustNotFilter = new JobLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<JobLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<JobLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        JobLogCF andFilter = new JobLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<JobLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<JobLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        JobLogCF orFilter = new JobLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<JobLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<JobLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        JobLogCF notFilter = new JobLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<JobLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<JobLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        JobLogCQ query = new JobLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setEndTime_NotEqual(Long endTime) {
-        setEndTime_NotEqual(endTime, null, null);
-    }
-
-    public void setEndTime_NotEqual(Long endTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setEndTime_Equal(endTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setEndTime_Equal(Long endTime) {
-        setEndTime_Term(endTime, null);
-    }
-
-    public void setEndTime_Equal(Long endTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setEndTime_Term(endTime, opLambda);
-    }
-
-    public void setEndTime_Term(Long endTime) {
-        setEndTime_Term(endTime, null);
-    }
-
-    public void setEndTime_Term(Long endTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("endTime", endTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_Terms(Collection<Long> endTimeList) {
-        setEndTime_Terms(endTimeList, null);
-    }
-
-    public void setEndTime_Terms(Collection<Long> endTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("endTime", endTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_InScope(Collection<Long> endTimeList) {
-        setEndTime_Terms(endTimeList, null);
-    }
-
-    public void setEndTime_InScope(Collection<Long> endTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setEndTime_Terms(endTimeList, opLambda);
-    }
-
-    public void setEndTime_Exists() {
-        setEndTime_Exists(null);
-    }
-
-    public void setEndTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("endTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_Missing() {
-        setEndTime_Missing(null);
-    }
-
-    public void setEndTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("endTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_GreaterThan(Long endTime) {
-        setEndTime_GreaterThan(endTime, null);
-    }
-
-    public void setEndTime_GreaterThan(Long endTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("endTime", ConditionKey.CK_GREATER_THAN, endTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_LessThan(Long endTime) {
-        setEndTime_LessThan(endTime, null);
-    }
-
-    public void setEndTime_LessThan(Long endTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("endTime", ConditionKey.CK_LESS_THAN, endTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_GreaterEqual(Long endTime) {
-        setEndTime_GreaterEqual(endTime, null);
-    }
-
-    public void setEndTime_GreaterEqual(Long endTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("endTime", ConditionKey.CK_GREATER_EQUAL, endTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEndTime_LessEqual(Long endTime) {
-        setEndTime_LessEqual(endTime, null);
-    }
-
-    public void setEndTime_LessEqual(Long endTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("endTime", ConditionKey.CK_LESS_EQUAL, endTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_NotEqual(String jobName) {
-        setJobName_NotEqual(jobName, null, null);
-    }
-
-    public void setJobName_NotEqual(String jobName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setJobName_Equal(jobName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setJobName_Equal(String jobName) {
-        setJobName_Term(jobName, null);
-    }
-
-    public void setJobName_Equal(String jobName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setJobName_Term(jobName, opLambda);
-    }
-
-    public void setJobName_Term(String jobName) {
-        setJobName_Term(jobName, null);
-    }
-
-    public void setJobName_Term(String jobName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("jobName", jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_Terms(Collection<String> jobNameList) {
-        setJobName_Terms(jobNameList, null);
-    }
-
-    public void setJobName_Terms(Collection<String> jobNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("jobName", jobNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_InScope(Collection<String> jobNameList) {
-        setJobName_Terms(jobNameList, null);
-    }
-
-    public void setJobName_InScope(Collection<String> jobNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setJobName_Terms(jobNameList, opLambda);
-    }
-
-    public void setJobName_Prefix(String jobName) {
-        setJobName_Prefix(jobName, null);
-    }
-
-    public void setJobName_Prefix(String jobName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("jobName", jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_Exists() {
-        setJobName_Exists(null);
-    }
-
-    public void setJobName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("jobName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_Missing() {
-        setJobName_Missing(null);
-    }
-
-    public void setJobName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("jobName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_GreaterThan(String jobName) {
-        setJobName_GreaterThan(jobName, null);
-    }
-
-    public void setJobName_GreaterThan(String jobName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobName", ConditionKey.CK_GREATER_THAN, jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_LessThan(String jobName) {
-        setJobName_LessThan(jobName, null);
-    }
-
-    public void setJobName_LessThan(String jobName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobName", ConditionKey.CK_LESS_THAN, jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_GreaterEqual(String jobName) {
-        setJobName_GreaterEqual(jobName, null);
-    }
-
-    public void setJobName_GreaterEqual(String jobName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobName", ConditionKey.CK_GREATER_EQUAL, jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobName_LessEqual(String jobName) {
-        setJobName_LessEqual(jobName, null);
-    }
-
-    public void setJobName_LessEqual(String jobName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobName", ConditionKey.CK_LESS_EQUAL, jobName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_NotEqual(String jobStatus) {
-        setJobStatus_NotEqual(jobStatus, null, null);
-    }
-
-    public void setJobStatus_NotEqual(String jobStatus, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setJobStatus_Equal(jobStatus, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setJobStatus_Equal(String jobStatus) {
-        setJobStatus_Term(jobStatus, null);
-    }
-
-    public void setJobStatus_Equal(String jobStatus, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setJobStatus_Term(jobStatus, opLambda);
-    }
-
-    public void setJobStatus_Term(String jobStatus) {
-        setJobStatus_Term(jobStatus, null);
-    }
-
-    public void setJobStatus_Term(String jobStatus, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("jobStatus", jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_Terms(Collection<String> jobStatusList) {
-        setJobStatus_Terms(jobStatusList, null);
-    }
-
-    public void setJobStatus_Terms(Collection<String> jobStatusList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("jobStatus", jobStatusList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_InScope(Collection<String> jobStatusList) {
-        setJobStatus_Terms(jobStatusList, null);
-    }
-
-    public void setJobStatus_InScope(Collection<String> jobStatusList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setJobStatus_Terms(jobStatusList, opLambda);
-    }
-
-    public void setJobStatus_Prefix(String jobStatus) {
-        setJobStatus_Prefix(jobStatus, null);
-    }
-
-    public void setJobStatus_Prefix(String jobStatus, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("jobStatus", jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_Exists() {
-        setJobStatus_Exists(null);
-    }
-
-    public void setJobStatus_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("jobStatus");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_Missing() {
-        setJobStatus_Missing(null);
-    }
-
-    public void setJobStatus_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("jobStatus");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_GreaterThan(String jobStatus) {
-        setJobStatus_GreaterThan(jobStatus, null);
-    }
-
-    public void setJobStatus_GreaterThan(String jobStatus, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobStatus", ConditionKey.CK_GREATER_THAN, jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_LessThan(String jobStatus) {
-        setJobStatus_LessThan(jobStatus, null);
-    }
-
-    public void setJobStatus_LessThan(String jobStatus, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobStatus", ConditionKey.CK_LESS_THAN, jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_GreaterEqual(String jobStatus) {
-        setJobStatus_GreaterEqual(jobStatus, null);
-    }
-
-    public void setJobStatus_GreaterEqual(String jobStatus, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobStatus", ConditionKey.CK_GREATER_EQUAL, jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobStatus_LessEqual(String jobStatus) {
-        setJobStatus_LessEqual(jobStatus, null);
-    }
-
-    public void setJobStatus_LessEqual(String jobStatus, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobStatus", ConditionKey.CK_LESS_EQUAL, jobStatus);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_NotEqual(String scriptData) {
-        setScriptData_NotEqual(scriptData, null, null);
-    }
-
-    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setScriptData_Equal(scriptData, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setScriptData_Equal(String scriptData) {
-        setScriptData_Term(scriptData, null);
-    }
-
-    public void setScriptData_Equal(String scriptData, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setScriptData_Term(scriptData, opLambda);
-    }
-
-    public void setScriptData_Term(String scriptData) {
-        setScriptData_Term(scriptData, null);
-    }
-
-    public void setScriptData_Term(String scriptData, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("scriptData", scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Terms(Collection<String> scriptDataList) {
-        setScriptData_Terms(scriptDataList, null);
-    }
-
-    public void setScriptData_Terms(Collection<String> scriptDataList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("scriptData", scriptDataList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_InScope(Collection<String> scriptDataList) {
-        setScriptData_Terms(scriptDataList, null);
-    }
-
-    public void setScriptData_InScope(Collection<String> scriptDataList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setScriptData_Terms(scriptDataList, opLambda);
-    }
-
-    public void setScriptData_Prefix(String scriptData) {
-        setScriptData_Prefix(scriptData, null);
-    }
-
-    public void setScriptData_Prefix(String scriptData, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("scriptData", scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Exists() {
-        setScriptData_Exists(null);
-    }
-
-    public void setScriptData_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("scriptData");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Missing() {
-        setScriptData_Missing(null);
-    }
-
-    public void setScriptData_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("scriptData");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_GreaterThan(String scriptData) {
-        setScriptData_GreaterThan(scriptData, null);
-    }
-
-    public void setScriptData_GreaterThan(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_GREATER_THAN, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_LessThan(String scriptData) {
-        setScriptData_LessThan(scriptData, null);
-    }
-
-    public void setScriptData_LessThan(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_LESS_THAN, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_GreaterEqual(String scriptData) {
-        setScriptData_GreaterEqual(scriptData, null);
-    }
-
-    public void setScriptData_GreaterEqual(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_GREATER_EQUAL, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_LessEqual(String scriptData) {
-        setScriptData_LessEqual(scriptData, null);
-    }
-
-    public void setScriptData_LessEqual(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_LESS_EQUAL, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_NotEqual(String scriptResult) {
-        setScriptResult_NotEqual(scriptResult, null, null);
-    }
-
-    public void setScriptResult_NotEqual(String scriptResult, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setScriptResult_Equal(scriptResult, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setScriptResult_Equal(String scriptResult) {
-        setScriptResult_Term(scriptResult, null);
-    }
-
-    public void setScriptResult_Equal(String scriptResult, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setScriptResult_Term(scriptResult, opLambda);
-    }
-
-    public void setScriptResult_Term(String scriptResult) {
-        setScriptResult_Term(scriptResult, null);
-    }
-
-    public void setScriptResult_Term(String scriptResult, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("scriptResult", scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_Terms(Collection<String> scriptResultList) {
-        setScriptResult_Terms(scriptResultList, null);
-    }
-
-    public void setScriptResult_Terms(Collection<String> scriptResultList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("scriptResult", scriptResultList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_InScope(Collection<String> scriptResultList) {
-        setScriptResult_Terms(scriptResultList, null);
-    }
-
-    public void setScriptResult_InScope(Collection<String> scriptResultList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setScriptResult_Terms(scriptResultList, opLambda);
-    }
-
-    public void setScriptResult_Prefix(String scriptResult) {
-        setScriptResult_Prefix(scriptResult, null);
-    }
-
-    public void setScriptResult_Prefix(String scriptResult, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("scriptResult", scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_Exists() {
-        setScriptResult_Exists(null);
-    }
-
-    public void setScriptResult_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("scriptResult");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_Missing() {
-        setScriptResult_Missing(null);
-    }
-
-    public void setScriptResult_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("scriptResult");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_GreaterThan(String scriptResult) {
-        setScriptResult_GreaterThan(scriptResult, null);
-    }
-
-    public void setScriptResult_GreaterThan(String scriptResult, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptResult", ConditionKey.CK_GREATER_THAN, scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_LessThan(String scriptResult) {
-        setScriptResult_LessThan(scriptResult, null);
-    }
-
-    public void setScriptResult_LessThan(String scriptResult, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptResult", ConditionKey.CK_LESS_THAN, scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_GreaterEqual(String scriptResult) {
-        setScriptResult_GreaterEqual(scriptResult, null);
-    }
-
-    public void setScriptResult_GreaterEqual(String scriptResult, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptResult", ConditionKey.CK_GREATER_EQUAL, scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptResult_LessEqual(String scriptResult) {
-        setScriptResult_LessEqual(scriptResult, null);
-    }
-
-    public void setScriptResult_LessEqual(String scriptResult, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptResult", ConditionKey.CK_LESS_EQUAL, scriptResult);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_NotEqual(String scriptType) {
-        setScriptType_NotEqual(scriptType, null, null);
-    }
-
-    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setScriptType_Equal(scriptType, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setScriptType_Equal(String scriptType) {
-        setScriptType_Term(scriptType, null);
-    }
-
-    public void setScriptType_Equal(String scriptType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setScriptType_Term(scriptType, opLambda);
-    }
-
-    public void setScriptType_Term(String scriptType) {
-        setScriptType_Term(scriptType, null);
-    }
-
-    public void setScriptType_Term(String scriptType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("scriptType", scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Terms(Collection<String> scriptTypeList) {
-        setScriptType_Terms(scriptTypeList, null);
-    }
-
-    public void setScriptType_Terms(Collection<String> scriptTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("scriptType", scriptTypeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_InScope(Collection<String> scriptTypeList) {
-        setScriptType_Terms(scriptTypeList, null);
-    }
-
-    public void setScriptType_InScope(Collection<String> scriptTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setScriptType_Terms(scriptTypeList, opLambda);
-    }
-
-    public void setScriptType_Prefix(String scriptType) {
-        setScriptType_Prefix(scriptType, null);
-    }
-
-    public void setScriptType_Prefix(String scriptType, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("scriptType", scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Exists() {
-        setScriptType_Exists(null);
-    }
-
-    public void setScriptType_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("scriptType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Missing() {
-        setScriptType_Missing(null);
-    }
-
-    public void setScriptType_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("scriptType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_GreaterThan(String scriptType) {
-        setScriptType_GreaterThan(scriptType, null);
-    }
-
-    public void setScriptType_GreaterThan(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_GREATER_THAN, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_LessThan(String scriptType) {
-        setScriptType_LessThan(scriptType, null);
-    }
-
-    public void setScriptType_LessThan(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_LESS_THAN, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_GreaterEqual(String scriptType) {
-        setScriptType_GreaterEqual(scriptType, null);
-    }
-
-    public void setScriptType_GreaterEqual(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_GREATER_EQUAL, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_LessEqual(String scriptType) {
-        setScriptType_LessEqual(scriptType, null);
-    }
-
-    public void setScriptType_LessEqual(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_LESS_EQUAL, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_NotEqual(Long startTime) {
-        setStartTime_NotEqual(startTime, null, null);
-    }
-
-    public void setStartTime_NotEqual(Long startTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setStartTime_Equal(startTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setStartTime_Equal(Long startTime) {
-        setStartTime_Term(startTime, null);
-    }
-
-    public void setStartTime_Equal(Long startTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setStartTime_Term(startTime, opLambda);
-    }
-
-    public void setStartTime_Term(Long startTime) {
-        setStartTime_Term(startTime, null);
-    }
-
-    public void setStartTime_Term(Long startTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("startTime", startTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_Terms(Collection<Long> startTimeList) {
-        setStartTime_Terms(startTimeList, null);
-    }
-
-    public void setStartTime_Terms(Collection<Long> startTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("startTime", startTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_InScope(Collection<Long> startTimeList) {
-        setStartTime_Terms(startTimeList, null);
-    }
-
-    public void setStartTime_InScope(Collection<Long> startTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setStartTime_Terms(startTimeList, opLambda);
-    }
-
-    public void setStartTime_Exists() {
-        setStartTime_Exists(null);
-    }
-
-    public void setStartTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("startTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_Missing() {
-        setStartTime_Missing(null);
-    }
-
-    public void setStartTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("startTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_GreaterThan(Long startTime) {
-        setStartTime_GreaterThan(startTime, null);
-    }
-
-    public void setStartTime_GreaterThan(Long startTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("startTime", ConditionKey.CK_GREATER_THAN, startTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_LessThan(Long startTime) {
-        setStartTime_LessThan(startTime, null);
-    }
-
-    public void setStartTime_LessThan(Long startTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("startTime", ConditionKey.CK_LESS_THAN, startTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_GreaterEqual(Long startTime) {
-        setStartTime_GreaterEqual(startTime, null);
-    }
-
-    public void setStartTime_GreaterEqual(Long startTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("startTime", ConditionKey.CK_GREATER_EQUAL, startTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setStartTime_LessEqual(Long startTime) {
-        setStartTime_LessEqual(startTime, null);
-    }
-
-    public void setStartTime_LessEqual(Long startTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("startTime", ConditionKey.CK_LESS_EQUAL, startTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_NotEqual(String target) {
-        setTarget_NotEqual(target, null, null);
-    }
-
-    public void setTarget_NotEqual(String target, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTarget_Equal(target, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTarget_Equal(String target) {
-        setTarget_Term(target, null);
-    }
-
-    public void setTarget_Equal(String target, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTarget_Term(target, opLambda);
-    }
-
-    public void setTarget_Term(String target) {
-        setTarget_Term(target, null);
-    }
-
-    public void setTarget_Term(String target, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("target", target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Terms(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
-    }
-
-    public void setTarget_Terms(Collection<String> targetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("target", targetList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_InScope(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
-    }
-
-    public void setTarget_InScope(Collection<String> targetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTarget_Terms(targetList, opLambda);
-    }
-
-    public void setTarget_Prefix(String target) {
-        setTarget_Prefix(target, null);
-    }
-
-    public void setTarget_Prefix(String target, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("target", target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Exists() {
-        setTarget_Exists(null);
-    }
-
-    public void setTarget_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("target");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Missing() {
-        setTarget_Missing(null);
-    }
-
-    public void setTarget_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("target");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_GreaterThan(String target) {
-        setTarget_GreaterThan(target, null);
-    }
-
-    public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_GREATER_THAN, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_LessThan(String target) {
-        setTarget_LessThan(target, null);
-    }
-
-    public void setTarget_LessThan(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_LESS_THAN, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_GreaterEqual(String target) {
-        setTarget_GreaterEqual(target, null);
-    }
-
-    public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_GREATER_EQUAL, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_LessEqual(String target) {
-        setTarget_LessEqual(target, null);
-    }
-
-    public void setTarget_LessEqual(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_LESS_EQUAL, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsKeyMatchCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsKeyMatchCF.java
deleted file mode 100644
index 060375a41b5f22b917f188b6d55c7f1a843189c8..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsKeyMatchCF.java
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.KeyMatchCF;
-import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsKeyMatchCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<KeyMatchCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<KeyMatchCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        KeyMatchCF mustFilter = new KeyMatchCF();
-        KeyMatchCF shouldFilter = new KeyMatchCF();
-        KeyMatchCF mustNotFilter = new KeyMatchCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<KeyMatchCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<KeyMatchCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        KeyMatchCF andFilter = new KeyMatchCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<KeyMatchCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<KeyMatchCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        KeyMatchCF orFilter = new KeyMatchCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<KeyMatchCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<KeyMatchCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        KeyMatchCF notFilter = new KeyMatchCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<KeyMatchCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<KeyMatchCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        KeyMatchCQ query = new KeyMatchCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setBoost_NotEqual(Float boost) {
-        setBoost_NotEqual(boost, null, null);
-    }
-
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoost_Equal(boost, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoost_Equal(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Equal(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoost_Term(boost, opLambda);
-    }
-
-    public void setBoost_Term(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Term(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boost", boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boost", boostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoost_Terms(boostList, opLambda);
-    }
-
-    public void setBoost_Exists() {
-        setBoost_Exists(null);
-    }
-
-    public void setBoost_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Missing() {
-        setBoost_Missing(null);
-    }
-
-    public void setBoost_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterThan(Float boost) {
-        setBoost_GreaterThan(boost, null);
-    }
-
-    public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessThan(Float boost) {
-        setBoost_LessThan(boost, null);
-    }
-
-    public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterEqual(Float boost) {
-        setBoost_GreaterEqual(boost, null);
-    }
-
-    public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessEqual(Float boost) {
-        setBoost_LessEqual(boost, null);
-    }
-
-    public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_NotEqual(Integer maxSize) {
-        setMaxSize_NotEqual(maxSize, null, null);
-    }
-
-    public void setMaxSize_NotEqual(Integer maxSize, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setMaxSize_Equal(maxSize, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setMaxSize_Equal(Integer maxSize) {
-        setMaxSize_Term(maxSize, null);
-    }
-
-    public void setMaxSize_Equal(Integer maxSize, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setMaxSize_Term(maxSize, opLambda);
-    }
-
-    public void setMaxSize_Term(Integer maxSize) {
-        setMaxSize_Term(maxSize, null);
-    }
-
-    public void setMaxSize_Term(Integer maxSize, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("maxSize", maxSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_Terms(Collection<Integer> maxSizeList) {
-        setMaxSize_Terms(maxSizeList, null);
-    }
-
-    public void setMaxSize_Terms(Collection<Integer> maxSizeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("maxSize", maxSizeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_InScope(Collection<Integer> maxSizeList) {
-        setMaxSize_Terms(maxSizeList, null);
-    }
-
-    public void setMaxSize_InScope(Collection<Integer> maxSizeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setMaxSize_Terms(maxSizeList, opLambda);
-    }
-
-    public void setMaxSize_Exists() {
-        setMaxSize_Exists(null);
-    }
-
-    public void setMaxSize_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("maxSize");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_Missing() {
-        setMaxSize_Missing(null);
-    }
-
-    public void setMaxSize_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("maxSize");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_GreaterThan(Integer maxSize) {
-        setMaxSize_GreaterThan(maxSize, null);
-    }
-
-    public void setMaxSize_GreaterThan(Integer maxSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxSize", ConditionKey.CK_GREATER_THAN, maxSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_LessThan(Integer maxSize) {
-        setMaxSize_LessThan(maxSize, null);
-    }
-
-    public void setMaxSize_LessThan(Integer maxSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxSize", ConditionKey.CK_LESS_THAN, maxSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_GreaterEqual(Integer maxSize) {
-        setMaxSize_GreaterEqual(maxSize, null);
-    }
-
-    public void setMaxSize_GreaterEqual(Integer maxSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxSize", ConditionKey.CK_GREATER_EQUAL, maxSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxSize_LessEqual(Integer maxSize) {
-        setMaxSize_LessEqual(maxSize, null);
-    }
-
-    public void setMaxSize_LessEqual(Integer maxSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxSize", ConditionKey.CK_LESS_EQUAL, maxSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_NotEqual(String query) {
-        setQuery_NotEqual(query, null, null);
-    }
-
-    public void setQuery_NotEqual(String query, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setQuery_Equal(query, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setQuery_Equal(String query) {
-        setQuery_Term(query, null);
-    }
-
-    public void setQuery_Equal(String query, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setQuery_Term(query, opLambda);
-    }
-
-    public void setQuery_Term(String query) {
-        setQuery_Term(query, null);
-    }
-
-    public void setQuery_Term(String query, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("query", query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_Terms(Collection<String> queryList) {
-        setQuery_Terms(queryList, null);
-    }
-
-    public void setQuery_Terms(Collection<String> queryList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("query", queryList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_InScope(Collection<String> queryList) {
-        setQuery_Terms(queryList, null);
-    }
-
-    public void setQuery_InScope(Collection<String> queryList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setQuery_Terms(queryList, opLambda);
-    }
-
-    public void setQuery_Prefix(String query) {
-        setQuery_Prefix(query, null);
-    }
-
-    public void setQuery_Prefix(String query, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("query", query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_Exists() {
-        setQuery_Exists(null);
-    }
-
-    public void setQuery_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("query");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_Missing() {
-        setQuery_Missing(null);
-    }
-
-    public void setQuery_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("query");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_GreaterThan(String query) {
-        setQuery_GreaterThan(query, null);
-    }
-
-    public void setQuery_GreaterThan(String query, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("query", ConditionKey.CK_GREATER_THAN, query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_LessThan(String query) {
-        setQuery_LessThan(query, null);
-    }
-
-    public void setQuery_LessThan(String query, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("query", ConditionKey.CK_LESS_THAN, query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_GreaterEqual(String query) {
-        setQuery_GreaterEqual(query, null);
-    }
-
-    public void setQuery_GreaterEqual(String query, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("query", ConditionKey.CK_GREATER_EQUAL, query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQuery_LessEqual(String query) {
-        setQuery_LessEqual(query, null);
-    }
-
-    public void setQuery_LessEqual(String query, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("query", ConditionKey.CK_LESS_EQUAL, query);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_NotEqual(String term) {
-        setTerm_NotEqual(term, null, null);
-    }
-
-    public void setTerm_NotEqual(String term, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTerm_Equal(term, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTerm_Equal(String term) {
-        setTerm_Term(term, null);
-    }
-
-    public void setTerm_Equal(String term, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTerm_Term(term, opLambda);
-    }
-
-    public void setTerm_Term(String term) {
-        setTerm_Term(term, null);
-    }
-
-    public void setTerm_Term(String term, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("term", term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_Terms(Collection<String> termList) {
-        setTerm_Terms(termList, null);
-    }
-
-    public void setTerm_Terms(Collection<String> termList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("term", termList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_InScope(Collection<String> termList) {
-        setTerm_Terms(termList, null);
-    }
-
-    public void setTerm_InScope(Collection<String> termList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTerm_Terms(termList, opLambda);
-    }
-
-    public void setTerm_Prefix(String term) {
-        setTerm_Prefix(term, null);
-    }
-
-    public void setTerm_Prefix(String term, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("term", term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_Exists() {
-        setTerm_Exists(null);
-    }
-
-    public void setTerm_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("term");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_Missing() {
-        setTerm_Missing(null);
-    }
-
-    public void setTerm_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("term");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_GreaterThan(String term) {
-        setTerm_GreaterThan(term, null);
-    }
-
-    public void setTerm_GreaterThan(String term, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("term", ConditionKey.CK_GREATER_THAN, term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_LessThan(String term) {
-        setTerm_LessThan(term, null);
-    }
-
-    public void setTerm_LessThan(String term, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("term", ConditionKey.CK_LESS_THAN, term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_GreaterEqual(String term) {
-        setTerm_GreaterEqual(term, null);
-    }
-
-    public void setTerm_GreaterEqual(String term, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("term", ConditionKey.CK_GREATER_EQUAL, term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTerm_LessEqual(String term) {
-        setTerm_LessEqual(term, null);
-    }
-
-    public void setTerm_LessEqual(String term, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("term", ConditionKey.CK_LESS_EQUAL, term);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelToRoleCF.java
deleted file mode 100644
index 9ee291174449ad2ce62033351be7c3b69b438e25..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelToRoleCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.LabelToRoleCF;
-import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsLabelToRoleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<LabelToRoleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<LabelToRoleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        LabelToRoleCF mustFilter = new LabelToRoleCF();
-        LabelToRoleCF shouldFilter = new LabelToRoleCF();
-        LabelToRoleCF mustNotFilter = new LabelToRoleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<LabelToRoleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<LabelToRoleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        LabelToRoleCF andFilter = new LabelToRoleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<LabelToRoleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<LabelToRoleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        LabelToRoleCF orFilter = new LabelToRoleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<LabelToRoleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<LabelToRoleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        LabelToRoleCF notFilter = new LabelToRoleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<LabelToRoleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<LabelToRoleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        LabelToRoleCQ query = new LabelToRoleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId) {
-        setLabelTypeId_NotEqual(labelTypeId, null, null);
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setLabelTypeId_Equal(labelTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("labelTypeId", labelTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setLabelTypeId_Terms(labelTypeIdList, opLambda);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId) {
-        setLabelTypeId_Prefix(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Exists() {
-        setLabelTypeId_Exists(null);
-    }
-
-    public void setLabelTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Missing() {
-        setLabelTypeId_Missing(null);
-    }
-
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId) {
-        setLabelTypeId_GreaterThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId) {
-        setLabelTypeId_LessThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId) {
-        setLabelTypeId_GreaterEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId) {
-        setLabelTypeId_LessEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId) {
-        setRoleTypeId_NotEqual(roleTypeId, null, null);
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRoleTypeId_Equal(roleTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("roleTypeId", roleTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRoleTypeId_Terms(roleTypeIdList, opLambda);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId) {
-        setRoleTypeId_Prefix(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Exists() {
-        setRoleTypeId_Exists(null);
-    }
-
-    public void setRoleTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Missing() {
-        setRoleTypeId_Missing(null);
-    }
-
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId) {
-        setRoleTypeId_GreaterThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId) {
-        setRoleTypeId_LessThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId) {
-        setRoleTypeId_GreaterEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId) {
-        setRoleTypeId_LessEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelTypeCF.java
deleted file mode 100644
index d993068d9b7833e46b900055cb5a630d147d7427..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsLabelTypeCF.java
+++ /dev/null
@@ -1,1361 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.LabelTypeCF;
-import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsLabelTypeCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<LabelTypeCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<LabelTypeCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        LabelTypeCF mustFilter = new LabelTypeCF();
-        LabelTypeCF shouldFilter = new LabelTypeCF();
-        LabelTypeCF mustNotFilter = new LabelTypeCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<LabelTypeCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<LabelTypeCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        LabelTypeCF andFilter = new LabelTypeCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<LabelTypeCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<LabelTypeCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        LabelTypeCF orFilter = new LabelTypeCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<LabelTypeCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<LabelTypeCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        LabelTypeCF notFilter = new LabelTypeCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<LabelTypeCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<LabelTypeCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        LabelTypeCQ query = new LabelTypeCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_NotEqual(String excludedPaths) {
-        setExcludedPaths_NotEqual(excludedPaths, null, null);
-    }
-
-    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExcludedPaths_Equal(excludedPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExcludedPaths_Equal(String excludedPaths) {
-        setExcludedPaths_Term(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Equal(String excludedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExcludedPaths_Term(excludedPaths, opLambda);
-    }
-
-    public void setExcludedPaths_Term(String excludedPaths) {
-        setExcludedPaths_Term(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Term(String excludedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("excludedPaths", excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
-        setExcludedPaths_Terms(excludedPathsList, null);
-    }
-
-    public void setExcludedPaths_Terms(Collection<String> excludedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("excludedPaths", excludedPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_InScope(Collection<String> excludedPathsList) {
-        setExcludedPaths_Terms(excludedPathsList, null);
-    }
-
-    public void setExcludedPaths_InScope(Collection<String> excludedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExcludedPaths_Terms(excludedPathsList, opLambda);
-    }
-
-    public void setExcludedPaths_Prefix(String excludedPaths) {
-        setExcludedPaths_Prefix(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_Prefix(String excludedPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("excludedPaths", excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Exists() {
-        setExcludedPaths_Exists(null);
-    }
-
-    public void setExcludedPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("excludedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_Missing() {
-        setExcludedPaths_Missing(null);
-    }
-
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("excludedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_GreaterThan(String excludedPaths) {
-        setExcludedPaths_GreaterThan(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_GreaterThan(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_GREATER_THAN, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_LessThan(String excludedPaths) {
-        setExcludedPaths_LessThan(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_LessThan(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_LESS_THAN, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_GreaterEqual(String excludedPaths) {
-        setExcludedPaths_GreaterEqual(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_GreaterEqual(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_GREATER_EQUAL, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedPaths_LessEqual(String excludedPaths) {
-        setExcludedPaths_LessEqual(excludedPaths, null);
-    }
-
-    public void setExcludedPaths_LessEqual(String excludedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedPaths", ConditionKey.CK_LESS_EQUAL, excludedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_NotEqual(String includedPaths) {
-        setIncludedPaths_NotEqual(includedPaths, null, null);
-    }
-
-    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIncludedPaths_Equal(includedPaths, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIncludedPaths_Equal(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Equal(String includedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIncludedPaths_Term(includedPaths, opLambda);
-    }
-
-    public void setIncludedPaths_Term(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Term(String includedPaths, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("includedPaths", includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Terms(Collection<String> includedPathsList) {
-        setIncludedPaths_Terms(includedPathsList, null);
-    }
-
-    public void setIncludedPaths_Terms(Collection<String> includedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("includedPaths", includedPathsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_InScope(Collection<String> includedPathsList) {
-        setIncludedPaths_Terms(includedPathsList, null);
-    }
-
-    public void setIncludedPaths_InScope(Collection<String> includedPathsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIncludedPaths_Terms(includedPathsList, opLambda);
-    }
-
-    public void setIncludedPaths_Prefix(String includedPaths) {
-        setIncludedPaths_Prefix(includedPaths, null);
-    }
-
-    public void setIncludedPaths_Prefix(String includedPaths, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("includedPaths", includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Exists() {
-        setIncludedPaths_Exists(null);
-    }
-
-    public void setIncludedPaths_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("includedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_Missing() {
-        setIncludedPaths_Missing(null);
-    }
-
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("includedPaths");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_GreaterThan(String includedPaths) {
-        setIncludedPaths_GreaterThan(includedPaths, null);
-    }
-
-    public void setIncludedPaths_GreaterThan(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_GREATER_THAN, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_LessThan(String includedPaths) {
-        setIncludedPaths_LessThan(includedPaths, null);
-    }
-
-    public void setIncludedPaths_LessThan(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_LESS_THAN, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_GreaterEqual(String includedPaths) {
-        setIncludedPaths_GreaterEqual(includedPaths, null);
-    }
-
-    public void setIncludedPaths_GreaterEqual(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_GREATER_EQUAL, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedPaths_LessEqual(String includedPaths) {
-        setIncludedPaths_LessEqual(includedPaths, null);
-    }
-
-    public void setIncludedPaths_LessEqual(String includedPaths, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedPaths", ConditionKey.CK_LESS_EQUAL, includedPaths);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_NotEqual(String value) {
-        setValue_NotEqual(value, null, null);
-    }
-
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setValue_Equal(value, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setValue_Equal(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Equal(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setValue_Term(value, opLambda);
-    }
-
-    public void setValue_Term(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Term(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Terms(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_Terms(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("value", valueList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_InScope(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_InScope(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setValue_Terms(valueList, opLambda);
-    }
-
-    public void setValue_Prefix(String value) {
-        setValue_Prefix(value, null);
-    }
-
-    public void setValue_Prefix(String value, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Exists() {
-        setValue_Exists(null);
-    }
-
-    public void setValue_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Missing() {
-        setValue_Missing(null);
-    }
-
-    public void setValue_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterThan(String value) {
-        setValue_GreaterThan(value, null);
-    }
-
-    public void setValue_GreaterThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessThan(String value) {
-        setValue_LessThan(value, null);
-    }
-
-    public void setValue_LessThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterEqual(String value) {
-        setValue_GreaterEqual(value, null);
-    }
-
-    public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessEqual(String value) {
-        setValue_LessEqual(value, null);
-    }
-
-    public void setValue_LessEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsOverlappingHostCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsOverlappingHostCF.java
deleted file mode 100644
index 9f3abaa96576b3e7abcc8935ce3a51721cca1361..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsOverlappingHostCF.java
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.OverlappingHostCF;
-import org.codelibs.fess.es.config.cbean.cq.OverlappingHostCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsOverlappingHostCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<OverlappingHostCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<OverlappingHostCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        OverlappingHostCF mustFilter = new OverlappingHostCF();
-        OverlappingHostCF shouldFilter = new OverlappingHostCF();
-        OverlappingHostCF mustNotFilter = new OverlappingHostCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<OverlappingHostCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<OverlappingHostCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        OverlappingHostCF andFilter = new OverlappingHostCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<OverlappingHostCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<OverlappingHostCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        OverlappingHostCF orFilter = new OverlappingHostCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<OverlappingHostCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<OverlappingHostCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        OverlappingHostCF notFilter = new OverlappingHostCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<OverlappingHostCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<OverlappingHostCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        OverlappingHostCQ query = new OverlappingHostCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_NotEqual(String overlappingName) {
-        setOverlappingName_NotEqual(overlappingName, null, null);
-    }
-
-    public void setOverlappingName_NotEqual(String overlappingName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setOverlappingName_Equal(overlappingName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setOverlappingName_Equal(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
-    }
-
-    public void setOverlappingName_Equal(String overlappingName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setOverlappingName_Term(overlappingName, opLambda);
-    }
-
-    public void setOverlappingName_Term(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
-    }
-
-    public void setOverlappingName_Term(String overlappingName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("overlappingName", overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_Terms(Collection<String> overlappingNameList) {
-        setOverlappingName_Terms(overlappingNameList, null);
-    }
-
-    public void setOverlappingName_Terms(Collection<String> overlappingNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("overlappingName", overlappingNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_InScope(Collection<String> overlappingNameList) {
-        setOverlappingName_Terms(overlappingNameList, null);
-    }
-
-    public void setOverlappingName_InScope(Collection<String> overlappingNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setOverlappingName_Terms(overlappingNameList, opLambda);
-    }
-
-    public void setOverlappingName_Prefix(String overlappingName) {
-        setOverlappingName_Prefix(overlappingName, null);
-    }
-
-    public void setOverlappingName_Prefix(String overlappingName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("overlappingName", overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_Exists() {
-        setOverlappingName_Exists(null);
-    }
-
-    public void setOverlappingName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("overlappingName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_Missing() {
-        setOverlappingName_Missing(null);
-    }
-
-    public void setOverlappingName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("overlappingName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_GreaterThan(String overlappingName) {
-        setOverlappingName_GreaterThan(overlappingName, null);
-    }
-
-    public void setOverlappingName_GreaterThan(String overlappingName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("overlappingName", ConditionKey.CK_GREATER_THAN, overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_LessThan(String overlappingName) {
-        setOverlappingName_LessThan(overlappingName, null);
-    }
-
-    public void setOverlappingName_LessThan(String overlappingName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("overlappingName", ConditionKey.CK_LESS_THAN, overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_GreaterEqual(String overlappingName) {
-        setOverlappingName_GreaterEqual(overlappingName, null);
-    }
-
-    public void setOverlappingName_GreaterEqual(String overlappingName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("overlappingName", ConditionKey.CK_GREATER_EQUAL, overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setOverlappingName_LessEqual(String overlappingName) {
-        setOverlappingName_LessEqual(overlappingName, null);
-    }
-
-    public void setOverlappingName_LessEqual(String overlappingName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("overlappingName", ConditionKey.CK_LESS_EQUAL, overlappingName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_NotEqual(String regularName) {
-        setRegularName_NotEqual(regularName, null, null);
-    }
-
-    public void setRegularName_NotEqual(String regularName, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRegularName_Equal(regularName, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRegularName_Equal(String regularName) {
-        setRegularName_Term(regularName, null);
-    }
-
-    public void setRegularName_Equal(String regularName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRegularName_Term(regularName, opLambda);
-    }
-
-    public void setRegularName_Term(String regularName) {
-        setRegularName_Term(regularName, null);
-    }
-
-    public void setRegularName_Term(String regularName, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("regularName", regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_Terms(Collection<String> regularNameList) {
-        setRegularName_Terms(regularNameList, null);
-    }
-
-    public void setRegularName_Terms(Collection<String> regularNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("regularName", regularNameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_InScope(Collection<String> regularNameList) {
-        setRegularName_Terms(regularNameList, null);
-    }
-
-    public void setRegularName_InScope(Collection<String> regularNameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRegularName_Terms(regularNameList, opLambda);
-    }
-
-    public void setRegularName_Prefix(String regularName) {
-        setRegularName_Prefix(regularName, null);
-    }
-
-    public void setRegularName_Prefix(String regularName, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("regularName", regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_Exists() {
-        setRegularName_Exists(null);
-    }
-
-    public void setRegularName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("regularName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_Missing() {
-        setRegularName_Missing(null);
-    }
-
-    public void setRegularName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("regularName");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_GreaterThan(String regularName) {
-        setRegularName_GreaterThan(regularName, null);
-    }
-
-    public void setRegularName_GreaterThan(String regularName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regularName", ConditionKey.CK_GREATER_THAN, regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_LessThan(String regularName) {
-        setRegularName_LessThan(regularName, null);
-    }
-
-    public void setRegularName_LessThan(String regularName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regularName", ConditionKey.CK_LESS_THAN, regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_GreaterEqual(String regularName) {
-        setRegularName_GreaterEqual(regularName, null);
-    }
-
-    public void setRegularName_GreaterEqual(String regularName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regularName", ConditionKey.CK_GREATER_EQUAL, regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegularName_LessEqual(String regularName) {
-        setRegularName_LessEqual(regularName, null);
-    }
-
-    public void setRegularName_LessEqual(String regularName, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regularName", ConditionKey.CK_LESS_EQUAL, regularName);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsPathMappingCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsPathMappingCF.java
deleted file mode 100644
index a9e2dc8d417f3f927ce9ae4e79fd75792844a020..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsPathMappingCF.java
+++ /dev/null
@@ -1,1235 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.PathMappingCF;
-import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsPathMappingCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<PathMappingCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<PathMappingCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        PathMappingCF mustFilter = new PathMappingCF();
-        PathMappingCF shouldFilter = new PathMappingCF();
-        PathMappingCF mustNotFilter = new PathMappingCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<PathMappingCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<PathMappingCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        PathMappingCF andFilter = new PathMappingCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<PathMappingCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<PathMappingCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        PathMappingCF orFilter = new PathMappingCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<PathMappingCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<PathMappingCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        PathMappingCF notFilter = new PathMappingCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<PathMappingCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<PathMappingCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        PathMappingCQ query = new PathMappingCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_NotEqual(String processType) {
-        setProcessType_NotEqual(processType, null, null);
-    }
-
-    public void setProcessType_NotEqual(String processType, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setProcessType_Equal(processType, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setProcessType_Equal(String processType) {
-        setProcessType_Term(processType, null);
-    }
-
-    public void setProcessType_Equal(String processType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setProcessType_Term(processType, opLambda);
-    }
-
-    public void setProcessType_Term(String processType) {
-        setProcessType_Term(processType, null);
-    }
-
-    public void setProcessType_Term(String processType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("processType", processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_Terms(Collection<String> processTypeList) {
-        setProcessType_Terms(processTypeList, null);
-    }
-
-    public void setProcessType_Terms(Collection<String> processTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("processType", processTypeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_InScope(Collection<String> processTypeList) {
-        setProcessType_Terms(processTypeList, null);
-    }
-
-    public void setProcessType_InScope(Collection<String> processTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setProcessType_Terms(processTypeList, opLambda);
-    }
-
-    public void setProcessType_Prefix(String processType) {
-        setProcessType_Prefix(processType, null);
-    }
-
-    public void setProcessType_Prefix(String processType, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("processType", processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_Exists() {
-        setProcessType_Exists(null);
-    }
-
-    public void setProcessType_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("processType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_Missing() {
-        setProcessType_Missing(null);
-    }
-
-    public void setProcessType_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("processType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_GreaterThan(String processType) {
-        setProcessType_GreaterThan(processType, null);
-    }
-
-    public void setProcessType_GreaterThan(String processType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("processType", ConditionKey.CK_GREATER_THAN, processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_LessThan(String processType) {
-        setProcessType_LessThan(processType, null);
-    }
-
-    public void setProcessType_LessThan(String processType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("processType", ConditionKey.CK_LESS_THAN, processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_GreaterEqual(String processType) {
-        setProcessType_GreaterEqual(processType, null);
-    }
-
-    public void setProcessType_GreaterEqual(String processType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("processType", ConditionKey.CK_GREATER_EQUAL, processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProcessType_LessEqual(String processType) {
-        setProcessType_LessEqual(processType, null);
-    }
-
-    public void setProcessType_LessEqual(String processType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("processType", ConditionKey.CK_LESS_EQUAL, processType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_NotEqual(String regex) {
-        setRegex_NotEqual(regex, null, null);
-    }
-
-    public void setRegex_NotEqual(String regex, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRegex_Equal(regex, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRegex_Equal(String regex) {
-        setRegex_Term(regex, null);
-    }
-
-    public void setRegex_Equal(String regex, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRegex_Term(regex, opLambda);
-    }
-
-    public void setRegex_Term(String regex) {
-        setRegex_Term(regex, null);
-    }
-
-    public void setRegex_Term(String regex, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("regex", regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_Terms(Collection<String> regexList) {
-        setRegex_Terms(regexList, null);
-    }
-
-    public void setRegex_Terms(Collection<String> regexList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("regex", regexList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_InScope(Collection<String> regexList) {
-        setRegex_Terms(regexList, null);
-    }
-
-    public void setRegex_InScope(Collection<String> regexList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRegex_Terms(regexList, opLambda);
-    }
-
-    public void setRegex_Prefix(String regex) {
-        setRegex_Prefix(regex, null);
-    }
-
-    public void setRegex_Prefix(String regex, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("regex", regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_Exists() {
-        setRegex_Exists(null);
-    }
-
-    public void setRegex_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("regex");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_Missing() {
-        setRegex_Missing(null);
-    }
-
-    public void setRegex_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("regex");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_GreaterThan(String regex) {
-        setRegex_GreaterThan(regex, null);
-    }
-
-    public void setRegex_GreaterThan(String regex, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regex", ConditionKey.CK_GREATER_THAN, regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_LessThan(String regex) {
-        setRegex_LessThan(regex, null);
-    }
-
-    public void setRegex_LessThan(String regex, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regex", ConditionKey.CK_LESS_THAN, regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_GreaterEqual(String regex) {
-        setRegex_GreaterEqual(regex, null);
-    }
-
-    public void setRegex_GreaterEqual(String regex, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regex", ConditionKey.CK_GREATER_EQUAL, regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRegex_LessEqual(String regex) {
-        setRegex_LessEqual(regex, null);
-    }
-
-    public void setRegex_LessEqual(String regex, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("regex", ConditionKey.CK_LESS_EQUAL, regex);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_NotEqual(String replacement) {
-        setReplacement_NotEqual(replacement, null, null);
-    }
-
-    public void setReplacement_NotEqual(String replacement, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setReplacement_Equal(replacement, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setReplacement_Equal(String replacement) {
-        setReplacement_Term(replacement, null);
-    }
-
-    public void setReplacement_Equal(String replacement, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setReplacement_Term(replacement, opLambda);
-    }
-
-    public void setReplacement_Term(String replacement) {
-        setReplacement_Term(replacement, null);
-    }
-
-    public void setReplacement_Term(String replacement, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("replacement", replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_Terms(Collection<String> replacementList) {
-        setReplacement_Terms(replacementList, null);
-    }
-
-    public void setReplacement_Terms(Collection<String> replacementList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("replacement", replacementList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_InScope(Collection<String> replacementList) {
-        setReplacement_Terms(replacementList, null);
-    }
-
-    public void setReplacement_InScope(Collection<String> replacementList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setReplacement_Terms(replacementList, opLambda);
-    }
-
-    public void setReplacement_Prefix(String replacement) {
-        setReplacement_Prefix(replacement, null);
-    }
-
-    public void setReplacement_Prefix(String replacement, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("replacement", replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_Exists() {
-        setReplacement_Exists(null);
-    }
-
-    public void setReplacement_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("replacement");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_Missing() {
-        setReplacement_Missing(null);
-    }
-
-    public void setReplacement_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("replacement");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_GreaterThan(String replacement) {
-        setReplacement_GreaterThan(replacement, null);
-    }
-
-    public void setReplacement_GreaterThan(String replacement, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("replacement", ConditionKey.CK_GREATER_THAN, replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_LessThan(String replacement) {
-        setReplacement_LessThan(replacement, null);
-    }
-
-    public void setReplacement_LessThan(String replacement, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("replacement", ConditionKey.CK_LESS_THAN, replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_GreaterEqual(String replacement) {
-        setReplacement_GreaterEqual(replacement, null);
-    }
-
-    public void setReplacement_GreaterEqual(String replacement, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("replacement", ConditionKey.CK_GREATER_EQUAL, replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReplacement_LessEqual(String replacement) {
-        setReplacement_LessEqual(replacement, null);
-    }
-
-    public void setReplacement_LessEqual(String replacement, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("replacement", ConditionKey.CK_LESS_EQUAL, replacement);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRequestHeaderCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRequestHeaderCF.java
deleted file mode 100644
index 2c2b3259ad45e7c2e188fe65236f8ae8ec6bc374..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRequestHeaderCF.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.RequestHeaderCF;
-import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsRequestHeaderCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<RequestHeaderCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<RequestHeaderCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        RequestHeaderCF mustFilter = new RequestHeaderCF();
-        RequestHeaderCF shouldFilter = new RequestHeaderCF();
-        RequestHeaderCF mustNotFilter = new RequestHeaderCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<RequestHeaderCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<RequestHeaderCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        RequestHeaderCF andFilter = new RequestHeaderCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<RequestHeaderCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<RequestHeaderCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        RequestHeaderCF orFilter = new RequestHeaderCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<RequestHeaderCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<RequestHeaderCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        RequestHeaderCF notFilter = new RequestHeaderCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<RequestHeaderCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<RequestHeaderCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        RequestHeaderCQ query = new RequestHeaderCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_NotEqual(String value) {
-        setValue_NotEqual(value, null, null);
-    }
-
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setValue_Equal(value, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setValue_Equal(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Equal(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setValue_Term(value, opLambda);
-    }
-
-    public void setValue_Term(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Term(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Terms(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_Terms(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("value", valueList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_InScope(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_InScope(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setValue_Terms(valueList, opLambda);
-    }
-
-    public void setValue_Prefix(String value) {
-        setValue_Prefix(value, null);
-    }
-
-    public void setValue_Prefix(String value, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Exists() {
-        setValue_Exists(null);
-    }
-
-    public void setValue_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Missing() {
-        setValue_Missing(null);
-    }
-
-    public void setValue_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterThan(String value) {
-        setValue_GreaterThan(value, null);
-    }
-
-    public void setValue_GreaterThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessThan(String value) {
-        setValue_LessThan(value, null);
-    }
-
-    public void setValue_LessThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterEqual(String value) {
-        setValue_GreaterEqual(value, null);
-    }
-
-    public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessEqual(String value) {
-        setValue_LessEqual(value, null);
-    }
-
-    public void setValue_LessEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId) {
-        setWebConfigId_NotEqual(webConfigId, null, null);
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setWebConfigId_Equal(webConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setWebConfigId_Term(webConfigId, opLambda);
-    }
-
-    public void setWebConfigId_Term(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Term(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("webConfigId", webConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setWebConfigId_Terms(webConfigIdList, opLambda);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId) {
-        setWebConfigId_Prefix(webConfigId, null);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Exists() {
-        setWebConfigId_Exists(null);
-    }
-
-    public void setWebConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Missing() {
-        setWebConfigId_Missing(null);
-    }
-
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId) {
-        setWebConfigId_GreaterThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId) {
-        setWebConfigId_LessThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId) {
-        setWebConfigId_GreaterEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId) {
-        setWebConfigId_LessEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRoleTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRoleTypeCF.java
deleted file mode 100644
index 237935cfe0233e4c15fabee125670d0168ddba3d..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsRoleTypeCF.java
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.RoleTypeCF;
-import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsRoleTypeCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<RoleTypeCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<RoleTypeCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        RoleTypeCF mustFilter = new RoleTypeCF();
-        RoleTypeCF shouldFilter = new RoleTypeCF();
-        RoleTypeCF mustNotFilter = new RoleTypeCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<RoleTypeCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<RoleTypeCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        RoleTypeCF andFilter = new RoleTypeCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<RoleTypeCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<RoleTypeCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        RoleTypeCF orFilter = new RoleTypeCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<RoleTypeCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<RoleTypeCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        RoleTypeCF notFilter = new RoleTypeCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<RoleTypeCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<RoleTypeCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        RoleTypeCQ query = new RoleTypeCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_NotEqual(String value) {
-        setValue_NotEqual(value, null, null);
-    }
-
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setValue_Equal(value, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setValue_Equal(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Equal(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setValue_Term(value, opLambda);
-    }
-
-    public void setValue_Term(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Term(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Terms(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_Terms(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("value", valueList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_InScope(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_InScope(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setValue_Terms(valueList, opLambda);
-    }
-
-    public void setValue_Prefix(String value) {
-        setValue_Prefix(value, null);
-    }
-
-    public void setValue_Prefix(String value, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Exists() {
-        setValue_Exists(null);
-    }
-
-    public void setValue_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Missing() {
-        setValue_Missing(null);
-    }
-
-    public void setValue_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterThan(String value) {
-        setValue_GreaterThan(value, null);
-    }
-
-    public void setValue_GreaterThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessThan(String value) {
-        setValue_LessThan(value, null);
-    }
-
-    public void setValue_LessThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterEqual(String value) {
-        setValue_GreaterEqual(value, null);
-    }
-
-    public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessEqual(String value) {
-        setValue_LessEqual(value, null);
-    }
-
-    public void setValue_LessEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsScheduledJobCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsScheduledJobCF.java
deleted file mode 100644
index 7982a17938b732ec1d5437abd4a5be550d13e508..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsScheduledJobCF.java
+++ /dev/null
@@ -1,1832 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.ScheduledJobCF;
-import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsScheduledJobCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<ScheduledJobCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<ScheduledJobCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        ScheduledJobCF mustFilter = new ScheduledJobCF();
-        ScheduledJobCF shouldFilter = new ScheduledJobCF();
-        ScheduledJobCF mustNotFilter = new ScheduledJobCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<ScheduledJobCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<ScheduledJobCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        ScheduledJobCF andFilter = new ScheduledJobCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<ScheduledJobCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<ScheduledJobCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        ScheduledJobCF orFilter = new ScheduledJobCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<ScheduledJobCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<ScheduledJobCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        ScheduledJobCF notFilter = new ScheduledJobCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<ScheduledJobCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<ScheduledJobCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        ScheduledJobCQ query = new ScheduledJobCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAvailable_NotEqual(Boolean available) {
-        setAvailable_NotEqual(available, null, null);
-    }
-
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAvailable_Equal(available, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAvailable_Equal(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Equal(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAvailable_Term(available, opLambda);
-    }
-
-    public void setAvailable_Term(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Term(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("available", available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("available", availableList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAvailable_Terms(availableList, opLambda);
-    }
-
-    public void setAvailable_Exists() {
-        setAvailable_Exists(null);
-    }
-
-    public void setAvailable_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Missing() {
-        setAvailable_Missing(null);
-    }
-
-    public void setAvailable_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterThan(Boolean available) {
-        setAvailable_GreaterThan(available, null);
-    }
-
-    public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessThan(Boolean available) {
-        setAvailable_LessThan(available, null);
-    }
-
-    public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available) {
-        setAvailable_GreaterEqual(available, null);
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessEqual(Boolean available) {
-        setAvailable_LessEqual(available, null);
-    }
-
-    public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_NotEqual(Boolean crawler) {
-        setCrawler_NotEqual(crawler, null, null);
-    }
-
-    public void setCrawler_NotEqual(Boolean crawler, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCrawler_Equal(crawler, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCrawler_Equal(Boolean crawler) {
-        setCrawler_Term(crawler, null);
-    }
-
-    public void setCrawler_Equal(Boolean crawler, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCrawler_Term(crawler, opLambda);
-    }
-
-    public void setCrawler_Term(Boolean crawler) {
-        setCrawler_Term(crawler, null);
-    }
-
-    public void setCrawler_Term(Boolean crawler, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("crawler", crawler);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_Terms(Collection<Boolean> crawlerList) {
-        setCrawler_Terms(crawlerList, null);
-    }
-
-    public void setCrawler_Terms(Collection<Boolean> crawlerList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("crawler", crawlerList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_InScope(Collection<Boolean> crawlerList) {
-        setCrawler_Terms(crawlerList, null);
-    }
-
-    public void setCrawler_InScope(Collection<Boolean> crawlerList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCrawler_Terms(crawlerList, opLambda);
-    }
-
-    public void setCrawler_Exists() {
-        setCrawler_Exists(null);
-    }
-
-    public void setCrawler_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("crawler");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_Missing() {
-        setCrawler_Missing(null);
-    }
-
-    public void setCrawler_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("crawler");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_GreaterThan(Boolean crawler) {
-        setCrawler_GreaterThan(crawler, null);
-    }
-
-    public void setCrawler_GreaterThan(Boolean crawler, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawler", ConditionKey.CK_GREATER_THAN, crawler);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_LessThan(Boolean crawler) {
-        setCrawler_LessThan(crawler, null);
-    }
-
-    public void setCrawler_LessThan(Boolean crawler, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawler", ConditionKey.CK_LESS_THAN, crawler);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_GreaterEqual(Boolean crawler) {
-        setCrawler_GreaterEqual(crawler, null);
-    }
-
-    public void setCrawler_GreaterEqual(Boolean crawler, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawler", ConditionKey.CK_GREATER_EQUAL, crawler);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCrawler_LessEqual(Boolean crawler) {
-        setCrawler_LessEqual(crawler, null);
-    }
-
-    public void setCrawler_LessEqual(Boolean crawler, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("crawler", ConditionKey.CK_LESS_EQUAL, crawler);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_NotEqual(String cronExpression) {
-        setCronExpression_NotEqual(cronExpression, null, null);
-    }
-
-    public void setCronExpression_NotEqual(String cronExpression, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCronExpression_Equal(cronExpression, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCronExpression_Equal(String cronExpression) {
-        setCronExpression_Term(cronExpression, null);
-    }
-
-    public void setCronExpression_Equal(String cronExpression, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCronExpression_Term(cronExpression, opLambda);
-    }
-
-    public void setCronExpression_Term(String cronExpression) {
-        setCronExpression_Term(cronExpression, null);
-    }
-
-    public void setCronExpression_Term(String cronExpression, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("cronExpression", cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_Terms(Collection<String> cronExpressionList) {
-        setCronExpression_Terms(cronExpressionList, null);
-    }
-
-    public void setCronExpression_Terms(Collection<String> cronExpressionList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("cronExpression", cronExpressionList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_InScope(Collection<String> cronExpressionList) {
-        setCronExpression_Terms(cronExpressionList, null);
-    }
-
-    public void setCronExpression_InScope(Collection<String> cronExpressionList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCronExpression_Terms(cronExpressionList, opLambda);
-    }
-
-    public void setCronExpression_Prefix(String cronExpression) {
-        setCronExpression_Prefix(cronExpression, null);
-    }
-
-    public void setCronExpression_Prefix(String cronExpression, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("cronExpression", cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_Exists() {
-        setCronExpression_Exists(null);
-    }
-
-    public void setCronExpression_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("cronExpression");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_Missing() {
-        setCronExpression_Missing(null);
-    }
-
-    public void setCronExpression_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("cronExpression");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_GreaterThan(String cronExpression) {
-        setCronExpression_GreaterThan(cronExpression, null);
-    }
-
-    public void setCronExpression_GreaterThan(String cronExpression, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("cronExpression", ConditionKey.CK_GREATER_THAN, cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_LessThan(String cronExpression) {
-        setCronExpression_LessThan(cronExpression, null);
-    }
-
-    public void setCronExpression_LessThan(String cronExpression, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("cronExpression", ConditionKey.CK_LESS_THAN, cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_GreaterEqual(String cronExpression) {
-        setCronExpression_GreaterEqual(cronExpression, null);
-    }
-
-    public void setCronExpression_GreaterEqual(String cronExpression, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("cronExpression", ConditionKey.CK_GREATER_EQUAL, cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCronExpression_LessEqual(String cronExpression) {
-        setCronExpression_LessEqual(cronExpression, null);
-    }
-
-    public void setCronExpression_LessEqual(String cronExpression, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("cronExpression", ConditionKey.CK_LESS_EQUAL, cronExpression);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_NotEqual(Boolean jobLogging) {
-        setJobLogging_NotEqual(jobLogging, null, null);
-    }
-
-    public void setJobLogging_NotEqual(Boolean jobLogging, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setJobLogging_Equal(jobLogging, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setJobLogging_Equal(Boolean jobLogging) {
-        setJobLogging_Term(jobLogging, null);
-    }
-
-    public void setJobLogging_Equal(Boolean jobLogging, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setJobLogging_Term(jobLogging, opLambda);
-    }
-
-    public void setJobLogging_Term(Boolean jobLogging) {
-        setJobLogging_Term(jobLogging, null);
-    }
-
-    public void setJobLogging_Term(Boolean jobLogging, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("jobLogging", jobLogging);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_Terms(Collection<Boolean> jobLoggingList) {
-        setJobLogging_Terms(jobLoggingList, null);
-    }
-
-    public void setJobLogging_Terms(Collection<Boolean> jobLoggingList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("jobLogging", jobLoggingList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_InScope(Collection<Boolean> jobLoggingList) {
-        setJobLogging_Terms(jobLoggingList, null);
-    }
-
-    public void setJobLogging_InScope(Collection<Boolean> jobLoggingList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setJobLogging_Terms(jobLoggingList, opLambda);
-    }
-
-    public void setJobLogging_Exists() {
-        setJobLogging_Exists(null);
-    }
-
-    public void setJobLogging_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("jobLogging");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_Missing() {
-        setJobLogging_Missing(null);
-    }
-
-    public void setJobLogging_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("jobLogging");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_GreaterThan(Boolean jobLogging) {
-        setJobLogging_GreaterThan(jobLogging, null);
-    }
-
-    public void setJobLogging_GreaterThan(Boolean jobLogging, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobLogging", ConditionKey.CK_GREATER_THAN, jobLogging);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_LessThan(Boolean jobLogging) {
-        setJobLogging_LessThan(jobLogging, null);
-    }
-
-    public void setJobLogging_LessThan(Boolean jobLogging, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobLogging", ConditionKey.CK_LESS_THAN, jobLogging);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_GreaterEqual(Boolean jobLogging) {
-        setJobLogging_GreaterEqual(jobLogging, null);
-    }
-
-    public void setJobLogging_GreaterEqual(Boolean jobLogging, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobLogging", ConditionKey.CK_GREATER_EQUAL, jobLogging);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setJobLogging_LessEqual(Boolean jobLogging) {
-        setJobLogging_LessEqual(jobLogging, null);
-    }
-
-    public void setJobLogging_LessEqual(Boolean jobLogging, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("jobLogging", ConditionKey.CK_LESS_EQUAL, jobLogging);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_NotEqual(String scriptData) {
-        setScriptData_NotEqual(scriptData, null, null);
-    }
-
-    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setScriptData_Equal(scriptData, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setScriptData_Equal(String scriptData) {
-        setScriptData_Term(scriptData, null);
-    }
-
-    public void setScriptData_Equal(String scriptData, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setScriptData_Term(scriptData, opLambda);
-    }
-
-    public void setScriptData_Term(String scriptData) {
-        setScriptData_Term(scriptData, null);
-    }
-
-    public void setScriptData_Term(String scriptData, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("scriptData", scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Terms(Collection<String> scriptDataList) {
-        setScriptData_Terms(scriptDataList, null);
-    }
-
-    public void setScriptData_Terms(Collection<String> scriptDataList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("scriptData", scriptDataList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_InScope(Collection<String> scriptDataList) {
-        setScriptData_Terms(scriptDataList, null);
-    }
-
-    public void setScriptData_InScope(Collection<String> scriptDataList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setScriptData_Terms(scriptDataList, opLambda);
-    }
-
-    public void setScriptData_Prefix(String scriptData) {
-        setScriptData_Prefix(scriptData, null);
-    }
-
-    public void setScriptData_Prefix(String scriptData, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("scriptData", scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Exists() {
-        setScriptData_Exists(null);
-    }
-
-    public void setScriptData_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("scriptData");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_Missing() {
-        setScriptData_Missing(null);
-    }
-
-    public void setScriptData_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("scriptData");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_GreaterThan(String scriptData) {
-        setScriptData_GreaterThan(scriptData, null);
-    }
-
-    public void setScriptData_GreaterThan(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_GREATER_THAN, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_LessThan(String scriptData) {
-        setScriptData_LessThan(scriptData, null);
-    }
-
-    public void setScriptData_LessThan(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_LESS_THAN, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_GreaterEqual(String scriptData) {
-        setScriptData_GreaterEqual(scriptData, null);
-    }
-
-    public void setScriptData_GreaterEqual(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_GREATER_EQUAL, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptData_LessEqual(String scriptData) {
-        setScriptData_LessEqual(scriptData, null);
-    }
-
-    public void setScriptData_LessEqual(String scriptData, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptData", ConditionKey.CK_LESS_EQUAL, scriptData);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_NotEqual(String scriptType) {
-        setScriptType_NotEqual(scriptType, null, null);
-    }
-
-    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setScriptType_Equal(scriptType, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setScriptType_Equal(String scriptType) {
-        setScriptType_Term(scriptType, null);
-    }
-
-    public void setScriptType_Equal(String scriptType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setScriptType_Term(scriptType, opLambda);
-    }
-
-    public void setScriptType_Term(String scriptType) {
-        setScriptType_Term(scriptType, null);
-    }
-
-    public void setScriptType_Term(String scriptType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("scriptType", scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Terms(Collection<String> scriptTypeList) {
-        setScriptType_Terms(scriptTypeList, null);
-    }
-
-    public void setScriptType_Terms(Collection<String> scriptTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("scriptType", scriptTypeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_InScope(Collection<String> scriptTypeList) {
-        setScriptType_Terms(scriptTypeList, null);
-    }
-
-    public void setScriptType_InScope(Collection<String> scriptTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setScriptType_Terms(scriptTypeList, opLambda);
-    }
-
-    public void setScriptType_Prefix(String scriptType) {
-        setScriptType_Prefix(scriptType, null);
-    }
-
-    public void setScriptType_Prefix(String scriptType, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("scriptType", scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Exists() {
-        setScriptType_Exists(null);
-    }
-
-    public void setScriptType_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("scriptType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_Missing() {
-        setScriptType_Missing(null);
-    }
-
-    public void setScriptType_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("scriptType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_GreaterThan(String scriptType) {
-        setScriptType_GreaterThan(scriptType, null);
-    }
-
-    public void setScriptType_GreaterThan(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_GREATER_THAN, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_LessThan(String scriptType) {
-        setScriptType_LessThan(scriptType, null);
-    }
-
-    public void setScriptType_LessThan(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_LESS_THAN, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_GreaterEqual(String scriptType) {
-        setScriptType_GreaterEqual(scriptType, null);
-    }
-
-    public void setScriptType_GreaterEqual(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_GREATER_EQUAL, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScriptType_LessEqual(String scriptType) {
-        setScriptType_LessEqual(scriptType, null);
-    }
-
-    public void setScriptType_LessEqual(String scriptType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("scriptType", ConditionKey.CK_LESS_EQUAL, scriptType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_NotEqual(String target) {
-        setTarget_NotEqual(target, null, null);
-    }
-
-    public void setTarget_NotEqual(String target, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTarget_Equal(target, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTarget_Equal(String target) {
-        setTarget_Term(target, null);
-    }
-
-    public void setTarget_Equal(String target, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTarget_Term(target, opLambda);
-    }
-
-    public void setTarget_Term(String target) {
-        setTarget_Term(target, null);
-    }
-
-    public void setTarget_Term(String target, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("target", target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Terms(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
-    }
-
-    public void setTarget_Terms(Collection<String> targetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("target", targetList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_InScope(Collection<String> targetList) {
-        setTarget_Terms(targetList, null);
-    }
-
-    public void setTarget_InScope(Collection<String> targetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTarget_Terms(targetList, opLambda);
-    }
-
-    public void setTarget_Prefix(String target) {
-        setTarget_Prefix(target, null);
-    }
-
-    public void setTarget_Prefix(String target, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("target", target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Exists() {
-        setTarget_Exists(null);
-    }
-
-    public void setTarget_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("target");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_Missing() {
-        setTarget_Missing(null);
-    }
-
-    public void setTarget_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("target");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_GreaterThan(String target) {
-        setTarget_GreaterThan(target, null);
-    }
-
-    public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_GREATER_THAN, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_LessThan(String target) {
-        setTarget_LessThan(target, null);
-    }
-
-    public void setTarget_LessThan(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_LESS_THAN, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_GreaterEqual(String target) {
-        setTarget_GreaterEqual(target, null);
-    }
-
-    public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_GREATER_EQUAL, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTarget_LessEqual(String target) {
-        setTarget_LessEqual(target, null);
-    }
-
-    public void setTarget_LessEqual(String target, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("target", ConditionKey.CK_LESS_EQUAL, target);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestBadWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestBadWordCF.java
deleted file mode 100644
index db2ff02067615aab560629e5e1b1ade04d9fcb4a..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestBadWordCF.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.SuggestBadWordCF;
-import org.codelibs.fess.es.config.cbean.cq.SuggestBadWordCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsSuggestBadWordCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<SuggestBadWordCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<SuggestBadWordCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        SuggestBadWordCF mustFilter = new SuggestBadWordCF();
-        SuggestBadWordCF shouldFilter = new SuggestBadWordCF();
-        SuggestBadWordCF mustNotFilter = new SuggestBadWordCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<SuggestBadWordCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<SuggestBadWordCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        SuggestBadWordCF andFilter = new SuggestBadWordCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<SuggestBadWordCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<SuggestBadWordCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        SuggestBadWordCF orFilter = new SuggestBadWordCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<SuggestBadWordCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<SuggestBadWordCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        SuggestBadWordCF notFilter = new SuggestBadWordCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<SuggestBadWordCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<SuggestBadWordCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        SuggestBadWordCQ query = new SuggestBadWordCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_NotEqual(String suggestWord) {
-        setSuggestWord_NotEqual(suggestWord, null, null);
-    }
-
-    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSuggestWord_Equal(suggestWord, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSuggestWord_Equal(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Equal(String suggestWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSuggestWord_Term(suggestWord, opLambda);
-    }
-
-    public void setSuggestWord_Term(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Term(String suggestWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("suggestWord", suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Terms(Collection<String> suggestWordList) {
-        setSuggestWord_Terms(suggestWordList, null);
-    }
-
-    public void setSuggestWord_Terms(Collection<String> suggestWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("suggestWord", suggestWordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_InScope(Collection<String> suggestWordList) {
-        setSuggestWord_Terms(suggestWordList, null);
-    }
-
-    public void setSuggestWord_InScope(Collection<String> suggestWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSuggestWord_Terms(suggestWordList, opLambda);
-    }
-
-    public void setSuggestWord_Prefix(String suggestWord) {
-        setSuggestWord_Prefix(suggestWord, null);
-    }
-
-    public void setSuggestWord_Prefix(String suggestWord, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("suggestWord", suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Exists() {
-        setSuggestWord_Exists(null);
-    }
-
-    public void setSuggestWord_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("suggestWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Missing() {
-        setSuggestWord_Missing(null);
-    }
-
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("suggestWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_GreaterThan(String suggestWord) {
-        setSuggestWord_GreaterThan(suggestWord, null);
-    }
-
-    public void setSuggestWord_GreaterThan(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_GREATER_THAN, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_LessThan(String suggestWord) {
-        setSuggestWord_LessThan(suggestWord, null);
-    }
-
-    public void setSuggestWord_LessThan(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_LESS_THAN, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_GreaterEqual(String suggestWord) {
-        setSuggestWord_GreaterEqual(suggestWord, null);
-    }
-
-    public void setSuggestWord_GreaterEqual(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_GREATER_EQUAL, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_LessEqual(String suggestWord) {
-        setSuggestWord_LessEqual(suggestWord, null);
-    }
-
-    public void setSuggestWord_LessEqual(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_LESS_EQUAL, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_NotEqual(String targetLabel) {
-        setTargetLabel_NotEqual(targetLabel, null, null);
-    }
-
-    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTargetLabel_Equal(targetLabel, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTargetLabel_Equal(String targetLabel) {
-        setTargetLabel_Term(targetLabel, null);
-    }
-
-    public void setTargetLabel_Equal(String targetLabel, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTargetLabel_Term(targetLabel, opLambda);
-    }
-
-    public void setTargetLabel_Term(String targetLabel) {
-        setTargetLabel_Term(targetLabel, null);
-    }
-
-    public void setTargetLabel_Term(String targetLabel, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("targetLabel", targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Terms(Collection<String> targetLabelList) {
-        setTargetLabel_Terms(targetLabelList, null);
-    }
-
-    public void setTargetLabel_Terms(Collection<String> targetLabelList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("targetLabel", targetLabelList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_InScope(Collection<String> targetLabelList) {
-        setTargetLabel_Terms(targetLabelList, null);
-    }
-
-    public void setTargetLabel_InScope(Collection<String> targetLabelList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTargetLabel_Terms(targetLabelList, opLambda);
-    }
-
-    public void setTargetLabel_Prefix(String targetLabel) {
-        setTargetLabel_Prefix(targetLabel, null);
-    }
-
-    public void setTargetLabel_Prefix(String targetLabel, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("targetLabel", targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Exists() {
-        setTargetLabel_Exists(null);
-    }
-
-    public void setTargetLabel_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("targetLabel");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Missing() {
-        setTargetLabel_Missing(null);
-    }
-
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("targetLabel");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_GreaterThan(String targetLabel) {
-        setTargetLabel_GreaterThan(targetLabel, null);
-    }
-
-    public void setTargetLabel_GreaterThan(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_GREATER_THAN, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_LessThan(String targetLabel) {
-        setTargetLabel_LessThan(targetLabel, null);
-    }
-
-    public void setTargetLabel_LessThan(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_LESS_THAN, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_GreaterEqual(String targetLabel) {
-        setTargetLabel_GreaterEqual(targetLabel, null);
-    }
-
-    public void setTargetLabel_GreaterEqual(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_GREATER_EQUAL, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_LessEqual(String targetLabel) {
-        setTargetLabel_LessEqual(targetLabel, null);
-    }
-
-    public void setTargetLabel_LessEqual(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_LESS_EQUAL, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_NotEqual(String targetRole) {
-        setTargetRole_NotEqual(targetRole, null, null);
-    }
-
-    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTargetRole_Equal(targetRole, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTargetRole_Equal(String targetRole) {
-        setTargetRole_Term(targetRole, null);
-    }
-
-    public void setTargetRole_Equal(String targetRole, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTargetRole_Term(targetRole, opLambda);
-    }
-
-    public void setTargetRole_Term(String targetRole) {
-        setTargetRole_Term(targetRole, null);
-    }
-
-    public void setTargetRole_Term(String targetRole, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("targetRole", targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Terms(Collection<String> targetRoleList) {
-        setTargetRole_Terms(targetRoleList, null);
-    }
-
-    public void setTargetRole_Terms(Collection<String> targetRoleList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("targetRole", targetRoleList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_InScope(Collection<String> targetRoleList) {
-        setTargetRole_Terms(targetRoleList, null);
-    }
-
-    public void setTargetRole_InScope(Collection<String> targetRoleList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTargetRole_Terms(targetRoleList, opLambda);
-    }
-
-    public void setTargetRole_Prefix(String targetRole) {
-        setTargetRole_Prefix(targetRole, null);
-    }
-
-    public void setTargetRole_Prefix(String targetRole, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("targetRole", targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Exists() {
-        setTargetRole_Exists(null);
-    }
-
-    public void setTargetRole_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("targetRole");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Missing() {
-        setTargetRole_Missing(null);
-    }
-
-    public void setTargetRole_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("targetRole");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_GreaterThan(String targetRole) {
-        setTargetRole_GreaterThan(targetRole, null);
-    }
-
-    public void setTargetRole_GreaterThan(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_GREATER_THAN, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_LessThan(String targetRole) {
-        setTargetRole_LessThan(targetRole, null);
-    }
-
-    public void setTargetRole_LessThan(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_LESS_THAN, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_GreaterEqual(String targetRole) {
-        setTargetRole_GreaterEqual(targetRole, null);
-    }
-
-    public void setTargetRole_GreaterEqual(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_GREATER_EQUAL, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_LessEqual(String targetRole) {
-        setTargetRole_LessEqual(targetRole, null);
-    }
-
-    public void setTargetRole_LessEqual(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_LESS_EQUAL, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestElevateWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestElevateWordCF.java
deleted file mode 100644
index 7e5ec850960658b8e90215f94864d9c386abcfb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsSuggestElevateWordCF.java
+++ /dev/null
@@ -1,1361 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.SuggestElevateWordCF;
-import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsSuggestElevateWordCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<SuggestElevateWordCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<SuggestElevateWordCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        SuggestElevateWordCF mustFilter = new SuggestElevateWordCF();
-        SuggestElevateWordCF shouldFilter = new SuggestElevateWordCF();
-        SuggestElevateWordCF mustNotFilter = new SuggestElevateWordCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<SuggestElevateWordCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<SuggestElevateWordCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        SuggestElevateWordCF andFilter = new SuggestElevateWordCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<SuggestElevateWordCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<SuggestElevateWordCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        SuggestElevateWordCF orFilter = new SuggestElevateWordCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<SuggestElevateWordCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<SuggestElevateWordCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        SuggestElevateWordCF notFilter = new SuggestElevateWordCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<SuggestElevateWordCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<SuggestElevateWordCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        SuggestElevateWordCQ query = new SuggestElevateWordCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setBoost_NotEqual(Float boost) {
-        setBoost_NotEqual(boost, null, null);
-    }
-
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoost_Equal(boost, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoost_Equal(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Equal(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoost_Term(boost, opLambda);
-    }
-
-    public void setBoost_Term(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Term(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boost", boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boost", boostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoost_Terms(boostList, opLambda);
-    }
-
-    public void setBoost_Exists() {
-        setBoost_Exists(null);
-    }
-
-    public void setBoost_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Missing() {
-        setBoost_Missing(null);
-    }
-
-    public void setBoost_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterThan(Float boost) {
-        setBoost_GreaterThan(boost, null);
-    }
-
-    public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessThan(Float boost) {
-        setBoost_LessThan(boost, null);
-    }
-
-    public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterEqual(Float boost) {
-        setBoost_GreaterEqual(boost, null);
-    }
-
-    public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessEqual(Float boost) {
-        setBoost_LessEqual(boost, null);
-    }
-
-    public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_NotEqual(String reading) {
-        setReading_NotEqual(reading, null, null);
-    }
-
-    public void setReading_NotEqual(String reading, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setReading_Equal(reading, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setReading_Equal(String reading) {
-        setReading_Term(reading, null);
-    }
-
-    public void setReading_Equal(String reading, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setReading_Term(reading, opLambda);
-    }
-
-    public void setReading_Term(String reading) {
-        setReading_Term(reading, null);
-    }
-
-    public void setReading_Term(String reading, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("reading", reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_Terms(Collection<String> readingList) {
-        setReading_Terms(readingList, null);
-    }
-
-    public void setReading_Terms(Collection<String> readingList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("reading", readingList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_InScope(Collection<String> readingList) {
-        setReading_Terms(readingList, null);
-    }
-
-    public void setReading_InScope(Collection<String> readingList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setReading_Terms(readingList, opLambda);
-    }
-
-    public void setReading_Prefix(String reading) {
-        setReading_Prefix(reading, null);
-    }
-
-    public void setReading_Prefix(String reading, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("reading", reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_Exists() {
-        setReading_Exists(null);
-    }
-
-    public void setReading_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("reading");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_Missing() {
-        setReading_Missing(null);
-    }
-
-    public void setReading_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("reading");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_GreaterThan(String reading) {
-        setReading_GreaterThan(reading, null);
-    }
-
-    public void setReading_GreaterThan(String reading, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("reading", ConditionKey.CK_GREATER_THAN, reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_LessThan(String reading) {
-        setReading_LessThan(reading, null);
-    }
-
-    public void setReading_LessThan(String reading, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("reading", ConditionKey.CK_LESS_THAN, reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_GreaterEqual(String reading) {
-        setReading_GreaterEqual(reading, null);
-    }
-
-    public void setReading_GreaterEqual(String reading, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("reading", ConditionKey.CK_GREATER_EQUAL, reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReading_LessEqual(String reading) {
-        setReading_LessEqual(reading, null);
-    }
-
-    public void setReading_LessEqual(String reading, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("reading", ConditionKey.CK_LESS_EQUAL, reading);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_NotEqual(String suggestWord) {
-        setSuggestWord_NotEqual(suggestWord, null, null);
-    }
-
-    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSuggestWord_Equal(suggestWord, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSuggestWord_Equal(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Equal(String suggestWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSuggestWord_Term(suggestWord, opLambda);
-    }
-
-    public void setSuggestWord_Term(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Term(String suggestWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("suggestWord", suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Terms(Collection<String> suggestWordList) {
-        setSuggestWord_Terms(suggestWordList, null);
-    }
-
-    public void setSuggestWord_Terms(Collection<String> suggestWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("suggestWord", suggestWordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_InScope(Collection<String> suggestWordList) {
-        setSuggestWord_Terms(suggestWordList, null);
-    }
-
-    public void setSuggestWord_InScope(Collection<String> suggestWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSuggestWord_Terms(suggestWordList, opLambda);
-    }
-
-    public void setSuggestWord_Prefix(String suggestWord) {
-        setSuggestWord_Prefix(suggestWord, null);
-    }
-
-    public void setSuggestWord_Prefix(String suggestWord, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("suggestWord", suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Exists() {
-        setSuggestWord_Exists(null);
-    }
-
-    public void setSuggestWord_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("suggestWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_Missing() {
-        setSuggestWord_Missing(null);
-    }
-
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("suggestWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_GreaterThan(String suggestWord) {
-        setSuggestWord_GreaterThan(suggestWord, null);
-    }
-
-    public void setSuggestWord_GreaterThan(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_GREATER_THAN, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_LessThan(String suggestWord) {
-        setSuggestWord_LessThan(suggestWord, null);
-    }
-
-    public void setSuggestWord_LessThan(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_LESS_THAN, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_GreaterEqual(String suggestWord) {
-        setSuggestWord_GreaterEqual(suggestWord, null);
-    }
-
-    public void setSuggestWord_GreaterEqual(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_GREATER_EQUAL, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSuggestWord_LessEqual(String suggestWord) {
-        setSuggestWord_LessEqual(suggestWord, null);
-    }
-
-    public void setSuggestWord_LessEqual(String suggestWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("suggestWord", ConditionKey.CK_LESS_EQUAL, suggestWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_NotEqual(String targetLabel) {
-        setTargetLabel_NotEqual(targetLabel, null, null);
-    }
-
-    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTargetLabel_Equal(targetLabel, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTargetLabel_Equal(String targetLabel) {
-        setTargetLabel_Term(targetLabel, null);
-    }
-
-    public void setTargetLabel_Equal(String targetLabel, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTargetLabel_Term(targetLabel, opLambda);
-    }
-
-    public void setTargetLabel_Term(String targetLabel) {
-        setTargetLabel_Term(targetLabel, null);
-    }
-
-    public void setTargetLabel_Term(String targetLabel, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("targetLabel", targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Terms(Collection<String> targetLabelList) {
-        setTargetLabel_Terms(targetLabelList, null);
-    }
-
-    public void setTargetLabel_Terms(Collection<String> targetLabelList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("targetLabel", targetLabelList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_InScope(Collection<String> targetLabelList) {
-        setTargetLabel_Terms(targetLabelList, null);
-    }
-
-    public void setTargetLabel_InScope(Collection<String> targetLabelList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTargetLabel_Terms(targetLabelList, opLambda);
-    }
-
-    public void setTargetLabel_Prefix(String targetLabel) {
-        setTargetLabel_Prefix(targetLabel, null);
-    }
-
-    public void setTargetLabel_Prefix(String targetLabel, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("targetLabel", targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Exists() {
-        setTargetLabel_Exists(null);
-    }
-
-    public void setTargetLabel_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("targetLabel");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_Missing() {
-        setTargetLabel_Missing(null);
-    }
-
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("targetLabel");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_GreaterThan(String targetLabel) {
-        setTargetLabel_GreaterThan(targetLabel, null);
-    }
-
-    public void setTargetLabel_GreaterThan(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_GREATER_THAN, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_LessThan(String targetLabel) {
-        setTargetLabel_LessThan(targetLabel, null);
-    }
-
-    public void setTargetLabel_LessThan(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_LESS_THAN, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_GreaterEqual(String targetLabel) {
-        setTargetLabel_GreaterEqual(targetLabel, null);
-    }
-
-    public void setTargetLabel_GreaterEqual(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_GREATER_EQUAL, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetLabel_LessEqual(String targetLabel) {
-        setTargetLabel_LessEqual(targetLabel, null);
-    }
-
-    public void setTargetLabel_LessEqual(String targetLabel, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetLabel", ConditionKey.CK_LESS_EQUAL, targetLabel);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_NotEqual(String targetRole) {
-        setTargetRole_NotEqual(targetRole, null, null);
-    }
-
-    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setTargetRole_Equal(targetRole, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setTargetRole_Equal(String targetRole) {
-        setTargetRole_Term(targetRole, null);
-    }
-
-    public void setTargetRole_Equal(String targetRole, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setTargetRole_Term(targetRole, opLambda);
-    }
-
-    public void setTargetRole_Term(String targetRole) {
-        setTargetRole_Term(targetRole, null);
-    }
-
-    public void setTargetRole_Term(String targetRole, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("targetRole", targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Terms(Collection<String> targetRoleList) {
-        setTargetRole_Terms(targetRoleList, null);
-    }
-
-    public void setTargetRole_Terms(Collection<String> targetRoleList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("targetRole", targetRoleList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_InScope(Collection<String> targetRoleList) {
-        setTargetRole_Terms(targetRoleList, null);
-    }
-
-    public void setTargetRole_InScope(Collection<String> targetRoleList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setTargetRole_Terms(targetRoleList, opLambda);
-    }
-
-    public void setTargetRole_Prefix(String targetRole) {
-        setTargetRole_Prefix(targetRole, null);
-    }
-
-    public void setTargetRole_Prefix(String targetRole, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("targetRole", targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Exists() {
-        setTargetRole_Exists(null);
-    }
-
-    public void setTargetRole_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("targetRole");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_Missing() {
-        setTargetRole_Missing(null);
-    }
-
-    public void setTargetRole_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("targetRole");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_GreaterThan(String targetRole) {
-        setTargetRole_GreaterThan(targetRole, null);
-    }
-
-    public void setTargetRole_GreaterThan(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_GREATER_THAN, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_LessThan(String targetRole) {
-        setTargetRole_LessThan(targetRole, null);
-    }
-
-    public void setTargetRole_LessThan(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_LESS_THAN, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_GreaterEqual(String targetRole) {
-        setTargetRole_GreaterEqual(targetRole, null);
-    }
-
-    public void setTargetRole_GreaterEqual(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_GREATER_EQUAL, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setTargetRole_LessEqual(String targetRole) {
-        setTargetRole_LessEqual(targetRole, null);
-    }
-
-    public void setTargetRole_LessEqual(String targetRole, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("targetRole", ConditionKey.CK_LESS_EQUAL, targetRole);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebAuthenticationCF.java
deleted file mode 100644
index da24b6eee8cf7282726830afb73f63346b784eda..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebAuthenticationCF.java
+++ /dev/null
@@ -1,1739 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.WebAuthenticationCF;
-import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsWebAuthenticationCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<WebAuthenticationCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<WebAuthenticationCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        WebAuthenticationCF mustFilter = new WebAuthenticationCF();
-        WebAuthenticationCF shouldFilter = new WebAuthenticationCF();
-        WebAuthenticationCF mustNotFilter = new WebAuthenticationCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<WebAuthenticationCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<WebAuthenticationCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        WebAuthenticationCF andFilter = new WebAuthenticationCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<WebAuthenticationCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<WebAuthenticationCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        WebAuthenticationCF orFilter = new WebAuthenticationCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<WebAuthenticationCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<WebAuthenticationCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        WebAuthenticationCF notFilter = new WebAuthenticationCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebAuthenticationCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebAuthenticationCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        WebAuthenticationCQ query = new WebAuthenticationCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAuthRealm_NotEqual(String authRealm) {
-        setAuthRealm_NotEqual(authRealm, null, null);
-    }
-
-    public void setAuthRealm_NotEqual(String authRealm, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAuthRealm_Equal(authRealm, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAuthRealm_Equal(String authRealm) {
-        setAuthRealm_Term(authRealm, null);
-    }
-
-    public void setAuthRealm_Equal(String authRealm, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAuthRealm_Term(authRealm, opLambda);
-    }
-
-    public void setAuthRealm_Term(String authRealm) {
-        setAuthRealm_Term(authRealm, null);
-    }
-
-    public void setAuthRealm_Term(String authRealm, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("authRealm", authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_Terms(Collection<String> authRealmList) {
-        setAuthRealm_Terms(authRealmList, null);
-    }
-
-    public void setAuthRealm_Terms(Collection<String> authRealmList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("authRealm", authRealmList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_InScope(Collection<String> authRealmList) {
-        setAuthRealm_Terms(authRealmList, null);
-    }
-
-    public void setAuthRealm_InScope(Collection<String> authRealmList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAuthRealm_Terms(authRealmList, opLambda);
-    }
-
-    public void setAuthRealm_Prefix(String authRealm) {
-        setAuthRealm_Prefix(authRealm, null);
-    }
-
-    public void setAuthRealm_Prefix(String authRealm, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("authRealm", authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_Exists() {
-        setAuthRealm_Exists(null);
-    }
-
-    public void setAuthRealm_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("authRealm");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_Missing() {
-        setAuthRealm_Missing(null);
-    }
-
-    public void setAuthRealm_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("authRealm");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_GreaterThan(String authRealm) {
-        setAuthRealm_GreaterThan(authRealm, null);
-    }
-
-    public void setAuthRealm_GreaterThan(String authRealm, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("authRealm", ConditionKey.CK_GREATER_THAN, authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_LessThan(String authRealm) {
-        setAuthRealm_LessThan(authRealm, null);
-    }
-
-    public void setAuthRealm_LessThan(String authRealm, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("authRealm", ConditionKey.CK_LESS_THAN, authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_GreaterEqual(String authRealm) {
-        setAuthRealm_GreaterEqual(authRealm, null);
-    }
-
-    public void setAuthRealm_GreaterEqual(String authRealm, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("authRealm", ConditionKey.CK_GREATER_EQUAL, authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAuthRealm_LessEqual(String authRealm) {
-        setAuthRealm_LessEqual(authRealm, null);
-    }
-
-    public void setAuthRealm_LessEqual(String authRealm, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("authRealm", ConditionKey.CK_LESS_EQUAL, authRealm);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_NotEqual(String hostname) {
-        setHostname_NotEqual(hostname, null, null);
-    }
-
-    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHostname_Equal(hostname, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHostname_Equal(String hostname) {
-        setHostname_Term(hostname, null);
-    }
-
-    public void setHostname_Equal(String hostname, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHostname_Term(hostname, opLambda);
-    }
-
-    public void setHostname_Term(String hostname) {
-        setHostname_Term(hostname, null);
-    }
-
-    public void setHostname_Term(String hostname, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("hostname", hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Terms(Collection<String> hostnameList) {
-        setHostname_Terms(hostnameList, null);
-    }
-
-    public void setHostname_Terms(Collection<String> hostnameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("hostname", hostnameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_InScope(Collection<String> hostnameList) {
-        setHostname_Terms(hostnameList, null);
-    }
-
-    public void setHostname_InScope(Collection<String> hostnameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHostname_Terms(hostnameList, opLambda);
-    }
-
-    public void setHostname_Prefix(String hostname) {
-        setHostname_Prefix(hostname, null);
-    }
-
-    public void setHostname_Prefix(String hostname, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("hostname", hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Exists() {
-        setHostname_Exists(null);
-    }
-
-    public void setHostname_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("hostname");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_Missing() {
-        setHostname_Missing(null);
-    }
-
-    public void setHostname_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("hostname");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_GreaterThan(String hostname) {
-        setHostname_GreaterThan(hostname, null);
-    }
-
-    public void setHostname_GreaterThan(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_GREATER_THAN, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_LessThan(String hostname) {
-        setHostname_LessThan(hostname, null);
-    }
-
-    public void setHostname_LessThan(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_LESS_THAN, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_GreaterEqual(String hostname) {
-        setHostname_GreaterEqual(hostname, null);
-    }
-
-    public void setHostname_GreaterEqual(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_GREATER_EQUAL, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHostname_LessEqual(String hostname) {
-        setHostname_LessEqual(hostname, null);
-    }
-
-    public void setHostname_LessEqual(String hostname, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hostname", ConditionKey.CK_LESS_EQUAL, hostname);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_NotEqual(String parameters) {
-        setParameters_NotEqual(parameters, null, null);
-    }
-
-    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setParameters_Equal(parameters, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setParameters_Equal(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Equal(String parameters, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setParameters_Term(parameters, opLambda);
-    }
-
-    public void setParameters_Term(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Term(String parameters, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("parameters", parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Terms(Collection<String> parametersList) {
-        setParameters_Terms(parametersList, null);
-    }
-
-    public void setParameters_Terms(Collection<String> parametersList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("parameters", parametersList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_InScope(Collection<String> parametersList) {
-        setParameters_Terms(parametersList, null);
-    }
-
-    public void setParameters_InScope(Collection<String> parametersList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setParameters_Terms(parametersList, opLambda);
-    }
-
-    public void setParameters_Prefix(String parameters) {
-        setParameters_Prefix(parameters, null);
-    }
-
-    public void setParameters_Prefix(String parameters, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("parameters", parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Exists() {
-        setParameters_Exists(null);
-    }
-
-    public void setParameters_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("parameters");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_Missing() {
-        setParameters_Missing(null);
-    }
-
-    public void setParameters_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("parameters");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_GreaterThan(String parameters) {
-        setParameters_GreaterThan(parameters, null);
-    }
-
-    public void setParameters_GreaterThan(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_GREATER_THAN, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_LessThan(String parameters) {
-        setParameters_LessThan(parameters, null);
-    }
-
-    public void setParameters_LessThan(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_LESS_THAN, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_GreaterEqual(String parameters) {
-        setParameters_GreaterEqual(parameters, null);
-    }
-
-    public void setParameters_GreaterEqual(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_GREATER_EQUAL, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setParameters_LessEqual(String parameters) {
-        setParameters_LessEqual(parameters, null);
-    }
-
-    public void setParameters_LessEqual(String parameters, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("parameters", ConditionKey.CK_LESS_EQUAL, parameters);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_NotEqual(String password) {
-        setPassword_NotEqual(password, null, null);
-    }
-
-    public void setPassword_NotEqual(String password, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPassword_Equal(password, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPassword_Equal(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Equal(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPassword_Term(password, opLambda);
-    }
-
-    public void setPassword_Term(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Term(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("password", passwordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPassword_Terms(passwordList, opLambda);
-    }
-
-    public void setPassword_Prefix(String password) {
-        setPassword_Prefix(password, null);
-    }
-
-    public void setPassword_Prefix(String password, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Exists() {
-        setPassword_Exists(null);
-    }
-
-    public void setPassword_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Missing() {
-        setPassword_Missing(null);
-    }
-
-    public void setPassword_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterThan(String password) {
-        setPassword_GreaterThan(password, null);
-    }
-
-    public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessThan(String password) {
-        setPassword_LessThan(password, null);
-    }
-
-    public void setPassword_LessThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterEqual(String password) {
-        setPassword_GreaterEqual(password, null);
-    }
-
-    public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessEqual(String password) {
-        setPassword_LessEqual(password, null);
-    }
-
-    public void setPassword_LessEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_NotEqual(Integer port) {
-        setPort_NotEqual(port, null, null);
-    }
-
-    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPort_Equal(port, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPort_Equal(Integer port) {
-        setPort_Term(port, null);
-    }
-
-    public void setPort_Equal(Integer port, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPort_Term(port, opLambda);
-    }
-
-    public void setPort_Term(Integer port) {
-        setPort_Term(port, null);
-    }
-
-    public void setPort_Term(Integer port, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("port", port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_Terms(Collection<Integer> portList) {
-        setPort_Terms(portList, null);
-    }
-
-    public void setPort_Terms(Collection<Integer> portList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("port", portList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_InScope(Collection<Integer> portList) {
-        setPort_Terms(portList, null);
-    }
-
-    public void setPort_InScope(Collection<Integer> portList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPort_Terms(portList, opLambda);
-    }
-
-    public void setPort_Exists() {
-        setPort_Exists(null);
-    }
-
-    public void setPort_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("port");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_Missing() {
-        setPort_Missing(null);
-    }
-
-    public void setPort_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("port");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_GreaterThan(Integer port) {
-        setPort_GreaterThan(port, null);
-    }
-
-    public void setPort_GreaterThan(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_GREATER_THAN, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_LessThan(Integer port) {
-        setPort_LessThan(port, null);
-    }
-
-    public void setPort_LessThan(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_LESS_THAN, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_GreaterEqual(Integer port) {
-        setPort_GreaterEqual(port, null);
-    }
-
-    public void setPort_GreaterEqual(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_GREATER_EQUAL, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPort_LessEqual(Integer port) {
-        setPort_LessEqual(port, null);
-    }
-
-    public void setPort_LessEqual(Integer port, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("port", ConditionKey.CK_LESS_EQUAL, port);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_NotEqual(String protocolScheme) {
-        setProtocolScheme_NotEqual(protocolScheme, null, null);
-    }
-
-    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setProtocolScheme_Equal(protocolScheme, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setProtocolScheme_Equal(String protocolScheme) {
-        setProtocolScheme_Term(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Equal(String protocolScheme, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setProtocolScheme_Term(protocolScheme, opLambda);
-    }
-
-    public void setProtocolScheme_Term(String protocolScheme) {
-        setProtocolScheme_Term(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Term(String protocolScheme, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("protocolScheme", protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
-        setProtocolScheme_Terms(protocolSchemeList, null);
-    }
-
-    public void setProtocolScheme_Terms(Collection<String> protocolSchemeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("protocolScheme", protocolSchemeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_InScope(Collection<String> protocolSchemeList) {
-        setProtocolScheme_Terms(protocolSchemeList, null);
-    }
-
-    public void setProtocolScheme_InScope(Collection<String> protocolSchemeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setProtocolScheme_Terms(protocolSchemeList, opLambda);
-    }
-
-    public void setProtocolScheme_Prefix(String protocolScheme) {
-        setProtocolScheme_Prefix(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_Prefix(String protocolScheme, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("protocolScheme", protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Exists() {
-        setProtocolScheme_Exists(null);
-    }
-
-    public void setProtocolScheme_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("protocolScheme");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_Missing() {
-        setProtocolScheme_Missing(null);
-    }
-
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("protocolScheme");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_GreaterThan(String protocolScheme) {
-        setProtocolScheme_GreaterThan(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_GreaterThan(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_GREATER_THAN, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_LessThan(String protocolScheme) {
-        setProtocolScheme_LessThan(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_LessThan(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_LESS_THAN, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_GreaterEqual(String protocolScheme) {
-        setProtocolScheme_GreaterEqual(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_GreaterEqual(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_GREATER_EQUAL, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setProtocolScheme_LessEqual(String protocolScheme) {
-        setProtocolScheme_LessEqual(protocolScheme, null);
-    }
-
-    public void setProtocolScheme_LessEqual(String protocolScheme, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("protocolScheme", ConditionKey.CK_LESS_EQUAL, protocolScheme);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_NotEqual(String username) {
-        setUsername_NotEqual(username, null, null);
-    }
-
-    public void setUsername_NotEqual(String username, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUsername_Equal(username, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUsername_Equal(String username) {
-        setUsername_Term(username, null);
-    }
-
-    public void setUsername_Equal(String username, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUsername_Term(username, opLambda);
-    }
-
-    public void setUsername_Term(String username) {
-        setUsername_Term(username, null);
-    }
-
-    public void setUsername_Term(String username, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("username", username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Terms(Collection<String> usernameList) {
-        setUsername_Terms(usernameList, null);
-    }
-
-    public void setUsername_Terms(Collection<String> usernameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("username", usernameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_InScope(Collection<String> usernameList) {
-        setUsername_Terms(usernameList, null);
-    }
-
-    public void setUsername_InScope(Collection<String> usernameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUsername_Terms(usernameList, opLambda);
-    }
-
-    public void setUsername_Prefix(String username) {
-        setUsername_Prefix(username, null);
-    }
-
-    public void setUsername_Prefix(String username, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("username", username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Exists() {
-        setUsername_Exists(null);
-    }
-
-    public void setUsername_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("username");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_Missing() {
-        setUsername_Missing(null);
-    }
-
-    public void setUsername_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("username");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_GreaterThan(String username) {
-        setUsername_GreaterThan(username, null);
-    }
-
-    public void setUsername_GreaterThan(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_GREATER_THAN, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_LessThan(String username) {
-        setUsername_LessThan(username, null);
-    }
-
-    public void setUsername_LessThan(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_LESS_THAN, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_GreaterEqual(String username) {
-        setUsername_GreaterEqual(username, null);
-    }
-
-    public void setUsername_GreaterEqual(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_GREATER_EQUAL, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUsername_LessEqual(String username) {
-        setUsername_LessEqual(username, null);
-    }
-
-    public void setUsername_LessEqual(String username, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("username", ConditionKey.CK_LESS_EQUAL, username);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId) {
-        setWebConfigId_NotEqual(webConfigId, null, null);
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setWebConfigId_Equal(webConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setWebConfigId_Term(webConfigId, opLambda);
-    }
-
-    public void setWebConfigId_Term(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Term(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("webConfigId", webConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setWebConfigId_Terms(webConfigIdList, opLambda);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId) {
-        setWebConfigId_Prefix(webConfigId, null);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Exists() {
-        setWebConfigId_Exists(null);
-    }
-
-    public void setWebConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Missing() {
-        setWebConfigId_Missing(null);
-    }
-
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId) {
-        setWebConfigId_GreaterThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId) {
-        setWebConfigId_LessThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId) {
-        setWebConfigId_GreaterEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId) {
-        setWebConfigId_LessEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigCF.java
deleted file mode 100644
index c44cefbe8b276602b98284b64190866eab99faf8..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigCF.java
+++ /dev/null
@@ -1,2555 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigCF;
-import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsWebConfigCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<WebConfigCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<WebConfigCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        WebConfigCF mustFilter = new WebConfigCF();
-        WebConfigCF shouldFilter = new WebConfigCF();
-        WebConfigCF mustNotFilter = new WebConfigCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<WebConfigCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<WebConfigCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        WebConfigCF andFilter = new WebConfigCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<WebConfigCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<WebConfigCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        WebConfigCF orFilter = new WebConfigCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<WebConfigCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<WebConfigCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        WebConfigCF notFilter = new WebConfigCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        WebConfigCQ query = new WebConfigCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAvailable_NotEqual(Boolean available) {
-        setAvailable_NotEqual(available, null, null);
-    }
-
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAvailable_Equal(available, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAvailable_Equal(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Equal(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAvailable_Term(available, opLambda);
-    }
-
-    public void setAvailable_Term(Boolean available) {
-        setAvailable_Term(available, null);
-    }
-
-    public void setAvailable_Term(Boolean available, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("available", available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_Terms(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("available", availableList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList) {
-        setAvailable_Terms(availableList, null);
-    }
-
-    public void setAvailable_InScope(Collection<Boolean> availableList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAvailable_Terms(availableList, opLambda);
-    }
-
-    public void setAvailable_Exists() {
-        setAvailable_Exists(null);
-    }
-
-    public void setAvailable_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_Missing() {
-        setAvailable_Missing(null);
-    }
-
-    public void setAvailable_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("available");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterThan(Boolean available) {
-        setAvailable_GreaterThan(available, null);
-    }
-
-    public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessThan(Boolean available) {
-        setAvailable_LessThan(available, null);
-    }
-
-    public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_THAN, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available) {
-        setAvailable_GreaterEqual(available, null);
-    }
-
-    public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_GREATER_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAvailable_LessEqual(Boolean available) {
-        setAvailable_LessEqual(available, null);
-    }
-
-    public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("available", ConditionKey.CK_LESS_EQUAL, available);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_NotEqual(Float boost) {
-        setBoost_NotEqual(boost, null, null);
-    }
-
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setBoost_Equal(boost, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setBoost_Equal(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Equal(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setBoost_Term(boost, opLambda);
-    }
-
-    public void setBoost_Term(Float boost) {
-        setBoost_Term(boost, null);
-    }
-
-    public void setBoost_Term(Float boost, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("boost", boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_Terms(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("boost", boostList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList) {
-        setBoost_Terms(boostList, null);
-    }
-
-    public void setBoost_InScope(Collection<Float> boostList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setBoost_Terms(boostList, opLambda);
-    }
-
-    public void setBoost_Exists() {
-        setBoost_Exists(null);
-    }
-
-    public void setBoost_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_Missing() {
-        setBoost_Missing(null);
-    }
-
-    public void setBoost_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("boost");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterThan(Float boost) {
-        setBoost_GreaterThan(boost, null);
-    }
-
-    public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessThan(Float boost) {
-        setBoost_LessThan(boost, null);
-    }
-
-    public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_THAN, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_GreaterEqual(Float boost) {
-        setBoost_GreaterEqual(boost, null);
-    }
-
-    public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_GREATER_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setBoost_LessEqual(Float boost) {
-        setBoost_LessEqual(boost, null);
-    }
-
-    public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("boost", ConditionKey.CK_LESS_EQUAL, boost);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_NotEqual(String configParameter) {
-        setConfigParameter_NotEqual(configParameter, null, null);
-    }
-
-    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setConfigParameter_Equal(configParameter, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setConfigParameter_Equal(String configParameter) {
-        setConfigParameter_Term(configParameter, null);
-    }
-
-    public void setConfigParameter_Equal(String configParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setConfigParameter_Term(configParameter, opLambda);
-    }
-
-    public void setConfigParameter_Term(String configParameter) {
-        setConfigParameter_Term(configParameter, null);
-    }
-
-    public void setConfigParameter_Term(String configParameter, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("configParameter", configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Terms(Collection<String> configParameterList) {
-        setConfigParameter_Terms(configParameterList, null);
-    }
-
-    public void setConfigParameter_Terms(Collection<String> configParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("configParameter", configParameterList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_InScope(Collection<String> configParameterList) {
-        setConfigParameter_Terms(configParameterList, null);
-    }
-
-    public void setConfigParameter_InScope(Collection<String> configParameterList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setConfigParameter_Terms(configParameterList, opLambda);
-    }
-
-    public void setConfigParameter_Prefix(String configParameter) {
-        setConfigParameter_Prefix(configParameter, null);
-    }
-
-    public void setConfigParameter_Prefix(String configParameter, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("configParameter", configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Exists() {
-        setConfigParameter_Exists(null);
-    }
-
-    public void setConfigParameter_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("configParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_Missing() {
-        setConfigParameter_Missing(null);
-    }
-
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("configParameter");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_GreaterThan(String configParameter) {
-        setConfigParameter_GreaterThan(configParameter, null);
-    }
-
-    public void setConfigParameter_GreaterThan(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_GREATER_THAN, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_LessThan(String configParameter) {
-        setConfigParameter_LessThan(configParameter, null);
-    }
-
-    public void setConfigParameter_LessThan(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_LESS_THAN, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_GreaterEqual(String configParameter) {
-        setConfigParameter_GreaterEqual(configParameter, null);
-    }
-
-    public void setConfigParameter_GreaterEqual(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_GREATER_EQUAL, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setConfigParameter_LessEqual(String configParameter) {
-        setConfigParameter_LessEqual(configParameter, null);
-    }
-
-    public void setConfigParameter_LessEqual(String configParameter, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("configParameter", ConditionKey.CK_LESS_EQUAL, configParameter);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_NotEqual(Integer depth) {
-        setDepth_NotEqual(depth, null, null);
-    }
-
-    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setDepth_Equal(depth, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setDepth_Equal(Integer depth) {
-        setDepth_Term(depth, null);
-    }
-
-    public void setDepth_Equal(Integer depth, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setDepth_Term(depth, opLambda);
-    }
-
-    public void setDepth_Term(Integer depth) {
-        setDepth_Term(depth, null);
-    }
-
-    public void setDepth_Term(Integer depth, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("depth", depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_Terms(Collection<Integer> depthList) {
-        setDepth_Terms(depthList, null);
-    }
-
-    public void setDepth_Terms(Collection<Integer> depthList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("depth", depthList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_InScope(Collection<Integer> depthList) {
-        setDepth_Terms(depthList, null);
-    }
-
-    public void setDepth_InScope(Collection<Integer> depthList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setDepth_Terms(depthList, opLambda);
-    }
-
-    public void setDepth_Exists() {
-        setDepth_Exists(null);
-    }
-
-    public void setDepth_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("depth");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_Missing() {
-        setDepth_Missing(null);
-    }
-
-    public void setDepth_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("depth");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_GreaterThan(Integer depth) {
-        setDepth_GreaterThan(depth, null);
-    }
-
-    public void setDepth_GreaterThan(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_GREATER_THAN, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_LessThan(Integer depth) {
-        setDepth_LessThan(depth, null);
-    }
-
-    public void setDepth_LessThan(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_LESS_THAN, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_GreaterEqual(Integer depth) {
-        setDepth_GreaterEqual(depth, null);
-    }
-
-    public void setDepth_GreaterEqual(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_GREATER_EQUAL, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setDepth_LessEqual(Integer depth) {
-        setDepth_LessEqual(depth, null);
-    }
-
-    public void setDepth_LessEqual(Integer depth, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("depth", ConditionKey.CK_LESS_EQUAL, depth);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_NotEqual(String excludedDocUrls) {
-        setExcludedDocUrls_NotEqual(excludedDocUrls, null, null);
-    }
-
-    public void setExcludedDocUrls_NotEqual(String excludedDocUrls, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExcludedDocUrls_Equal(excludedDocUrls, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExcludedDocUrls_Equal(String excludedDocUrls) {
-        setExcludedDocUrls_Term(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_Equal(String excludedDocUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExcludedDocUrls_Term(excludedDocUrls, opLambda);
-    }
-
-    public void setExcludedDocUrls_Term(String excludedDocUrls) {
-        setExcludedDocUrls_Term(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_Term(String excludedDocUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("excludedDocUrls", excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_Terms(Collection<String> excludedDocUrlsList) {
-        setExcludedDocUrls_Terms(excludedDocUrlsList, null);
-    }
-
-    public void setExcludedDocUrls_Terms(Collection<String> excludedDocUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("excludedDocUrls", excludedDocUrlsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_InScope(Collection<String> excludedDocUrlsList) {
-        setExcludedDocUrls_Terms(excludedDocUrlsList, null);
-    }
-
-    public void setExcludedDocUrls_InScope(Collection<String> excludedDocUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExcludedDocUrls_Terms(excludedDocUrlsList, opLambda);
-    }
-
-    public void setExcludedDocUrls_Prefix(String excludedDocUrls) {
-        setExcludedDocUrls_Prefix(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_Prefix(String excludedDocUrls, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("excludedDocUrls", excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_Exists() {
-        setExcludedDocUrls_Exists(null);
-    }
-
-    public void setExcludedDocUrls_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("excludedDocUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_Missing() {
-        setExcludedDocUrls_Missing(null);
-    }
-
-    public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("excludedDocUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_GreaterThan(String excludedDocUrls) {
-        setExcludedDocUrls_GreaterThan(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_GreaterThan(String excludedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocUrls", ConditionKey.CK_GREATER_THAN, excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_LessThan(String excludedDocUrls) {
-        setExcludedDocUrls_LessThan(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_LessThan(String excludedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocUrls", ConditionKey.CK_LESS_THAN, excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_GreaterEqual(String excludedDocUrls) {
-        setExcludedDocUrls_GreaterEqual(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_GreaterEqual(String excludedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocUrls", ConditionKey.CK_GREATER_EQUAL, excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedDocUrls_LessEqual(String excludedDocUrls) {
-        setExcludedDocUrls_LessEqual(excludedDocUrls, null);
-    }
-
-    public void setExcludedDocUrls_LessEqual(String excludedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedDocUrls", ConditionKey.CK_LESS_EQUAL, excludedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_NotEqual(String excludedUrls) {
-        setExcludedUrls_NotEqual(excludedUrls, null, null);
-    }
-
-    public void setExcludedUrls_NotEqual(String excludedUrls, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setExcludedUrls_Equal(excludedUrls, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setExcludedUrls_Equal(String excludedUrls) {
-        setExcludedUrls_Term(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_Equal(String excludedUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setExcludedUrls_Term(excludedUrls, opLambda);
-    }
-
-    public void setExcludedUrls_Term(String excludedUrls) {
-        setExcludedUrls_Term(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_Term(String excludedUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("excludedUrls", excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_Terms(Collection<String> excludedUrlsList) {
-        setExcludedUrls_Terms(excludedUrlsList, null);
-    }
-
-    public void setExcludedUrls_Terms(Collection<String> excludedUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("excludedUrls", excludedUrlsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_InScope(Collection<String> excludedUrlsList) {
-        setExcludedUrls_Terms(excludedUrlsList, null);
-    }
-
-    public void setExcludedUrls_InScope(Collection<String> excludedUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setExcludedUrls_Terms(excludedUrlsList, opLambda);
-    }
-
-    public void setExcludedUrls_Prefix(String excludedUrls) {
-        setExcludedUrls_Prefix(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_Prefix(String excludedUrls, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("excludedUrls", excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_Exists() {
-        setExcludedUrls_Exists(null);
-    }
-
-    public void setExcludedUrls_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("excludedUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_Missing() {
-        setExcludedUrls_Missing(null);
-    }
-
-    public void setExcludedUrls_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("excludedUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_GreaterThan(String excludedUrls) {
-        setExcludedUrls_GreaterThan(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_GreaterThan(String excludedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedUrls", ConditionKey.CK_GREATER_THAN, excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_LessThan(String excludedUrls) {
-        setExcludedUrls_LessThan(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_LessThan(String excludedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedUrls", ConditionKey.CK_LESS_THAN, excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_GreaterEqual(String excludedUrls) {
-        setExcludedUrls_GreaterEqual(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_GreaterEqual(String excludedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedUrls", ConditionKey.CK_GREATER_EQUAL, excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setExcludedUrls_LessEqual(String excludedUrls) {
-        setExcludedUrls_LessEqual(excludedUrls, null);
-    }
-
-    public void setExcludedUrls_LessEqual(String excludedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("excludedUrls", ConditionKey.CK_LESS_EQUAL, excludedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_NotEqual(String includedDocUrls) {
-        setIncludedDocUrls_NotEqual(includedDocUrls, null, null);
-    }
-
-    public void setIncludedDocUrls_NotEqual(String includedDocUrls, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIncludedDocUrls_Equal(includedDocUrls, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIncludedDocUrls_Equal(String includedDocUrls) {
-        setIncludedDocUrls_Term(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_Equal(String includedDocUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIncludedDocUrls_Term(includedDocUrls, opLambda);
-    }
-
-    public void setIncludedDocUrls_Term(String includedDocUrls) {
-        setIncludedDocUrls_Term(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_Term(String includedDocUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("includedDocUrls", includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_Terms(Collection<String> includedDocUrlsList) {
-        setIncludedDocUrls_Terms(includedDocUrlsList, null);
-    }
-
-    public void setIncludedDocUrls_Terms(Collection<String> includedDocUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("includedDocUrls", includedDocUrlsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_InScope(Collection<String> includedDocUrlsList) {
-        setIncludedDocUrls_Terms(includedDocUrlsList, null);
-    }
-
-    public void setIncludedDocUrls_InScope(Collection<String> includedDocUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIncludedDocUrls_Terms(includedDocUrlsList, opLambda);
-    }
-
-    public void setIncludedDocUrls_Prefix(String includedDocUrls) {
-        setIncludedDocUrls_Prefix(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_Prefix(String includedDocUrls, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("includedDocUrls", includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_Exists() {
-        setIncludedDocUrls_Exists(null);
-    }
-
-    public void setIncludedDocUrls_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("includedDocUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_Missing() {
-        setIncludedDocUrls_Missing(null);
-    }
-
-    public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("includedDocUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_GreaterThan(String includedDocUrls) {
-        setIncludedDocUrls_GreaterThan(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_GreaterThan(String includedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocUrls", ConditionKey.CK_GREATER_THAN, includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_LessThan(String includedDocUrls) {
-        setIncludedDocUrls_LessThan(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_LessThan(String includedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocUrls", ConditionKey.CK_LESS_THAN, includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_GreaterEqual(String includedDocUrls) {
-        setIncludedDocUrls_GreaterEqual(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_GreaterEqual(String includedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocUrls", ConditionKey.CK_GREATER_EQUAL, includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedDocUrls_LessEqual(String includedDocUrls) {
-        setIncludedDocUrls_LessEqual(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_LessEqual(String includedDocUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedDocUrls", ConditionKey.CK_LESS_EQUAL, includedDocUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_NotEqual(String includedUrls) {
-        setIncludedUrls_NotEqual(includedUrls, null, null);
-    }
-
-    public void setIncludedUrls_NotEqual(String includedUrls, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIncludedUrls_Equal(includedUrls, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIncludedUrls_Equal(String includedUrls) {
-        setIncludedUrls_Term(includedUrls, null);
-    }
-
-    public void setIncludedUrls_Equal(String includedUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIncludedUrls_Term(includedUrls, opLambda);
-    }
-
-    public void setIncludedUrls_Term(String includedUrls) {
-        setIncludedUrls_Term(includedUrls, null);
-    }
-
-    public void setIncludedUrls_Term(String includedUrls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("includedUrls", includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_Terms(Collection<String> includedUrlsList) {
-        setIncludedUrls_Terms(includedUrlsList, null);
-    }
-
-    public void setIncludedUrls_Terms(Collection<String> includedUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("includedUrls", includedUrlsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_InScope(Collection<String> includedUrlsList) {
-        setIncludedUrls_Terms(includedUrlsList, null);
-    }
-
-    public void setIncludedUrls_InScope(Collection<String> includedUrlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIncludedUrls_Terms(includedUrlsList, opLambda);
-    }
-
-    public void setIncludedUrls_Prefix(String includedUrls) {
-        setIncludedUrls_Prefix(includedUrls, null);
-    }
-
-    public void setIncludedUrls_Prefix(String includedUrls, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("includedUrls", includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_Exists() {
-        setIncludedUrls_Exists(null);
-    }
-
-    public void setIncludedUrls_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("includedUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_Missing() {
-        setIncludedUrls_Missing(null);
-    }
-
-    public void setIncludedUrls_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("includedUrls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_GreaterThan(String includedUrls) {
-        setIncludedUrls_GreaterThan(includedUrls, null);
-    }
-
-    public void setIncludedUrls_GreaterThan(String includedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedUrls", ConditionKey.CK_GREATER_THAN, includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_LessThan(String includedUrls) {
-        setIncludedUrls_LessThan(includedUrls, null);
-    }
-
-    public void setIncludedUrls_LessThan(String includedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedUrls", ConditionKey.CK_LESS_THAN, includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_GreaterEqual(String includedUrls) {
-        setIncludedUrls_GreaterEqual(includedUrls, null);
-    }
-
-    public void setIncludedUrls_GreaterEqual(String includedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedUrls", ConditionKey.CK_GREATER_EQUAL, includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIncludedUrls_LessEqual(String includedUrls) {
-        setIncludedUrls_LessEqual(includedUrls, null);
-    }
-
-    public void setIncludedUrls_LessEqual(String includedUrls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("includedUrls", ConditionKey.CK_LESS_EQUAL, includedUrls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_NotEqual(Integer intervalTime) {
-        setIntervalTime_NotEqual(intervalTime, null, null);
-    }
-
-    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setIntervalTime_Equal(intervalTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setIntervalTime_Equal(Integer intervalTime) {
-        setIntervalTime_Term(intervalTime, null);
-    }
-
-    public void setIntervalTime_Equal(Integer intervalTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setIntervalTime_Term(intervalTime, opLambda);
-    }
-
-    public void setIntervalTime_Term(Integer intervalTime) {
-        setIntervalTime_Term(intervalTime, null);
-    }
-
-    public void setIntervalTime_Term(Integer intervalTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("intervalTime", intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
-        setIntervalTime_Terms(intervalTimeList, null);
-    }
-
-    public void setIntervalTime_Terms(Collection<Integer> intervalTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("intervalTime", intervalTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_InScope(Collection<Integer> intervalTimeList) {
-        setIntervalTime_Terms(intervalTimeList, null);
-    }
-
-    public void setIntervalTime_InScope(Collection<Integer> intervalTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setIntervalTime_Terms(intervalTimeList, opLambda);
-    }
-
-    public void setIntervalTime_Exists() {
-        setIntervalTime_Exists(null);
-    }
-
-    public void setIntervalTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("intervalTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_Missing() {
-        setIntervalTime_Missing(null);
-    }
-
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("intervalTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_GreaterThan(Integer intervalTime) {
-        setIntervalTime_GreaterThan(intervalTime, null);
-    }
-
-    public void setIntervalTime_GreaterThan(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_GREATER_THAN, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_LessThan(Integer intervalTime) {
-        setIntervalTime_LessThan(intervalTime, null);
-    }
-
-    public void setIntervalTime_LessThan(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_LESS_THAN, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_GreaterEqual(Integer intervalTime) {
-        setIntervalTime_GreaterEqual(intervalTime, null);
-    }
-
-    public void setIntervalTime_GreaterEqual(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_GREATER_EQUAL, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setIntervalTime_LessEqual(Integer intervalTime) {
-        setIntervalTime_LessEqual(intervalTime, null);
-    }
-
-    public void setIntervalTime_LessEqual(Integer intervalTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("intervalTime", ConditionKey.CK_LESS_EQUAL, intervalTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount) {
-        setMaxAccessCount_NotEqual(maxAccessCount, null, null);
-    }
-
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setMaxAccessCount_Equal(maxAccessCount, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setMaxAccessCount_Equal(Long maxAccessCount) {
-        setMaxAccessCount_Term(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_Equal(Long maxAccessCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setMaxAccessCount_Term(maxAccessCount, opLambda);
-    }
-
-    public void setMaxAccessCount_Term(Long maxAccessCount) {
-        setMaxAccessCount_Term(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_Term(Long maxAccessCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("maxAccessCount", maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
-        setMaxAccessCount_Terms(maxAccessCountList, null);
-    }
-
-    public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("maxAccessCount", maxAccessCountList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_InScope(Collection<Long> maxAccessCountList) {
-        setMaxAccessCount_Terms(maxAccessCountList, null);
-    }
-
-    public void setMaxAccessCount_InScope(Collection<Long> maxAccessCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setMaxAccessCount_Terms(maxAccessCountList, opLambda);
-    }
-
-    public void setMaxAccessCount_Exists() {
-        setMaxAccessCount_Exists(null);
-    }
-
-    public void setMaxAccessCount_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("maxAccessCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_Missing() {
-        setMaxAccessCount_Missing(null);
-    }
-
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("maxAccessCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_GreaterThan(Long maxAccessCount) {
-        setMaxAccessCount_GreaterThan(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_GreaterThan(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_GREATER_THAN, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_LessThan(Long maxAccessCount) {
-        setMaxAccessCount_LessThan(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_LessThan(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_LESS_THAN, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_GreaterEqual(Long maxAccessCount) {
-        setMaxAccessCount_GreaterEqual(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_GreaterEqual(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMaxAccessCount_LessEqual(Long maxAccessCount) {
-        setMaxAccessCount_LessEqual(maxAccessCount, null);
-    }
-
-    public void setMaxAccessCount_LessEqual(Long maxAccessCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("maxAccessCount", ConditionKey.CK_LESS_EQUAL, maxAccessCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_NotEqual(Integer numOfThread) {
-        setNumOfThread_NotEqual(numOfThread, null, null);
-    }
-
-    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setNumOfThread_Equal(numOfThread, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setNumOfThread_Equal(Integer numOfThread) {
-        setNumOfThread_Term(numOfThread, null);
-    }
-
-    public void setNumOfThread_Equal(Integer numOfThread, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setNumOfThread_Term(numOfThread, opLambda);
-    }
-
-    public void setNumOfThread_Term(Integer numOfThread) {
-        setNumOfThread_Term(numOfThread, null);
-    }
-
-    public void setNumOfThread_Term(Integer numOfThread, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("numOfThread", numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
-        setNumOfThread_Terms(numOfThreadList, null);
-    }
-
-    public void setNumOfThread_Terms(Collection<Integer> numOfThreadList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("numOfThread", numOfThreadList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_InScope(Collection<Integer> numOfThreadList) {
-        setNumOfThread_Terms(numOfThreadList, null);
-    }
-
-    public void setNumOfThread_InScope(Collection<Integer> numOfThreadList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setNumOfThread_Terms(numOfThreadList, opLambda);
-    }
-
-    public void setNumOfThread_Exists() {
-        setNumOfThread_Exists(null);
-    }
-
-    public void setNumOfThread_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("numOfThread");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_Missing() {
-        setNumOfThread_Missing(null);
-    }
-
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("numOfThread");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_GreaterThan(Integer numOfThread) {
-        setNumOfThread_GreaterThan(numOfThread, null);
-    }
-
-    public void setNumOfThread_GreaterThan(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_GREATER_THAN, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_LessThan(Integer numOfThread) {
-        setNumOfThread_LessThan(numOfThread, null);
-    }
-
-    public void setNumOfThread_LessThan(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_LESS_THAN, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_GreaterEqual(Integer numOfThread) {
-        setNumOfThread_GreaterEqual(numOfThread, null);
-    }
-
-    public void setNumOfThread_GreaterEqual(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_GREATER_EQUAL, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setNumOfThread_LessEqual(Integer numOfThread) {
-        setNumOfThread_LessEqual(numOfThread, null);
-    }
-
-    public void setNumOfThread_LessEqual(Integer numOfThread, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("numOfThread", ConditionKey.CK_LESS_EQUAL, numOfThread);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder) {
-        setSortOrder_NotEqual(sortOrder, null, null);
-    }
-
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSortOrder_Equal(sortOrder, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("sortOrder", sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_Terms(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("sortOrder", sortOrderList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList) {
-        setSortOrder_Terms(sortOrderList, null);
-    }
-
-    public void setSortOrder_InScope(Collection<Integer> sortOrderList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSortOrder_Terms(sortOrderList, opLambda);
-    }
-
-    public void setSortOrder_Exists() {
-        setSortOrder_Exists(null);
-    }
-
-    public void setSortOrder_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_Missing() {
-        setSortOrder_Missing(null);
-    }
-
-    public void setSortOrder_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("sortOrder");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder) {
-        setSortOrder_GreaterThan(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder) {
-        setSortOrder_LessThan(sortOrder, null);
-    }
-
-    public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder) {
-        setSortOrder_GreaterEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder) {
-        setSortOrder_LessEqual(sortOrder, null);
-    }
-
-    public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy) {
-        setUpdatedBy_NotEqual(updatedBy, null, null);
-    }
-
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedBy_Equal(updatedBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Equal(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedBy_Term(updatedBy, opLambda);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy) {
-        setUpdatedBy_Term(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Term(String updatedBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_Terms(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedBy", updatedByList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList) {
-        setUpdatedBy_Terms(updatedByList, null);
-    }
-
-    public void setUpdatedBy_InScope(Collection<String> updatedByList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedBy_Terms(updatedByList, opLambda);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy) {
-        setUpdatedBy_Prefix(updatedBy, null);
-    }
-
-    public void setUpdatedBy_Prefix(String updatedBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("updatedBy", updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Exists() {
-        setUpdatedBy_Exists(null);
-    }
-
-    public void setUpdatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_Missing() {
-        setUpdatedBy_Missing(null);
-    }
-
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy) {
-        setUpdatedBy_GreaterThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy) {
-        setUpdatedBy_LessThan(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy) {
-        setUpdatedBy_GreaterEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy) {
-        setUpdatedBy_LessEqual(updatedBy, null);
-    }
-
-    public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_NotEqual(String urls) {
-        setUrls_NotEqual(urls, null, null);
-    }
-
-    public void setUrls_NotEqual(String urls, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUrls_Equal(urls, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUrls_Equal(String urls) {
-        setUrls_Term(urls, null);
-    }
-
-    public void setUrls_Equal(String urls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUrls_Term(urls, opLambda);
-    }
-
-    public void setUrls_Term(String urls) {
-        setUrls_Term(urls, null);
-    }
-
-    public void setUrls_Term(String urls, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("urls", urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_Terms(Collection<String> urlsList) {
-        setUrls_Terms(urlsList, null);
-    }
-
-    public void setUrls_Terms(Collection<String> urlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("urls", urlsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_InScope(Collection<String> urlsList) {
-        setUrls_Terms(urlsList, null);
-    }
-
-    public void setUrls_InScope(Collection<String> urlsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUrls_Terms(urlsList, opLambda);
-    }
-
-    public void setUrls_Prefix(String urls) {
-        setUrls_Prefix(urls, null);
-    }
-
-    public void setUrls_Prefix(String urls, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("urls", urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_Exists() {
-        setUrls_Exists(null);
-    }
-
-    public void setUrls_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("urls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_Missing() {
-        setUrls_Missing(null);
-    }
-
-    public void setUrls_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("urls");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_GreaterThan(String urls) {
-        setUrls_GreaterThan(urls, null);
-    }
-
-    public void setUrls_GreaterThan(String urls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urls", ConditionKey.CK_GREATER_THAN, urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_LessThan(String urls) {
-        setUrls_LessThan(urls, null);
-    }
-
-    public void setUrls_LessThan(String urls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urls", ConditionKey.CK_LESS_THAN, urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_GreaterEqual(String urls) {
-        setUrls_GreaterEqual(urls, null);
-    }
-
-    public void setUrls_GreaterEqual(String urls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urls", ConditionKey.CK_GREATER_EQUAL, urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrls_LessEqual(String urls) {
-        setUrls_LessEqual(urls, null);
-    }
-
-    public void setUrls_LessEqual(String urls, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("urls", ConditionKey.CK_LESS_EQUAL, urls);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_NotEqual(String userAgent) {
-        setUserAgent_NotEqual(userAgent, null, null);
-    }
-
-    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUserAgent_Equal(userAgent, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUserAgent_Equal(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Equal(String userAgent, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUserAgent_Term(userAgent, opLambda);
-    }
-
-    public void setUserAgent_Term(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Term(String userAgent, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("userAgent", userAgentList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUserAgent_Terms(userAgentList, opLambda);
-    }
-
-    public void setUserAgent_Prefix(String userAgent) {
-        setUserAgent_Prefix(userAgent, null);
-    }
-
-    public void setUserAgent_Prefix(String userAgent, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Exists() {
-        setUserAgent_Exists(null);
-    }
-
-    public void setUserAgent_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Missing() {
-        setUserAgent_Missing(null);
-    }
-
-    public void setUserAgent_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_GreaterThan(String userAgent) {
-        setUserAgent_GreaterThan(userAgent, null);
-    }
-
-    public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessThan(String userAgent) {
-        setUserAgent_LessThan(userAgent, null);
-    }
-
-    public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent) {
-        setUserAgent_GreaterEqual(userAgent, null);
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessEqual(String userAgent) {
-        setUserAgent_LessEqual(userAgent, null);
-    }
-
-    public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToLabelCF.java
deleted file mode 100644
index e00df7bacea1fb4ae83ab5ca2457cbb8b7e4e756..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToLabelCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigToLabelCF;
-import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsWebConfigToLabelCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<WebConfigToLabelCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<WebConfigToLabelCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        WebConfigToLabelCF mustFilter = new WebConfigToLabelCF();
-        WebConfigToLabelCF shouldFilter = new WebConfigToLabelCF();
-        WebConfigToLabelCF mustNotFilter = new WebConfigToLabelCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<WebConfigToLabelCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<WebConfigToLabelCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        WebConfigToLabelCF andFilter = new WebConfigToLabelCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<WebConfigToLabelCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<WebConfigToLabelCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        WebConfigToLabelCF orFilter = new WebConfigToLabelCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<WebConfigToLabelCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<WebConfigToLabelCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        WebConfigToLabelCF notFilter = new WebConfigToLabelCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigToLabelCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigToLabelCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        WebConfigToLabelCQ query = new WebConfigToLabelCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId) {
-        setLabelTypeId_NotEqual(labelTypeId, null, null);
-    }
-
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setLabelTypeId_Equal(labelTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_Terms(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("labelTypeId", labelTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList) {
-        setLabelTypeId_Terms(labelTypeIdList, null);
-    }
-
-    public void setLabelTypeId_InScope(Collection<String> labelTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setLabelTypeId_Terms(labelTypeIdList, opLambda);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId) {
-        setLabelTypeId_Prefix(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_Prefix(String labelTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("labelTypeId", labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Exists() {
-        setLabelTypeId_Exists(null);
-    }
-
-    public void setLabelTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_Missing() {
-        setLabelTypeId_Missing(null);
-    }
-
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("labelTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId) {
-        setLabelTypeId_GreaterThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId) {
-        setLabelTypeId_LessThan(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId) {
-        setLabelTypeId_GreaterEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId) {
-        setLabelTypeId_LessEqual(labelTypeId, null);
-    }
-
-    public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId) {
-        setWebConfigId_NotEqual(webConfigId, null, null);
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setWebConfigId_Equal(webConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setWebConfigId_Term(webConfigId, opLambda);
-    }
-
-    public void setWebConfigId_Term(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Term(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("webConfigId", webConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setWebConfigId_Terms(webConfigIdList, opLambda);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId) {
-        setWebConfigId_Prefix(webConfigId, null);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Exists() {
-        setWebConfigId_Exists(null);
-    }
-
-    public void setWebConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Missing() {
-        setWebConfigId_Missing(null);
-    }
-
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId) {
-        setWebConfigId_GreaterThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId) {
-        setWebConfigId_LessThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId) {
-        setWebConfigId_GreaterEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId) {
-        setWebConfigId_LessEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToRoleCF.java
deleted file mode 100644
index 6c7843313e72918e5b5bc39912fd6fc9900fac3e..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsWebConfigToRoleCF.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012-2015 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.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigToRoleCF;
-import org.codelibs.fess.es.config.cbean.cq.WebConfigToRoleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsWebConfigToRoleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<WebConfigToRoleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<WebConfigToRoleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        WebConfigToRoleCF mustFilter = new WebConfigToRoleCF();
-        WebConfigToRoleCF shouldFilter = new WebConfigToRoleCF();
-        WebConfigToRoleCF mustNotFilter = new WebConfigToRoleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<WebConfigToRoleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<WebConfigToRoleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        WebConfigToRoleCF andFilter = new WebConfigToRoleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<WebConfigToRoleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<WebConfigToRoleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        WebConfigToRoleCF orFilter = new WebConfigToRoleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<WebConfigToRoleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<WebConfigToRoleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        WebConfigToRoleCF notFilter = new WebConfigToRoleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigToRoleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall<WebConfigToRoleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        WebConfigToRoleCQ query = new WebConfigToRoleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId) {
-        setRoleTypeId_NotEqual(roleTypeId, null, null);
-    }
-
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRoleTypeId_Equal(roleTypeId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_Terms(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("roleTypeId", roleTypeIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList) {
-        setRoleTypeId_Terms(roleTypeIdList, null);
-    }
-
-    public void setRoleTypeId_InScope(Collection<String> roleTypeIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRoleTypeId_Terms(roleTypeIdList, opLambda);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId) {
-        setRoleTypeId_Prefix(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_Prefix(String roleTypeId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("roleTypeId", roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Exists() {
-        setRoleTypeId_Exists(null);
-    }
-
-    public void setRoleTypeId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_Missing() {
-        setRoleTypeId_Missing(null);
-    }
-
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("roleTypeId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId) {
-        setRoleTypeId_GreaterThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId) {
-        setRoleTypeId_LessThan(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId) {
-        setRoleTypeId_GreaterEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId) {
-        setRoleTypeId_LessEqual(roleTypeId, null);
-    }
-
-    public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId) {
-        setWebConfigId_NotEqual(webConfigId, null, null);
-    }
-
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setWebConfigId_Equal(webConfigId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Equal(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setWebConfigId_Term(webConfigId, opLambda);
-    }
-
-    public void setWebConfigId_Term(String webConfigId) {
-        setWebConfigId_Term(webConfigId, null);
-    }
-
-    public void setWebConfigId_Term(String webConfigId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_Terms(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("webConfigId", webConfigIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList) {
-        setWebConfigId_Terms(webConfigIdList, null);
-    }
-
-    public void setWebConfigId_InScope(Collection<String> webConfigIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setWebConfigId_Terms(webConfigIdList, opLambda);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId) {
-        setWebConfigId_Prefix(webConfigId, null);
-    }
-
-    public void setWebConfigId_Prefix(String webConfigId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("webConfigId", webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Exists() {
-        setWebConfigId_Exists(null);
-    }
-
-    public void setWebConfigId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_Missing() {
-        setWebConfigId_Missing(null);
-    }
-
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("webConfigId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId) {
-        setWebConfigId_GreaterThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId) {
-        setWebConfigId_LessThan(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId) {
-        setWebConfigId_GreaterEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId) {
-        setWebConfigId_LessEqual(webConfigId, null);
-    }
-
-    public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index 7c9e8131b031d3c4bbe04ea59ff4ae5c2f7c951d..fa5132fe8789a1e7ebec0238ddd193a23f0db95e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.BoostDocumentRuleCF;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<BoostDocumentRuleCQ, BoostDocumentRuleCF> filteredLambda) {
+    public void filtered(FilteredCall<BoostDocumentRuleCQ, BoostDocumentRuleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<BoostDocumentRuleCQ, BoostDocumentRuleCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        BoostDocumentRuleCQ query = new BoostDocumentRuleCQ();
-        BoostDocumentRuleCF filter = new BoostDocumentRuleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<BoostDocumentRuleCQ, BoostDocumentRuleCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<BoostDocumentRuleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<BoostDocumentRuleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        BoostDocumentRuleCQ notQuery = new BoostDocumentRuleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         BoostDocumentRuleCQ mustQuery = new BoostDocumentRuleCQ();
         BoostDocumentRuleCQ shouldQuery = new BoostDocumentRuleCQ();
         BoostDocumentRuleCQ mustNotQuery = new BoostDocumentRuleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        BoostDocumentRuleCQ filterQuery = new BoostDocumentRuleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsBoostDocumentRuleCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsBoostDocumentRuleCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setBoostExpr_Equal(String boostExpr) {
         setBoostExpr_Term(boostExpr, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoostExpr_NotEqual(String boostExpr) {
+        setBoostExpr_NotTerm(boostExpr, null);
+    }
+
+    public void setBoostExpr_NotEqual(String boostExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoostExpr_NotTerm(boostExpr, opLambda);
+    }
+
+    public void setBoostExpr_NotTerm(String boostExpr) {
+        setBoostExpr_NotTerm(boostExpr, null);
+    }
+
+    public void setBoostExpr_NotTerm(String boostExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boostExpr", boostExpr));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoostExpr_Terms(Collection<String> boostExprList) {
         setBoostExpr_Terms(boostExprList, null);
     }
@@ -257,6 +361,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -404,6 +527,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -521,167 +663,39 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setSortOrder_Equal(Integer sortOrder) {
+        setSortOrder_Term(sortOrder, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setSortOrder_Term(sortOrder, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setSortOrder_Term(Integer sortOrder) {
+        setSortOrder_Term(sortOrder, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsBoostDocumentRuleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public BsBoostDocumentRuleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
     }
 
-    public void setSortOrder_Equal(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_Equal(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setSortOrder_Term(sortOrder, opLambda);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder) {
-        setSortOrder_Term(sortOrder, null);
-    }
-
-    public void setSortOrder_Term(Integer sortOrder, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("sortOrder", sortOrder);
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -823,6 +837,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -970,6 +1003,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -1106,6 +1158,25 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrlExpr_NotEqual(String urlExpr) {
+        setUrlExpr_NotTerm(urlExpr, null);
+    }
+
+    public void setUrlExpr_NotEqual(String urlExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUrlExpr_NotTerm(urlExpr, opLambda);
+    }
+
+    public void setUrlExpr_NotTerm(String urlExpr) {
+        setUrlExpr_NotTerm(urlExpr, null);
+    }
+
+    public void setUrlExpr_NotTerm(String urlExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("urlExpr", urlExpr));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrlExpr_Terms(Collection<String> urlExprList) {
         setUrlExpr_Terms(urlExprList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java
index 5c0df1b6830fe95b9d4201b6145efd75b384a200..e1e22171ff9289fe72a0bf5568c478c42be3a3f1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.CrawlingSessionCF;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<CrawlingSessionCQ, CrawlingSessionCF> filteredLambda) {
+    public void filtered(FilteredCall<CrawlingSessionCQ, CrawlingSessionCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<CrawlingSessionCQ, CrawlingSessionCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        CrawlingSessionCQ query = new CrawlingSessionCQ();
-        CrawlingSessionCF filter = new CrawlingSessionCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<CrawlingSessionCQ, CrawlingSessionCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<CrawlingSessionCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<CrawlingSessionCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        CrawlingSessionCQ notQuery = new CrawlingSessionCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
         CrawlingSessionCQ mustQuery = new CrawlingSessionCQ();
         CrawlingSessionCQ shouldQuery = new CrawlingSessionCQ();
         CrawlingSessionCQ mustNotQuery = new CrawlingSessionCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        CrawlingSessionCQ filterQuery = new CrawlingSessionCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +108,73 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsCrawlingSessionCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsCrawlingSessionCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedTime_Equal(Long createdTime) {
         setCreatedTime_Term(createdTime, null);
     }
@@ -110,6 +194,25 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -246,6 +349,25 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExpiredTime_NotEqual(Long expiredTime) {
+        setExpiredTime_NotTerm(expiredTime, null);
+    }
+
+    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExpiredTime_NotTerm(expiredTime, opLambda);
+    }
+
+    public void setExpiredTime_NotTerm(Long expiredTime) {
+        setExpiredTime_NotTerm(expiredTime, null);
+    }
+
+    public void setExpiredTime_NotTerm(Long expiredTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("expiredTime", expiredTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExpiredTime_Terms(Collection<Long> expiredTimeList) {
         setExpiredTime_Terms(expiredTimeList, null);
     }
@@ -363,167 +485,39 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsCrawlingSessionCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsCrawlingSessionCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,6 +670,25 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSessionId_NotEqual(String sessionId) {
+        setSessionId_NotTerm(sessionId, null);
+    }
+
+    public void setSessionId_NotEqual(String sessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSessionId_NotTerm(sessionId, opLambda);
+    }
+
+    public void setSessionId_NotTerm(String sessionId) {
+        setSessionId_NotTerm(sessionId, null);
+    }
+
+    public void setSessionId_NotTerm(String sessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sessionId", sessionId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSessionId_Terms(Collection<String> sessionIdList) {
         setSessionId_Terms(sessionIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java
index 53134cec2740ff0bc6f3bf0d687f8cbb01acc027..7f4f31add8b9f3d352f6a6eba2522024c4d35e85 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.CrawlingSessionInfoCF;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<CrawlingSessionInfoCQ, CrawlingSessionInfoCF> filteredLambda) {
+    public void filtered(FilteredCall<CrawlingSessionInfoCQ, CrawlingSessionInfoCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<CrawlingSessionInfoCQ, CrawlingSessionInfoCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        CrawlingSessionInfoCQ query = new CrawlingSessionInfoCQ();
-        CrawlingSessionInfoCF filter = new CrawlingSessionInfoCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<CrawlingSessionInfoCQ, CrawlingSessionInfoCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<CrawlingSessionInfoCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<CrawlingSessionInfoCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        CrawlingSessionInfoCQ notQuery = new CrawlingSessionInfoCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
         CrawlingSessionInfoCQ mustQuery = new CrawlingSessionInfoCQ();
         CrawlingSessionInfoCQ shouldQuery = new CrawlingSessionInfoCQ();
         CrawlingSessionInfoCQ mustNotQuery = new CrawlingSessionInfoCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        CrawlingSessionInfoCQ filterQuery = new CrawlingSessionInfoCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsCrawlingSessionInfoCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsCrawlingSessionInfoCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCrawlingSessionId_Equal(String crawlingSessionId) {
         setCrawlingSessionId_Term(crawlingSessionId, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCrawlingSessionId_NotEqual(String crawlingSessionId) {
+        setCrawlingSessionId_NotTerm(crawlingSessionId, null);
+    }
+
+    public void setCrawlingSessionId_NotEqual(String crawlingSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCrawlingSessionId_NotTerm(crawlingSessionId, opLambda);
+    }
+
+    public void setCrawlingSessionId_NotTerm(String crawlingSessionId) {
+        setCrawlingSessionId_NotTerm(crawlingSessionId, null);
+    }
+
+    public void setCrawlingSessionId_NotTerm(String crawlingSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawlingSessionId", crawlingSessionId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCrawlingSessionId_Terms(Collection<String> crawlingSessionIdList) {
         setCrawlingSessionId_Terms(crawlingSessionIdList, null);
     }
@@ -257,6 +361,25 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -374,167 +497,39 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setKey_Equal(String key) {
+        setKey_Term(key, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setKey_Equal(String key, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setKey_Term(key, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setKey_Term(String key) {
+        setKey_Term(key, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setKey_Term(String key, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("key", key);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsCrawlingSessionInfoCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsCrawlingSessionInfoCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setKey_NotEqual(String key) {
+        setKey_NotTerm(key, null);
     }
 
-    public void setKey_Equal(String key) {
-        setKey_Term(key, null);
+    public void setKey_NotEqual(String key, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setKey_NotTerm(key, opLambda);
     }
 
-    public void setKey_Equal(String key, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setKey_Term(key, opLambda);
-    }
-
-    public void setKey_Term(String key) {
-        setKey_Term(key, null);
+    public void setKey_NotTerm(String key) {
+        setKey_NotTerm(key, null);
     }
 
-    public void setKey_Term(String key, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("key", key);
+    public void setKey_NotTerm(String key, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("key", key));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,6 +682,25 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_NotEqual(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_Terms(Collection<String> valueList) {
         setValue_Terms(valueList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index d70acf38bf2b1935892e2784faa21a90b6652ff8..d236e5df30abc6ad21f5bbed7d037373ba716f5d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigCF;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<DataConfigCQ, DataConfigCF> filteredLambda) {
+    public void filtered(FilteredCall<DataConfigCQ, DataConfigCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<DataConfigCQ, DataConfigCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        DataConfigCQ query = new DataConfigCQ();
-        DataConfigCF filter = new DataConfigCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<DataConfigCQ, DataConfigCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<DataConfigCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<DataConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        DataConfigCQ notQuery = new DataConfigCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         DataConfigCQ mustQuery = new DataConfigCQ();
         DataConfigCQ shouldQuery = new DataConfigCQ();
         DataConfigCQ mustNotQuery = new DataConfigCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        DataConfigCQ filterQuery = new DataConfigCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsDataConfigCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsDataConfigCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAvailable_Equal(Boolean available) {
         setAvailable_Term(available, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAvailable_NotEqual(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAvailable_Terms(Collection<Boolean> availableList) {
         setAvailable_Terms(availableList, null);
     }
@@ -245,6 +349,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoost_NotEqual(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoost_Terms(Collection<Float> boostList) {
         setBoost_Terms(boostList, null);
     }
@@ -381,6 +504,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -528,6 +670,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -664,6 +825,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerName_NotEqual(String handlerName) {
+        setHandlerName_NotTerm(handlerName, null);
+    }
+
+    public void setHandlerName_NotEqual(String handlerName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHandlerName_NotTerm(handlerName, opLambda);
+    }
+
+    public void setHandlerName_NotTerm(String handlerName) {
+        setHandlerName_NotTerm(handlerName, null);
+    }
+
+    public void setHandlerName_NotTerm(String handlerName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerName", handlerName));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerName_Terms(Collection<String> handlerNameList) {
         setHandlerName_Terms(handlerNameList, null);
     }
@@ -811,6 +991,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerParameter_NotEqual(String handlerParameter) {
+        setHandlerParameter_NotTerm(handlerParameter, null);
+    }
+
+    public void setHandlerParameter_NotEqual(String handlerParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHandlerParameter_NotTerm(handlerParameter, opLambda);
+    }
+
+    public void setHandlerParameter_NotTerm(String handlerParameter) {
+        setHandlerParameter_NotTerm(handlerParameter, null);
+    }
+
+    public void setHandlerParameter_NotTerm(String handlerParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerParameter", handlerParameter));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerParameter_Terms(Collection<String> handlerParameterList) {
         setHandlerParameter_Terms(handlerParameterList, null);
     }
@@ -958,6 +1157,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerScript_NotEqual(String handlerScript) {
+        setHandlerScript_NotTerm(handlerScript, null);
+    }
+
+    public void setHandlerScript_NotEqual(String handlerScript, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHandlerScript_NotTerm(handlerScript, opLambda);
+    }
+
+    public void setHandlerScript_NotTerm(String handlerScript) {
+        setHandlerScript_NotTerm(handlerScript, null);
+    }
+
+    public void setHandlerScript_NotTerm(String handlerScript, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerScript", handlerScript));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerScript_Terms(Collection<String> handlerScriptList) {
         setHandlerScript_Terms(handlerScriptList, null);
     }
@@ -1086,167 +1304,39 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsDataConfigCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public BsDataConfigCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1399,6 +1489,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -1535,6 +1644,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1682,6 +1810,25 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
index 26ebe6b154c986c031db6e316965804c85df307f..57bbc59b335b75b79426cfa2b6c4741f0f5939fc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigToLabelCF;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<DataConfigToLabelCQ, DataConfigToLabelCF> filteredLambda) {
+    public void filtered(FilteredCall<DataConfigToLabelCQ, DataConfigToLabelCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<DataConfigToLabelCQ, DataConfigToLabelCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        DataConfigToLabelCQ query = new DataConfigToLabelCQ();
-        DataConfigToLabelCF filter = new DataConfigToLabelCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<DataConfigToLabelCQ, DataConfigToLabelCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<DataConfigToLabelCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<DataConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        DataConfigToLabelCQ notQuery = new DataConfigToLabelCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         DataConfigToLabelCQ mustQuery = new DataConfigToLabelCQ();
         DataConfigToLabelCQ shouldQuery = new DataConfigToLabelCQ();
         DataConfigToLabelCQ mustNotQuery = new DataConfigToLabelCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        DataConfigToLabelCQ filterQuery = new DataConfigToLabelCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsDataConfigToLabelCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsDataConfigToLabelCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setDataConfigId_Equal(String dataConfigId) {
         setDataConfigId_Term(dataConfigId, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDataConfigId_NotEqual(String dataConfigId) {
+        setDataConfigId_NotTerm(dataConfigId, null);
+    }
+
+    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setDataConfigId_NotTerm(dataConfigId, opLambda);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId) {
+        setDataConfigId_NotTerm(dataConfigId, null);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("dataConfigId", dataConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
         setDataConfigId_Terms(dataConfigIdList, null);
     }
@@ -238,167 +342,39 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setLabelTypeId_Equal(String labelTypeId) {
+        setLabelTypeId_Term(labelTypeId, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLabelTypeId_Term(labelTypeId, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setLabelTypeId_Term(String labelTypeId) {
+        setLabelTypeId_Term(labelTypeId, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsDataConfigToLabelCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsDataConfigToLabelCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
+    public void setLabelTypeId_NotEqual(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
     }
 
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
+    public void setLabelTypeId_NotTerm(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
index dd7b3d037984e82058e087b66e051bc865b7f7c7..c8892c03c7619cc0b0994397bf114a19a640cdbe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.DataConfigToRoleCF;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<DataConfigToRoleCQ, DataConfigToRoleCF> filteredLambda) {
+    public void filtered(FilteredCall<DataConfigToRoleCQ, DataConfigToRoleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<DataConfigToRoleCQ, DataConfigToRoleCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        DataConfigToRoleCQ query = new DataConfigToRoleCQ();
-        DataConfigToRoleCF filter = new DataConfigToRoleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<DataConfigToRoleCQ, DataConfigToRoleCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<DataConfigToRoleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<DataConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        DataConfigToRoleCQ notQuery = new DataConfigToRoleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         DataConfigToRoleCQ mustQuery = new DataConfigToRoleCQ();
         DataConfigToRoleCQ shouldQuery = new DataConfigToRoleCQ();
         DataConfigToRoleCQ mustNotQuery = new DataConfigToRoleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        DataConfigToRoleCQ filterQuery = new DataConfigToRoleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +108,73 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsDataConfigToRoleCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsDataConfigToRoleCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setDataConfigId_Equal(String dataConfigId) {
         setDataConfigId_Term(dataConfigId, null);
     }
@@ -110,6 +194,25 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDataConfigId_NotEqual(String dataConfigId) {
+        setDataConfigId_NotTerm(dataConfigId, null);
+    }
+
+    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setDataConfigId_NotTerm(dataConfigId, opLambda);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId) {
+        setDataConfigId_NotTerm(dataConfigId, null);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("dataConfigId", dataConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
         setDataConfigId_Terms(dataConfigIdList, null);
     }
@@ -238,167 +341,39 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setRoleTypeId_Equal(String roleTypeId) {
+        setRoleTypeId_Term(roleTypeId, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRoleTypeId_Term(roleTypeId, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setRoleTypeId_Term(String roleTypeId) {
+        setRoleTypeId_Term(roleTypeId, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsDataConfigToRoleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsDataConfigToRoleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
+    public void setRoleTypeId_NotEqual(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
     }
 
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
+    public void setRoleTypeId_NotTerm(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index 955ff3f4f3a2179ecb563195dbcd547a5d2e0754..9b0417df067be535bbf92fee632a5dddf5a3caeb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.FailureUrlCF;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FailureUrlCQ, FailureUrlCF> filteredLambda) {
+    public void filtered(FilteredCall<FailureUrlCQ, FailureUrlCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FailureUrlCQ, FailureUrlCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FailureUrlCQ query = new FailureUrlCQ();
-        FailureUrlCF filter = new FailureUrlCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FailureUrlCQ, FailureUrlCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FailureUrlCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FailureUrlCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FailureUrlCQ notQuery = new FailureUrlCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         FailureUrlCQ mustQuery = new FailureUrlCQ();
         FailureUrlCQ shouldQuery = new FailureUrlCQ();
         FailureUrlCQ mustNotQuery = new FailureUrlCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FailureUrlCQ filterQuery = new FailureUrlCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFailureUrlCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFailureUrlCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setConfigId_Equal(String configId) {
         setConfigId_Term(configId, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigId_NotEqual(String configId) {
+        setConfigId_NotTerm(configId, null);
+    }
+
+    public void setConfigId_NotEqual(String configId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setConfigId_NotTerm(configId, opLambda);
+    }
+
+    public void setConfigId_NotTerm(String configId) {
+        setConfigId_NotTerm(configId, null);
+    }
+
+    public void setConfigId_NotTerm(String configId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configId", configId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigId_Terms(Collection<String> configIdList) {
         setConfigId_Terms(configIdList, null);
     }
@@ -256,6 +360,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setErrorCount_NotEqual(Integer errorCount) {
+        setErrorCount_NotTerm(errorCount, null);
+    }
+
+    public void setErrorCount_NotEqual(Integer errorCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setErrorCount_NotTerm(errorCount, opLambda);
+    }
+
+    public void setErrorCount_NotTerm(Integer errorCount) {
+        setErrorCount_NotTerm(errorCount, null);
+    }
+
+    public void setErrorCount_NotTerm(Integer errorCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorCount", errorCount));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setErrorCount_Terms(Collection<Integer> errorCountList) {
         setErrorCount_Terms(errorCountList, null);
     }
@@ -392,6 +515,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setErrorLog_NotEqual(String errorLog) {
+        setErrorLog_NotTerm(errorLog, null);
+    }
+
+    public void setErrorLog_NotEqual(String errorLog, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setErrorLog_NotTerm(errorLog, opLambda);
+    }
+
+    public void setErrorLog_NotTerm(String errorLog) {
+        setErrorLog_NotTerm(errorLog, null);
+    }
+
+    public void setErrorLog_NotTerm(String errorLog, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorLog", errorLog));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setErrorLog_Terms(Collection<String> errorLogList) {
         setErrorLog_Terms(errorLogList, null);
     }
@@ -539,6 +681,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setErrorName_NotEqual(String errorName) {
+        setErrorName_NotTerm(errorName, null);
+    }
+
+    public void setErrorName_NotEqual(String errorName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setErrorName_NotTerm(errorName, opLambda);
+    }
+
+    public void setErrorName_NotTerm(String errorName) {
+        setErrorName_NotTerm(errorName, null);
+    }
+
+    public void setErrorName_NotTerm(String errorName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorName", errorName));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setErrorName_Terms(Collection<String> errorNameList) {
         setErrorName_Terms(errorNameList, null);
     }
@@ -667,167 +828,39 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setLastAccessTime_Equal(Long lastAccessTime) {
+        setLastAccessTime_Term(lastAccessTime, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLastAccessTime_Equal(Long lastAccessTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLastAccessTime_Term(lastAccessTime, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setLastAccessTime_Term(Long lastAccessTime) {
+        setLastAccessTime_Term(lastAccessTime, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setLastAccessTime_Term(Long lastAccessTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("lastAccessTime", lastAccessTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsFailureUrlCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsFailureUrlCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setLastAccessTime_Equal(Long lastAccessTime) {
-        setLastAccessTime_Term(lastAccessTime, null);
+    public void setLastAccessTime_NotEqual(Long lastAccessTime) {
+        setLastAccessTime_NotTerm(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_Equal(Long lastAccessTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLastAccessTime_Term(lastAccessTime, opLambda);
+    public void setLastAccessTime_NotEqual(Long lastAccessTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setLastAccessTime_NotTerm(lastAccessTime, opLambda);
     }
 
-    public void setLastAccessTime_Term(Long lastAccessTime) {
-        setLastAccessTime_Term(lastAccessTime, null);
+    public void setLastAccessTime_NotTerm(Long lastAccessTime) {
+        setLastAccessTime_NotTerm(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_Term(Long lastAccessTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("lastAccessTime", lastAccessTime);
+    public void setLastAccessTime_NotTerm(Long lastAccessTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("lastAccessTime", lastAccessTime));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -969,6 +1002,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setThreadName_NotEqual(String threadName) {
+        setThreadName_NotTerm(threadName, null);
+    }
+
+    public void setThreadName_NotEqual(String threadName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setThreadName_NotTerm(threadName, opLambda);
+    }
+
+    public void setThreadName_NotTerm(String threadName) {
+        setThreadName_NotTerm(threadName, null);
+    }
+
+    public void setThreadName_NotTerm(String threadName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("threadName", threadName));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setThreadName_Terms(Collection<String> threadNameList) {
         setThreadName_Terms(threadNameList, null);
     }
@@ -1116,6 +1168,25 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_NotEqual(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_Terms(Collection<String> urlList) {
         setUrl_Terms(urlList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index d02155137c3711783d1161c5a8a826e1bc05f070..8badee89512a4cb2f7bdc30fe73c38b1d1e186af 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.FileAuthenticationCF;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FileAuthenticationCQ, FileAuthenticationCF> filteredLambda) {
+    public void filtered(FilteredCall<FileAuthenticationCQ, FileAuthenticationCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FileAuthenticationCQ, FileAuthenticationCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FileAuthenticationCQ query = new FileAuthenticationCQ();
-        FileAuthenticationCF filter = new FileAuthenticationCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FileAuthenticationCQ, FileAuthenticationCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FileAuthenticationCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FileAuthenticationCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FileAuthenticationCQ notQuery = new FileAuthenticationCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         FileAuthenticationCQ mustQuery = new FileAuthenticationCQ();
         FileAuthenticationCQ shouldQuery = new FileAuthenticationCQ();
         FileAuthenticationCQ mustNotQuery = new FileAuthenticationCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FileAuthenticationCQ filterQuery = new FileAuthenticationCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFileAuthenticationCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFileAuthenticationCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -257,6 +361,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -393,6 +516,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_NotEqual(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
         setFileConfigId_Terms(fileConfigIdList, null);
     }
@@ -540,6 +682,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHostname_NotEqual(String hostname) {
+        setHostname_NotTerm(hostname, null);
+    }
+
+    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHostname_NotTerm(hostname, opLambda);
+    }
+
+    public void setHostname_NotTerm(String hostname) {
+        setHostname_NotTerm(hostname, null);
+    }
+
+    public void setHostname_NotTerm(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hostname", hostname));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHostname_Terms(Collection<String> hostnameList) {
         setHostname_Terms(hostnameList, null);
     }
@@ -668,167 +829,39 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setParameters_Equal(String parameters) {
+        setParameters_Term(parameters, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setParameters_Equal(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setParameters_Term(parameters, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setParameters_Term(String parameters) {
+        setParameters_Term(parameters, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setParameters_Term(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setParameters_NotEqual(String parameters) {
+        setParameters_NotTerm(parameters, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setParameters_NotTerm(parameters, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setParameters_NotTerm(String parameters) {
+        setParameters_NotTerm(parameters, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsFileAuthenticationCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsFileAuthenticationCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setParameters_Equal(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Equal(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setParameters_Term(parameters, opLambda);
-    }
-
-    public void setParameters_Term(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Term(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("parameters", parameters);
+    public void setParameters_NotTerm(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("parameters", parameters));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -981,6 +1014,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_NotEqual(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotEqual(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
+    }
+
+    public void setPassword_NotTerm(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotTerm(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("password", password));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_Terms(Collection<String> passwordList) {
         setPassword_Terms(passwordList, null);
     }
@@ -1128,6 +1180,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPort_NotEqual(Integer port) {
+        setPort_NotTerm(port, null);
+    }
+
+    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPort_NotTerm(port, opLambda);
+    }
+
+    public void setPort_NotTerm(Integer port) {
+        setPort_NotTerm(port, null);
+    }
+
+    public void setPort_NotTerm(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("port", port));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPort_Terms(Collection<Integer> portList) {
         setPort_Terms(portList, null);
     }
@@ -1264,6 +1335,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setProtocolScheme_NotEqual(String protocolScheme) {
+        setProtocolScheme_NotTerm(protocolScheme, null);
+    }
+
+    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setProtocolScheme_NotTerm(protocolScheme, opLambda);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme) {
+        setProtocolScheme_NotTerm(protocolScheme, null);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("protocolScheme", protocolScheme));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
         setProtocolScheme_Terms(protocolSchemeList, null);
     }
@@ -1411,6 +1501,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1558,6 +1667,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -1694,6 +1822,25 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUsername_NotEqual(String username) {
+        setUsername_NotTerm(username, null);
+    }
+
+    public void setUsername_NotEqual(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUsername_NotTerm(username, opLambda);
+    }
+
+    public void setUsername_NotTerm(String username) {
+        setUsername_NotTerm(username, null);
+    }
+
+    public void setUsername_NotTerm(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("username", username));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUsername_Terms(Collection<String> usernameList) {
         setUsername_Terms(usernameList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index 15d63a344bea6e6b9878b812a7bc96ad53b56dee..23be2299acd049faedbe42d636402383ae3866fd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigCF;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FileConfigCQ, FileConfigCF> filteredLambda) {
+    public void filtered(FilteredCall<FileConfigCQ, FileConfigCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FileConfigCQ, FileConfigCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FileConfigCQ query = new FileConfigCQ();
-        FileConfigCF filter = new FileConfigCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FileConfigCQ, FileConfigCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FileConfigCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FileConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FileConfigCQ notQuery = new FileConfigCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         FileConfigCQ mustQuery = new FileConfigCQ();
         FileConfigCQ shouldQuery = new FileConfigCQ();
         FileConfigCQ mustNotQuery = new FileConfigCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FileConfigCQ filterQuery = new FileConfigCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFileConfigCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFileConfigCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAvailable_Equal(Boolean available) {
         setAvailable_Term(available, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAvailable_NotEqual(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAvailable_Terms(Collection<Boolean> availableList) {
         setAvailable_Terms(availableList, null);
     }
@@ -245,6 +349,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoost_NotEqual(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoost_Terms(Collection<Float> boostList) {
         setBoost_Terms(boostList, null);
     }
@@ -381,6 +504,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigParameter_NotEqual(String configParameter) {
+        setConfigParameter_NotTerm(configParameter, null);
+    }
+
+    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setConfigParameter_NotTerm(configParameter, opLambda);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter) {
+        setConfigParameter_NotTerm(configParameter, null);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configParameter", configParameter));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigParameter_Terms(Collection<String> configParameterList) {
         setConfigParameter_Terms(configParameterList, null);
     }
@@ -528,6 +670,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -675,6 +836,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -811,6 +991,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDepth_NotEqual(Integer depth) {
+        setDepth_NotTerm(depth, null);
+    }
+
+    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setDepth_NotTerm(depth, opLambda);
+    }
+
+    public void setDepth_NotTerm(Integer depth) {
+        setDepth_NotTerm(depth, null);
+    }
+
+    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("depth", depth));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDepth_Terms(Collection<Integer> depthList) {
         setDepth_Terms(depthList, null);
     }
@@ -947,6 +1146,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedDocPaths_NotEqual(String excludedDocPaths) {
+        setExcludedDocPaths_NotTerm(excludedDocPaths, null);
+    }
+
+    public void setExcludedDocPaths_NotEqual(String excludedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExcludedDocPaths_NotTerm(excludedDocPaths, opLambda);
+    }
+
+    public void setExcludedDocPaths_NotTerm(String excludedDocPaths) {
+        setExcludedDocPaths_NotTerm(excludedDocPaths, null);
+    }
+
+    public void setExcludedDocPaths_NotTerm(String excludedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedDocPaths", excludedDocPaths));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedDocPaths_Terms(Collection<String> excludedDocPathsList) {
         setExcludedDocPaths_Terms(excludedDocPathsList, null);
     }
@@ -1094,6 +1312,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedPaths_NotEqual(String excludedPaths) {
+        setExcludedPaths_NotTerm(excludedPaths, null);
+    }
+
+    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExcludedPaths_NotTerm(excludedPaths, opLambda);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths) {
+        setExcludedPaths_NotTerm(excludedPaths, null);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedPaths", excludedPaths));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
         setExcludedPaths_Terms(excludedPathsList, null);
     }
@@ -1222,167 +1459,39 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setIncludedDocPaths_Equal(String includedDocPaths) {
+        setIncludedDocPaths_Term(includedDocPaths, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedDocPaths_Equal(String includedDocPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setIncludedDocPaths_Term(includedDocPaths, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setIncludedDocPaths_Term(String includedDocPaths) {
+        setIncludedDocPaths_Term(includedDocPaths, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setIncludedDocPaths_Term(String includedDocPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("includedDocPaths", includedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsFileConfigCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsFileConfigCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setIncludedDocPaths_Equal(String includedDocPaths) {
-        setIncludedDocPaths_Term(includedDocPaths, null);
+    public void setIncludedDocPaths_NotEqual(String includedDocPaths) {
+        setIncludedDocPaths_NotTerm(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_Equal(String includedDocPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setIncludedDocPaths_Term(includedDocPaths, opLambda);
+    public void setIncludedDocPaths_NotEqual(String includedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIncludedDocPaths_NotTerm(includedDocPaths, opLambda);
     }
 
-    public void setIncludedDocPaths_Term(String includedDocPaths) {
-        setIncludedDocPaths_Term(includedDocPaths, null);
+    public void setIncludedDocPaths_NotTerm(String includedDocPaths) {
+        setIncludedDocPaths_NotTerm(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_Term(String includedDocPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("includedDocPaths", includedDocPaths);
+    public void setIncludedDocPaths_NotTerm(String includedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedDocPaths", includedDocPaths));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1535,6 +1644,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedPaths_NotEqual(String includedPaths) {
+        setIncludedPaths_NotTerm(includedPaths, null);
+    }
+
+    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIncludedPaths_NotTerm(includedPaths, opLambda);
+    }
+
+    public void setIncludedPaths_NotTerm(String includedPaths) {
+        setIncludedPaths_NotTerm(includedPaths, null);
+    }
+
+    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedPaths", includedPaths));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedPaths_Terms(Collection<String> includedPathsList) {
         setIncludedPaths_Terms(includedPathsList, null);
     }
@@ -1682,6 +1810,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIntervalTime_NotEqual(Integer intervalTime) {
+        setIntervalTime_NotTerm(intervalTime, null);
+    }
+
+    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIntervalTime_NotTerm(intervalTime, opLambda);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime) {
+        setIntervalTime_NotTerm(intervalTime, null);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("intervalTime", intervalTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
         setIntervalTime_Terms(intervalTimeList, null);
     }
@@ -1818,6 +1965,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount) {
+        setMaxAccessCount_NotTerm(maxAccessCount, null);
+    }
+
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount) {
+        setMaxAccessCount_NotTerm(maxAccessCount, null);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxAccessCount", maxAccessCount));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
         setMaxAccessCount_Terms(maxAccessCountList, null);
     }
@@ -1954,6 +2120,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
@@ -2101,6 +2286,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setNumOfThread_NotEqual(Integer numOfThread) {
+        setNumOfThread_NotTerm(numOfThread, null);
+    }
+
+    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setNumOfThread_NotTerm(numOfThread, opLambda);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread) {
+        setNumOfThread_NotTerm(numOfThread, null);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("numOfThread", numOfThread));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
         setNumOfThread_Terms(numOfThreadList, null);
     }
@@ -2237,6 +2441,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPaths_NotEqual(String paths) {
+        setPaths_NotTerm(paths, null);
+    }
+
+    public void setPaths_NotEqual(String paths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPaths_NotTerm(paths, opLambda);
+    }
+
+    public void setPaths_NotTerm(String paths) {
+        setPaths_NotTerm(paths, null);
+    }
+
+    public void setPaths_NotTerm(String paths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("paths", paths));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPaths_Terms(Collection<String> pathsList) {
         setPaths_Terms(pathsList, null);
     }
@@ -2384,6 +2607,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -2520,6 +2762,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -2667,6 +2928,25 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
index f14291c473e1c0122303724d452b5049871975f4..e2ba020edb9597411c2befbc6ef522f13e6b66f5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigToLabelCF;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FileConfigToLabelCQ, FileConfigToLabelCF> filteredLambda) {
+    public void filtered(FilteredCall<FileConfigToLabelCQ, FileConfigToLabelCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FileConfigToLabelCQ, FileConfigToLabelCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FileConfigToLabelCQ query = new FileConfigToLabelCQ();
-        FileConfigToLabelCF filter = new FileConfigToLabelCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FileConfigToLabelCQ, FileConfigToLabelCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FileConfigToLabelCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FileConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FileConfigToLabelCQ notQuery = new FileConfigToLabelCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         FileConfigToLabelCQ mustQuery = new FileConfigToLabelCQ();
         FileConfigToLabelCQ shouldQuery = new FileConfigToLabelCQ();
         FileConfigToLabelCQ mustNotQuery = new FileConfigToLabelCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FileConfigToLabelCQ filterQuery = new FileConfigToLabelCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFileConfigToLabelCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFileConfigToLabelCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setFileConfigId_Equal(String fileConfigId) {
         setFileConfigId_Term(fileConfigId, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_NotEqual(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
         setFileConfigId_Terms(fileConfigIdList, null);
     }
@@ -238,167 +342,39 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setLabelTypeId_Equal(String labelTypeId) {
+        setLabelTypeId_Term(labelTypeId, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setLabelTypeId_Term(labelTypeId, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setLabelTypeId_Term(String labelTypeId) {
+        setLabelTypeId_Term(labelTypeId, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsFileConfigToLabelCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsFileConfigToLabelCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setLabelTypeId_Equal(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
+    public void setLabelTypeId_NotEqual(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Equal(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setLabelTypeId_Term(labelTypeId, opLambda);
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
     }
 
-    public void setLabelTypeId_Term(String labelTypeId) {
-        setLabelTypeId_Term(labelTypeId, null);
+    public void setLabelTypeId_NotTerm(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Term(String labelTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
index cd93bcfa47e35e06e2a5602e038de3b03d65cf40..85e7c660db005ceeae28fb40c7807146bc92fc53 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.FileConfigToRoleCF;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FileConfigToRoleCQ, FileConfigToRoleCF> filteredLambda) {
+    public void filtered(FilteredCall<FileConfigToRoleCQ, FileConfigToRoleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FileConfigToRoleCQ, FileConfigToRoleCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FileConfigToRoleCQ query = new FileConfigToRoleCQ();
-        FileConfigToRoleCF filter = new FileConfigToRoleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FileConfigToRoleCQ, FileConfigToRoleCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FileConfigToRoleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FileConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FileConfigToRoleCQ notQuery = new FileConfigToRoleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         FileConfigToRoleCQ mustQuery = new FileConfigToRoleCQ();
         FileConfigToRoleCQ shouldQuery = new FileConfigToRoleCQ();
         FileConfigToRoleCQ mustNotQuery = new FileConfigToRoleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FileConfigToRoleCQ filterQuery = new FileConfigToRoleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +108,73 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFileConfigToRoleCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFileConfigToRoleCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setFileConfigId_Equal(String fileConfigId) {
         setFileConfigId_Term(fileConfigId, null);
     }
@@ -110,6 +194,25 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_NotEqual(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId) {
+        setFileConfigId_NotTerm(fileConfigId, null);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
         setFileConfigId_Terms(fileConfigIdList, null);
     }
@@ -238,167 +341,39 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setRoleTypeId_Equal(String roleTypeId) {
+        setRoleTypeId_Term(roleTypeId, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setRoleTypeId_Term(roleTypeId, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setRoleTypeId_Term(String roleTypeId) {
+        setRoleTypeId_Term(roleTypeId, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsFileConfigToRoleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsFileConfigToRoleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setRoleTypeId_Equal(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
+    public void setRoleTypeId_NotEqual(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Equal(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setRoleTypeId_Term(roleTypeId, opLambda);
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
     }
 
-    public void setRoleTypeId_Term(String roleTypeId) {
-        setRoleTypeId_Term(roleTypeId, null);
+    public void setRoleTypeId_NotTerm(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Term(String roleTypeId, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index fcee91936da4ec46f494fd8def0320cee611e554..66833e7414d34943e2f88c17f98a21390a37eb58 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.JobLogCF;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<JobLogCQ, JobLogCF> filteredLambda) {
+    public void filtered(FilteredCall<JobLogCQ, JobLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<JobLogCQ, JobLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        JobLogCQ query = new JobLogCQ();
-        JobLogCF filter = new JobLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<JobLogCQ, JobLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<JobLogCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<JobLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        JobLogCQ notQuery = new JobLogCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         JobLogCQ mustQuery = new JobLogCQ();
         JobLogCQ shouldQuery = new JobLogCQ();
         JobLogCQ mustNotQuery = new JobLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        JobLogCQ filterQuery = new JobLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsJobLogCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsJobLogCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setEndTime_Equal(Long endTime) {
         setEndTime_Term(endTime, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setEndTime_NotEqual(Long endTime) {
+        setEndTime_NotTerm(endTime, null);
+    }
+
+    public void setEndTime_NotEqual(Long endTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setEndTime_NotTerm(endTime, opLambda);
+    }
+
+    public void setEndTime_NotTerm(Long endTime) {
+        setEndTime_NotTerm(endTime, null);
+    }
+
+    public void setEndTime_NotTerm(Long endTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("endTime", endTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setEndTime_Terms(Collection<Long> endTimeList) {
         setEndTime_Terms(endTimeList, null);
     }
@@ -226,167 +330,39 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setJobName_Equal(String jobName) {
+        setJobName_Term(jobName, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobName_Equal(String jobName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setJobName_Term(jobName, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setJobName_Term(String jobName) {
+        setJobName_Term(jobName, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setJobName_Term(String jobName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("jobName", jobName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsJobLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsJobLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setJobName_Equal(String jobName) {
-        setJobName_Term(jobName, null);
+    public void setJobName_NotEqual(String jobName) {
+        setJobName_NotTerm(jobName, null);
     }
 
-    public void setJobName_Equal(String jobName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setJobName_Term(jobName, opLambda);
+    public void setJobName_NotEqual(String jobName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setJobName_NotTerm(jobName, opLambda);
     }
 
-    public void setJobName_Term(String jobName) {
-        setJobName_Term(jobName, null);
+    public void setJobName_NotTerm(String jobName) {
+        setJobName_NotTerm(jobName, null);
     }
 
-    public void setJobName_Term(String jobName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("jobName", jobName);
+    public void setJobName_NotTerm(String jobName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobName", jobName));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,6 +515,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setJobStatus_NotEqual(String jobStatus) {
+        setJobStatus_NotTerm(jobStatus, null);
+    }
+
+    public void setJobStatus_NotEqual(String jobStatus, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setJobStatus_NotTerm(jobStatus, opLambda);
+    }
+
+    public void setJobStatus_NotTerm(String jobStatus) {
+        setJobStatus_NotTerm(jobStatus, null);
+    }
+
+    public void setJobStatus_NotTerm(String jobStatus, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobStatus", jobStatus));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setJobStatus_Terms(Collection<String> jobStatusList) {
         setJobStatus_Terms(jobStatusList, null);
     }
@@ -686,6 +681,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptData_NotEqual(String scriptData) {
+        setScriptData_NotTerm(scriptData, null);
+    }
+
+    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setScriptData_NotTerm(scriptData, opLambda);
+    }
+
+    public void setScriptData_NotTerm(String scriptData) {
+        setScriptData_NotTerm(scriptData, null);
+    }
+
+    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptData", scriptData));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptData_Terms(Collection<String> scriptDataList) {
         setScriptData_Terms(scriptDataList, null);
     }
@@ -833,6 +847,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptResult_NotEqual(String scriptResult) {
+        setScriptResult_NotTerm(scriptResult, null);
+    }
+
+    public void setScriptResult_NotEqual(String scriptResult, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setScriptResult_NotTerm(scriptResult, opLambda);
+    }
+
+    public void setScriptResult_NotTerm(String scriptResult) {
+        setScriptResult_NotTerm(scriptResult, null);
+    }
+
+    public void setScriptResult_NotTerm(String scriptResult, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptResult", scriptResult));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptResult_Terms(Collection<String> scriptResultList) {
         setScriptResult_Terms(scriptResultList, null);
     }
@@ -980,6 +1013,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptType_NotEqual(String scriptType) {
+        setScriptType_NotTerm(scriptType, null);
+    }
+
+    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setScriptType_NotTerm(scriptType, opLambda);
+    }
+
+    public void setScriptType_NotTerm(String scriptType) {
+        setScriptType_NotTerm(scriptType, null);
+    }
+
+    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptType", scriptType));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptType_Terms(Collection<String> scriptTypeList) {
         setScriptType_Terms(scriptTypeList, null);
     }
@@ -1127,6 +1179,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setStartTime_NotEqual(Long startTime) {
+        setStartTime_NotTerm(startTime, null);
+    }
+
+    public void setStartTime_NotEqual(Long startTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setStartTime_NotTerm(startTime, opLambda);
+    }
+
+    public void setStartTime_NotTerm(Long startTime) {
+        setStartTime_NotTerm(startTime, null);
+    }
+
+    public void setStartTime_NotTerm(Long startTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("startTime", startTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setStartTime_Terms(Collection<Long> startTimeList) {
         setStartTime_Terms(startTimeList, null);
     }
@@ -1263,6 +1334,25 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTarget_NotEqual(String target) {
+        setTarget_NotTerm(target, null);
+    }
+
+    public void setTarget_NotEqual(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTarget_NotTerm(target, opLambda);
+    }
+
+    public void setTarget_NotTerm(String target) {
+        setTarget_NotTerm(target, null);
+    }
+
+    public void setTarget_NotTerm(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("target", target));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTarget_Terms(Collection<String> targetList) {
         setTarget_Terms(targetList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index 7644f7774fa095a7db5897bacb92e425aa7998c5..4dadd9faa076d02672137b5ef5d442c5cd454001 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.KeyMatchCF;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<KeyMatchCQ, KeyMatchCF> filteredLambda) {
+    public void filtered(FilteredCall<KeyMatchCQ, KeyMatchCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<KeyMatchCQ, KeyMatchCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        KeyMatchCQ query = new KeyMatchCQ();
-        KeyMatchCF filter = new KeyMatchCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<KeyMatchCQ, KeyMatchCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<KeyMatchCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<KeyMatchCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        KeyMatchCQ notQuery = new KeyMatchCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         KeyMatchCQ mustQuery = new KeyMatchCQ();
         KeyMatchCQ shouldQuery = new KeyMatchCQ();
         KeyMatchCQ mustNotQuery = new KeyMatchCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        KeyMatchCQ filterQuery = new KeyMatchCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsKeyMatchCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsKeyMatchCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setBoost_Equal(Float boost) {
         setBoost_Term(boost, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoost_NotEqual(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoost_Terms(Collection<Float> boostList) {
         setBoost_Terms(boostList, null);
     }
@@ -245,6 +349,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -392,6 +515,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -509,167 +651,39 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setMaxSize_Equal(Integer maxSize) {
+        setMaxSize_Term(maxSize, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMaxSize_Equal(Integer maxSize, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setMaxSize_Term(maxSize, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setMaxSize_Term(Integer maxSize) {
+        setMaxSize_Term(maxSize, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setMaxSize_Term(Integer maxSize, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("maxSize", maxSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsKeyMatchCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsKeyMatchCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setMaxSize_Equal(Integer maxSize) {
-        setMaxSize_Term(maxSize, null);
+    public void setMaxSize_NotEqual(Integer maxSize) {
+        setMaxSize_NotTerm(maxSize, null);
     }
 
-    public void setMaxSize_Equal(Integer maxSize, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setMaxSize_Term(maxSize, opLambda);
+    public void setMaxSize_NotEqual(Integer maxSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setMaxSize_NotTerm(maxSize, opLambda);
     }
 
-    public void setMaxSize_Term(Integer maxSize) {
-        setMaxSize_Term(maxSize, null);
+    public void setMaxSize_NotTerm(Integer maxSize) {
+        setMaxSize_NotTerm(maxSize, null);
     }
 
-    public void setMaxSize_Term(Integer maxSize, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("maxSize", maxSize);
+    public void setMaxSize_NotTerm(Integer maxSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxSize", maxSize));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -811,6 +825,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQuery_NotEqual(String query) {
+        setQuery_NotTerm(query, null);
+    }
+
+    public void setQuery_NotEqual(String query, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setQuery_NotTerm(query, opLambda);
+    }
+
+    public void setQuery_NotTerm(String query) {
+        setQuery_NotTerm(query, null);
+    }
+
+    public void setQuery_NotTerm(String query, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("query", query));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQuery_Terms(Collection<String> queryList) {
         setQuery_Terms(queryList, null);
     }
@@ -958,6 +991,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTerm_NotEqual(String term) {
+        setTerm_NotTerm(term, null);
+    }
+
+    public void setTerm_NotEqual(String term, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTerm_NotTerm(term, opLambda);
+    }
+
+    public void setTerm_NotTerm(String term) {
+        setTerm_NotTerm(term, null);
+    }
+
+    public void setTerm_NotTerm(String term, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("term", term));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTerm_Terms(Collection<String> termList) {
         setTerm_Terms(termList, null);
     }
@@ -1105,6 +1157,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1252,6 +1323,25 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
index f9107978a7bfb9a7018c556bb6b5ddd39e8a0609..73e319931dbb54f6fb1de4d566c6f8bf9cdf17b5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.LabelToRoleCF;
 import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<LabelToRoleCQ, LabelToRoleCF> filteredLambda) {
+    public void filtered(FilteredCall<LabelToRoleCQ, LabelToRoleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<LabelToRoleCQ, LabelToRoleCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        LabelToRoleCQ query = new LabelToRoleCQ();
-        LabelToRoleCF filter = new LabelToRoleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<LabelToRoleCQ, LabelToRoleCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<LabelToRoleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<LabelToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        LabelToRoleCQ notQuery = new LabelToRoleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         LabelToRoleCQ mustQuery = new LabelToRoleCQ();
         LabelToRoleCQ shouldQuery = new LabelToRoleCQ();
         LabelToRoleCQ mustNotQuery = new LabelToRoleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        LabelToRoleCQ filterQuery = new LabelToRoleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -103,137 +121,57 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("id", id);
+        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_InScope(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_InScope(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
+    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_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsLabelToRoleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsLabelToRoleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -256,6 +194,25 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_NotEqual(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
+    }
+
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
         setLabelTypeId_Terms(labelTypeIdList, null);
     }
@@ -403,6 +360,25 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_NotEqual(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
+    }
+
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
         setRoleTypeId_Terms(roleTypeIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index 569f7305979d30666fec5e9b2d5a1a99734c45a2..42887c738057c6d8e0518ebd76058e97f2c4f7a8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.LabelTypeCF;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<LabelTypeCQ, LabelTypeCF> filteredLambda) {
+    public void filtered(FilteredCall<LabelTypeCQ, LabelTypeCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<LabelTypeCQ, LabelTypeCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        LabelTypeCQ query = new LabelTypeCQ();
-        LabelTypeCF filter = new LabelTypeCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<LabelTypeCQ, LabelTypeCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<LabelTypeCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<LabelTypeCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        LabelTypeCQ notQuery = new LabelTypeCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         LabelTypeCQ mustQuery = new LabelTypeCQ();
         LabelTypeCQ shouldQuery = new LabelTypeCQ();
         LabelTypeCQ mustNotQuery = new LabelTypeCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        LabelTypeCQ filterQuery = new LabelTypeCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsLabelTypeCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsLabelTypeCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -256,6 +360,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -392,6 +515,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedPaths_NotEqual(String excludedPaths) {
+        setExcludedPaths_NotTerm(excludedPaths, null);
+    }
+
+    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExcludedPaths_NotTerm(excludedPaths, opLambda);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths) {
+        setExcludedPaths_NotTerm(excludedPaths, null);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedPaths", excludedPaths));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
         setExcludedPaths_Terms(excludedPathsList, null);
     }
@@ -520,167 +662,39 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setIncludedPaths_Equal(String includedPaths) {
+        setIncludedPaths_Term(includedPaths, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedPaths_Equal(String includedPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setIncludedPaths_Term(includedPaths, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setIncludedPaths_Term(String includedPaths) {
+        setIncludedPaths_Term(includedPaths, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setIncludedPaths_Term(String includedPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsLabelTypeCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsLabelTypeCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setIncludedPaths_Equal(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
+    public void setIncludedPaths_NotEqual(String includedPaths) {
+        setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_Equal(String includedPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setIncludedPaths_Term(includedPaths, opLambda);
+    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIncludedPaths_NotTerm(includedPaths, opLambda);
     }
 
-    public void setIncludedPaths_Term(String includedPaths) {
-        setIncludedPaths_Term(includedPaths, null);
+    public void setIncludedPaths_NotTerm(String includedPaths) {
+        setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_Term(String includedPaths, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("includedPaths", includedPaths);
+    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedPaths", includedPaths));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -833,6 +847,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
@@ -980,6 +1013,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -1116,6 +1168,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1263,6 +1334,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -1399,6 +1489,25 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_NotEqual(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_Terms(Collection<String> valueList) {
         setValue_Terms(valueList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java
index 8af96d8082888790aca8f66827d30488cd947143..73a1bccdf67ab014eaca9c690ad786f5f9424dea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsOverlappingHostCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.OverlappingHostCF;
 import org.codelibs.fess.es.config.cbean.cq.OverlappingHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCF> filteredLambda) {
+    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        OverlappingHostCQ query = new OverlappingHostCQ();
-        OverlappingHostCF filter = new OverlappingHostCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<OverlappingHostCQ, OverlappingHostCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<OverlappingHostCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<OverlappingHostCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        OverlappingHostCQ notQuery = new OverlappingHostCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         OverlappingHostCQ mustQuery = new OverlappingHostCQ();
         OverlappingHostCQ shouldQuery = new OverlappingHostCQ();
         OverlappingHostCQ mustNotQuery = new OverlappingHostCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        OverlappingHostCQ filterQuery = new OverlappingHostCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +108,73 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsOverlappingHostCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsOverlappingHostCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -110,6 +194,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -257,6 +360,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -374,167 +496,39 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setOverlappingName_Equal(String overlappingName) {
+        setOverlappingName_Term(overlappingName, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setOverlappingName_Equal(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setOverlappingName_Term(overlappingName, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setOverlappingName_Term(String overlappingName) {
+        setOverlappingName_Term(overlappingName, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setOverlappingName_Term(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("overlappingName", overlappingName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setOverlappingName_NotEqual(String overlappingName) {
+        setOverlappingName_NotTerm(overlappingName, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setOverlappingName_NotEqual(String overlappingName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setOverlappingName_NotTerm(overlappingName, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setOverlappingName_NotTerm(String overlappingName) {
+        setOverlappingName_NotTerm(overlappingName, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsOverlappingHostCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsOverlappingHostCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setOverlappingName_Equal(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
-    }
-
-    public void setOverlappingName_Equal(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setOverlappingName_Term(overlappingName, opLambda);
-    }
-
-    public void setOverlappingName_Term(String overlappingName) {
-        setOverlappingName_Term(overlappingName, null);
-    }
-
-    public void setOverlappingName_Term(String overlappingName, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("overlappingName", overlappingName);
+    public void setOverlappingName_NotTerm(String overlappingName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("overlappingName", overlappingName));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,6 +681,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRegularName_NotEqual(String regularName) {
+        setRegularName_NotTerm(regularName, null);
+    }
+
+    public void setRegularName_NotEqual(String regularName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRegularName_NotTerm(regularName, opLambda);
+    }
+
+    public void setRegularName_NotTerm(String regularName) {
+        setRegularName_NotTerm(regularName, null);
+    }
+
+    public void setRegularName_NotTerm(String regularName, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("regularName", regularName));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRegularName_Terms(Collection<String> regularNameList) {
         setRegularName_Terms(regularNameList, null);
     }
@@ -834,6 +847,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -970,6 +1002,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1117,6 +1168,25 @@ public abstract class BsOverlappingHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index 5a5565325c3efef1649b69a81fa5932030f17edf..1a42f99fde63bb682bb1421287b22b00c880112f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.PathMappingCF;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<PathMappingCQ, PathMappingCF> filteredLambda) {
+    public void filtered(FilteredCall<PathMappingCQ, PathMappingCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<PathMappingCQ, PathMappingCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        PathMappingCQ query = new PathMappingCQ();
-        PathMappingCF filter = new PathMappingCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<PathMappingCQ, PathMappingCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<PathMappingCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<PathMappingCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        PathMappingCQ notQuery = new PathMappingCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         PathMappingCQ mustQuery = new PathMappingCQ();
         PathMappingCQ shouldQuery = new PathMappingCQ();
         PathMappingCQ mustNotQuery = new PathMappingCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        PathMappingCQ filterQuery = new PathMappingCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsPathMappingCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsPathMappingCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -256,6 +360,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -373,167 +496,39 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setProcessType_Equal(String processType) {
+        setProcessType_Term(processType, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setProcessType_Equal(String processType, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setProcessType_Term(processType, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setProcessType_Term(String processType) {
+        setProcessType_Term(processType, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setProcessType_Term(String processType, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("processType", processType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsPathMappingCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsPathMappingCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setProcessType_Equal(String processType) {
-        setProcessType_Term(processType, null);
+    public void setProcessType_NotEqual(String processType) {
+        setProcessType_NotTerm(processType, null);
     }
 
-    public void setProcessType_Equal(String processType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setProcessType_Term(processType, opLambda);
+    public void setProcessType_NotEqual(String processType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setProcessType_NotTerm(processType, opLambda);
     }
 
-    public void setProcessType_Term(String processType) {
-        setProcessType_Term(processType, null);
+    public void setProcessType_NotTerm(String processType) {
+        setProcessType_NotTerm(processType, null);
     }
 
-    public void setProcessType_Term(String processType, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("processType", processType);
+    public void setProcessType_NotTerm(String processType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("processType", processType));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,6 +681,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRegex_NotEqual(String regex) {
+        setRegex_NotTerm(regex, null);
+    }
+
+    public void setRegex_NotEqual(String regex, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRegex_NotTerm(regex, opLambda);
+    }
+
+    public void setRegex_NotTerm(String regex) {
+        setRegex_NotTerm(regex, null);
+    }
+
+    public void setRegex_NotTerm(String regex, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("regex", regex));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRegex_Terms(Collection<String> regexList) {
         setRegex_Terms(regexList, null);
     }
@@ -833,6 +847,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setReplacement_NotEqual(String replacement) {
+        setReplacement_NotTerm(replacement, null);
+    }
+
+    public void setReplacement_NotEqual(String replacement, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setReplacement_NotTerm(replacement, opLambda);
+    }
+
+    public void setReplacement_NotTerm(String replacement) {
+        setReplacement_NotTerm(replacement, null);
+    }
+
+    public void setReplacement_NotTerm(String replacement, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("replacement", replacement));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setReplacement_Terms(Collection<String> replacementList) {
         setReplacement_Terms(replacementList, null);
     }
@@ -980,6 +1013,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -1116,6 +1168,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1263,6 +1334,25 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 91b8b5bf5039d634f9e58f83a21078b10cfae43a..21f15e3b974703f6a8f888154b2dd5729663abf6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.RequestHeaderCF;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<RequestHeaderCQ, RequestHeaderCF> filteredLambda) {
+    public void filtered(FilteredCall<RequestHeaderCQ, RequestHeaderCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<RequestHeaderCQ, RequestHeaderCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        RequestHeaderCQ query = new RequestHeaderCQ();
-        RequestHeaderCF filter = new RequestHeaderCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<RequestHeaderCQ, RequestHeaderCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<RequestHeaderCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<RequestHeaderCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        RequestHeaderCQ notQuery = new RequestHeaderCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         RequestHeaderCQ mustQuery = new RequestHeaderCQ();
         RequestHeaderCQ shouldQuery = new RequestHeaderCQ();
         RequestHeaderCQ mustNotQuery = new RequestHeaderCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        RequestHeaderCQ filterQuery = new RequestHeaderCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsRequestHeaderCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsRequestHeaderCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -256,6 +360,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -373,167 +496,39 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsRequestHeaderCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsRequestHeaderCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,6 +681,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -833,6 +847,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -969,6 +1002,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_NotEqual(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_Terms(Collection<String> valueList) {
         setValue_Terms(valueList, null);
     }
@@ -1116,6 +1168,25 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_NotEqual(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
         setWebConfigId_Terms(webConfigIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index 0bd98b1d8a2c12e49307f017c7bb59bbabcbd696..a2bce6fd127aea606ad4791813c40d38f42b4fab 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.RoleTypeCF;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<RoleTypeCQ, RoleTypeCF> filteredLambda) {
+    public void filtered(FilteredCall<RoleTypeCQ, RoleTypeCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<RoleTypeCQ, RoleTypeCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        RoleTypeCQ query = new RoleTypeCQ();
-        RoleTypeCF filter = new RoleTypeCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<RoleTypeCQ, RoleTypeCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<RoleTypeCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<RoleTypeCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        RoleTypeCQ notQuery = new RoleTypeCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         RoleTypeCQ mustQuery = new RoleTypeCQ();
         RoleTypeCQ shouldQuery = new RoleTypeCQ();
         RoleTypeCQ mustNotQuery = new RoleTypeCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        RoleTypeCQ filterQuery = new RoleTypeCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsRoleTypeCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsRoleTypeCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -256,6 +360,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -373,167 +496,39 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsRoleTypeCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsRoleTypeCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,6 +681,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -822,6 +836,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -969,6 +1002,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -1105,6 +1157,25 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_NotEqual(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_Terms(Collection<String> valueList) {
         setValue_Terms(valueList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index c0a77af2a6a1b09f2501d8b530e4e0723a2562e9..eedd8b170ff468f8fe867129fddd3fcfb0ff4869 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.ScheduledJobCF;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<ScheduledJobCQ, ScheduledJobCF> filteredLambda) {
+    public void filtered(FilteredCall<ScheduledJobCQ, ScheduledJobCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<ScheduledJobCQ, ScheduledJobCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        ScheduledJobCQ query = new ScheduledJobCQ();
-        ScheduledJobCF filter = new ScheduledJobCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<ScheduledJobCQ, ScheduledJobCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<ScheduledJobCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<ScheduledJobCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        ScheduledJobCQ notQuery = new ScheduledJobCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         ScheduledJobCQ mustQuery = new ScheduledJobCQ();
         ScheduledJobCQ shouldQuery = new ScheduledJobCQ();
         ScheduledJobCQ mustNotQuery = new ScheduledJobCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        ScheduledJobCQ filterQuery = new ScheduledJobCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsScheduledJobCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsScheduledJobCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAvailable_Equal(Boolean available) {
         setAvailable_Term(available, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAvailable_NotEqual(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAvailable_Terms(Collection<Boolean> availableList) {
         setAvailable_Terms(availableList, null);
     }
@@ -245,6 +349,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCrawler_NotEqual(Boolean crawler) {
+        setCrawler_NotTerm(crawler, null);
+    }
+
+    public void setCrawler_NotEqual(Boolean crawler, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCrawler_NotTerm(crawler, opLambda);
+    }
+
+    public void setCrawler_NotTerm(Boolean crawler) {
+        setCrawler_NotTerm(crawler, null);
+    }
+
+    public void setCrawler_NotTerm(Boolean crawler, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawler", crawler));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCrawler_Terms(Collection<Boolean> crawlerList) {
         setCrawler_Terms(crawlerList, null);
     }
@@ -381,6 +504,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -528,6 +670,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -664,6 +825,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCronExpression_NotEqual(String cronExpression) {
+        setCronExpression_NotTerm(cronExpression, null);
+    }
+
+    public void setCronExpression_NotEqual(String cronExpression, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCronExpression_NotTerm(cronExpression, opLambda);
+    }
+
+    public void setCronExpression_NotTerm(String cronExpression) {
+        setCronExpression_NotTerm(cronExpression, null);
+    }
+
+    public void setCronExpression_NotTerm(String cronExpression, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("cronExpression", cronExpression));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCronExpression_Terms(Collection<String> cronExpressionList) {
         setCronExpression_Terms(cronExpressionList, null);
     }
@@ -792,167 +972,39 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setJobLogging_Equal(Boolean jobLogging) {
+        setJobLogging_Term(jobLogging, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobLogging_Equal(Boolean jobLogging, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setJobLogging_Term(jobLogging, opLambda);
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setJobLogging_Term(Boolean jobLogging) {
+        setJobLogging_Term(jobLogging, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setJobLogging_Term(Boolean jobLogging, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("jobLogging", jobLogging);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setJobLogging_NotEqual(Boolean jobLogging) {
+        setJobLogging_NotTerm(jobLogging, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobLogging_NotEqual(Boolean jobLogging, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setJobLogging_NotTerm(jobLogging, opLambda);
     }
 
-    public BsScheduledJobCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
+    public void setJobLogging_NotTerm(Boolean jobLogging) {
+        setJobLogging_NotTerm(jobLogging, null);
     }
 
-    public BsScheduledJobCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setJobLogging_Equal(Boolean jobLogging) {
-        setJobLogging_Term(jobLogging, null);
-    }
-
-    public void setJobLogging_Equal(Boolean jobLogging, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setJobLogging_Term(jobLogging, opLambda);
-    }
-
-    public void setJobLogging_Term(Boolean jobLogging) {
-        setJobLogging_Term(jobLogging, null);
-    }
-
-    public void setJobLogging_Term(Boolean jobLogging, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("jobLogging", jobLogging);
+    public void setJobLogging_NotTerm(Boolean jobLogging, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobLogging", jobLogging));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1094,6 +1146,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
@@ -1241,6 +1312,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptData_NotEqual(String scriptData) {
+        setScriptData_NotTerm(scriptData, null);
+    }
+
+    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setScriptData_NotTerm(scriptData, opLambda);
+    }
+
+    public void setScriptData_NotTerm(String scriptData) {
+        setScriptData_NotTerm(scriptData, null);
+    }
+
+    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptData", scriptData));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptData_Terms(Collection<String> scriptDataList) {
         setScriptData_Terms(scriptDataList, null);
     }
@@ -1388,6 +1478,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptType_NotEqual(String scriptType) {
+        setScriptType_NotTerm(scriptType, null);
+    }
+
+    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setScriptType_NotTerm(scriptType, opLambda);
+    }
+
+    public void setScriptType_NotTerm(String scriptType) {
+        setScriptType_NotTerm(scriptType, null);
+    }
+
+    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptType", scriptType));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptType_Terms(Collection<String> scriptTypeList) {
         setScriptType_Terms(scriptTypeList, null);
     }
@@ -1535,6 +1644,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -1671,6 +1799,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTarget_NotEqual(String target) {
+        setTarget_NotTerm(target, null);
+    }
+
+    public void setTarget_NotEqual(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTarget_NotTerm(target, opLambda);
+    }
+
+    public void setTarget_NotTerm(String target) {
+        setTarget_NotTerm(target, null);
+    }
+
+    public void setTarget_NotTerm(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("target", target));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTarget_Terms(Collection<String> targetList) {
         setTarget_Terms(targetList, null);
     }
@@ -1818,6 +1965,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1965,6 +2131,25 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java
index 332bc23c64aea4dfb6caad6c9cb952befb364535..def1a4557a4845e22461e372f9230a1d690d0f46 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.SuggestBadWordCF;
 import org.codelibs.fess.es.config.cbean.cq.SuggestBadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCF> filteredLambda) {
+    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        SuggestBadWordCQ query = new SuggestBadWordCQ();
-        SuggestBadWordCF filter = new SuggestBadWordCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<SuggestBadWordCQ, SuggestBadWordCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<SuggestBadWordCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<SuggestBadWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        SuggestBadWordCQ notQuery = new SuggestBadWordCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         SuggestBadWordCQ mustQuery = new SuggestBadWordCQ();
         SuggestBadWordCQ shouldQuery = new SuggestBadWordCQ();
         SuggestBadWordCQ mustNotQuery = new SuggestBadWordCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        SuggestBadWordCQ filterQuery = new SuggestBadWordCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsSuggestBadWordCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsSuggestBadWordCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedBy_Equal(String createdBy) {
         setCreatedBy_Term(createdBy, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -256,6 +360,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -373,167 +496,39 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setSuggestWord_Equal(String suggestWord) {
+        setSuggestWord_Term(suggestWord, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSuggestWord_Equal(String suggestWord, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setSuggestWord_Term(suggestWord, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setSuggestWord_Term(String suggestWord) {
+        setSuggestWord_Term(suggestWord, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setSuggestWord_Term(String suggestWord, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setSuggestWord_NotEqual(String suggestWord) {
+        setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSuggestWord_NotTerm(suggestWord, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setSuggestWord_NotTerm(String suggestWord) {
+        setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsSuggestBadWordCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsSuggestBadWordCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setSuggestWord_Equal(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Equal(String suggestWord, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setSuggestWord_Term(suggestWord, opLambda);
-    }
-
-    public void setSuggestWord_Term(String suggestWord) {
-        setSuggestWord_Term(suggestWord, null);
-    }
-
-    public void setSuggestWord_Term(String suggestWord, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("suggestWord", suggestWord);
+    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestWord", suggestWord));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,6 +681,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetLabel_NotEqual(String targetLabel) {
+        setTargetLabel_NotTerm(targetLabel, null);
+    }
+
+    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTargetLabel_NotTerm(targetLabel, opLambda);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel) {
+        setTargetLabel_NotTerm(targetLabel, null);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetLabel", targetLabel));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetLabel_Terms(Collection<String> targetLabelList) {
         setTargetLabel_Terms(targetLabelList, null);
     }
@@ -833,6 +847,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetRole_NotEqual(String targetRole) {
+        setTargetRole_NotTerm(targetRole, null);
+    }
+
+    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTargetRole_NotTerm(targetRole, opLambda);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole) {
+        setTargetRole_NotTerm(targetRole, null);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetRole", targetRole));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetRole_Terms(Collection<String> targetRoleList) {
         setTargetRole_Terms(targetRoleList, null);
     }
@@ -980,6 +1013,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1127,6 +1179,25 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java
index f2c50ab5e0693509d68a05ecb8a89074f1638407..572e8ddc54fbf3a9a1c1cc12dde6e3384a716435 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.SuggestElevateWordCF;
 import org.codelibs.fess.es.config.cbean.cq.SuggestElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCF> filteredLambda) {
+    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        SuggestElevateWordCQ query = new SuggestElevateWordCQ();
-        SuggestElevateWordCF filter = new SuggestElevateWordCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<SuggestElevateWordCQ, SuggestElevateWordCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<SuggestElevateWordCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<SuggestElevateWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        SuggestElevateWordCQ notQuery = new SuggestElevateWordCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         SuggestElevateWordCQ mustQuery = new SuggestElevateWordCQ();
         SuggestElevateWordCQ shouldQuery = new SuggestElevateWordCQ();
         SuggestElevateWordCQ mustNotQuery = new SuggestElevateWordCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        SuggestElevateWordCQ filterQuery = new SuggestElevateWordCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsSuggestElevateWordCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsSuggestElevateWordCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setBoost_Equal(Float boost) {
         setBoost_Term(boost, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoost_NotEqual(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoost_Terms(Collection<Float> boostList) {
         setBoost_Terms(boostList, null);
     }
@@ -246,6 +350,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -393,6 +516,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -510,167 +652,39 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setReading_Equal(String reading) {
+        setReading_Term(reading, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setReading_Equal(String reading, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setReading_Term(reading, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setReading_Term(String reading) {
+        setReading_Term(reading, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setReading_Term(String reading, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("reading", reading);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSuggestElevateWordCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsSuggestElevateWordCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setReading_Equal(String reading) {
-        setReading_Term(reading, null);
+    public void setReading_NotEqual(String reading) {
+        setReading_NotTerm(reading, null);
     }
 
-    public void setReading_Equal(String reading, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setReading_Term(reading, opLambda);
+    public void setReading_NotEqual(String reading, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setReading_NotTerm(reading, opLambda);
     }
 
-    public void setReading_Term(String reading) {
-        setReading_Term(reading, null);
+    public void setReading_NotTerm(String reading) {
+        setReading_NotTerm(reading, null);
     }
 
-    public void setReading_Term(String reading, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("reading", reading);
+    public void setReading_NotTerm(String reading, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("reading", reading));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -823,6 +837,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSuggestWord_NotEqual(String suggestWord) {
+        setSuggestWord_NotTerm(suggestWord, null);
+    }
+
+    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSuggestWord_NotTerm(suggestWord, opLambda);
+    }
+
+    public void setSuggestWord_NotTerm(String suggestWord) {
+        setSuggestWord_NotTerm(suggestWord, null);
+    }
+
+    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestWord", suggestWord));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSuggestWord_Terms(Collection<String> suggestWordList) {
         setSuggestWord_Terms(suggestWordList, null);
     }
@@ -970,6 +1003,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetLabel_NotEqual(String targetLabel) {
+        setTargetLabel_NotTerm(targetLabel, null);
+    }
+
+    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTargetLabel_NotTerm(targetLabel, opLambda);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel) {
+        setTargetLabel_NotTerm(targetLabel, null);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetLabel", targetLabel));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetLabel_Terms(Collection<String> targetLabelList) {
         setTargetLabel_Terms(targetLabelList, null);
     }
@@ -1117,6 +1169,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetRole_NotEqual(String targetRole) {
+        setTargetRole_NotTerm(targetRole, null);
+    }
+
+    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setTargetRole_NotTerm(targetRole, opLambda);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole) {
+        setTargetRole_NotTerm(targetRole, null);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetRole", targetRole));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetRole_Terms(Collection<String> targetRoleList) {
         setTargetRole_Terms(targetRoleList, null);
     }
@@ -1264,6 +1335,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1411,6 +1501,25 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index bf6068d706b0bd5eebf715e033c7129c88c05c2b..2663d622a70267869ff17d571bcb0626c2f4da07 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.WebAuthenticationCF;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,30 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<WebAuthenticationCQ, WebAuthenticationCF> filteredLambda) {
+    public void filtered(FilteredCall<WebAuthenticationCQ, WebAuthenticationCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<WebAuthenticationCQ, WebAuthenticationCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        WebAuthenticationCQ query = new WebAuthenticationCQ();
-        WebAuthenticationCF filter = new WebAuthenticationCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<WebAuthenticationCQ, WebAuthenticationCQ> filteredLambda,
+            ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<WebAuthenticationCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<WebAuthenticationCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        WebAuthenticationCQ notQuery = new WebAuthenticationCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +94,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         WebAuthenticationCQ mustQuery = new WebAuthenticationCQ();
         WebAuthenticationCQ shouldQuery = new WebAuthenticationCQ();
         WebAuthenticationCQ mustNotQuery = new WebAuthenticationCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        WebAuthenticationCQ filterQuery = new WebAuthenticationCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -91,6 +109,73 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsWebAuthenticationCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsWebAuthenticationCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAuthRealm_Equal(String authRealm) {
         setAuthRealm_Term(authRealm, null);
     }
@@ -110,6 +195,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAuthRealm_NotEqual(String authRealm) {
+        setAuthRealm_NotTerm(authRealm, null);
+    }
+
+    public void setAuthRealm_NotEqual(String authRealm, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAuthRealm_NotTerm(authRealm, opLambda);
+    }
+
+    public void setAuthRealm_NotTerm(String authRealm) {
+        setAuthRealm_NotTerm(authRealm, null);
+    }
+
+    public void setAuthRealm_NotTerm(String authRealm, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("authRealm", authRealm));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAuthRealm_Terms(Collection<String> authRealmList) {
         setAuthRealm_Terms(authRealmList, null);
     }
@@ -257,6 +361,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -404,6 +527,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -540,6 +682,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHostname_NotEqual(String hostname) {
+        setHostname_NotTerm(hostname, null);
+    }
+
+    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHostname_NotTerm(hostname, opLambda);
+    }
+
+    public void setHostname_NotTerm(String hostname) {
+        setHostname_NotTerm(hostname, null);
+    }
+
+    public void setHostname_NotTerm(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hostname", hostname));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHostname_Terms(Collection<String> hostnameList) {
         setHostname_Terms(hostnameList, null);
     }
@@ -668,167 +829,39 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setParameters_Equal(String parameters) {
+        setParameters_Term(parameters, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setParameters_Equal(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setParameters_Term(parameters, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setParameters_Term(String parameters) {
+        setParameters_Term(parameters, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setParameters_Term(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsWebAuthenticationCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsWebAuthenticationCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setParameters_NotEqual(String parameters) {
+        setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_Equal(String parameters) {
-        setParameters_Term(parameters, null);
-    }
-
-    public void setParameters_Equal(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setParameters_Term(parameters, opLambda);
+    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setParameters_NotTerm(parameters, opLambda);
     }
 
-    public void setParameters_Term(String parameters) {
-        setParameters_Term(parameters, null);
+    public void setParameters_NotTerm(String parameters) {
+        setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_Term(String parameters, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("parameters", parameters);
+    public void setParameters_NotTerm(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("parameters", parameters));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -981,6 +1014,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_NotEqual(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotEqual(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
+    }
+
+    public void setPassword_NotTerm(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotTerm(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("password", password));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_Terms(Collection<String> passwordList) {
         setPassword_Terms(passwordList, null);
     }
@@ -1128,6 +1180,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPort_NotEqual(Integer port) {
+        setPort_NotTerm(port, null);
+    }
+
+    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPort_NotTerm(port, opLambda);
+    }
+
+    public void setPort_NotTerm(Integer port) {
+        setPort_NotTerm(port, null);
+    }
+
+    public void setPort_NotTerm(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("port", port));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPort_Terms(Collection<Integer> portList) {
         setPort_Terms(portList, null);
     }
@@ -1264,6 +1335,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setProtocolScheme_NotEqual(String protocolScheme) {
+        setProtocolScheme_NotTerm(protocolScheme, null);
+    }
+
+    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setProtocolScheme_NotTerm(protocolScheme, opLambda);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme) {
+        setProtocolScheme_NotTerm(protocolScheme, null);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("protocolScheme", protocolScheme));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
         setProtocolScheme_Terms(protocolSchemeList, null);
     }
@@ -1411,6 +1501,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -1558,6 +1667,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -1694,6 +1822,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUsername_NotEqual(String username) {
+        setUsername_NotTerm(username, null);
+    }
+
+    public void setUsername_NotEqual(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUsername_NotTerm(username, opLambda);
+    }
+
+    public void setUsername_NotTerm(String username) {
+        setUsername_NotTerm(username, null);
+    }
+
+    public void setUsername_NotTerm(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("username", username));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUsername_Terms(Collection<String> usernameList) {
         setUsername_Terms(usernameList, null);
     }
@@ -1841,6 +1988,25 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_NotEqual(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
         setWebConfigId_Terms(webConfigIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index 188c60e4b045111a628a6228a59fd18461f9dc2f..87fc1b9d1aee4a3732c0eba0e3bdcf3ad0905c26 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigCF;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<WebConfigCQ, WebConfigCF> filteredLambda) {
+    public void filtered(FilteredCall<WebConfigCQ, WebConfigCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<WebConfigCQ, WebConfigCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        WebConfigCQ query = new WebConfigCQ();
-        WebConfigCF filter = new WebConfigCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<WebConfigCQ, WebConfigCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<WebConfigCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<WebConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        WebConfigCQ notQuery = new WebConfigCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         WebConfigCQ mustQuery = new WebConfigCQ();
         WebConfigCQ shouldQuery = new WebConfigCQ();
         WebConfigCQ mustNotQuery = new WebConfigCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        WebConfigCQ filterQuery = new WebConfigCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsWebConfigCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsWebConfigCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAvailable_Equal(Boolean available) {
         setAvailable_Term(available, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAvailable_NotEqual(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available) {
+        setAvailable_NotTerm(available, null);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAvailable_Terms(Collection<Boolean> availableList) {
         setAvailable_Terms(availableList, null);
     }
@@ -245,6 +349,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoost_NotEqual(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost) {
+        setBoost_NotTerm(boost, null);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoost_Terms(Collection<Float> boostList) {
         setBoost_Terms(boostList, null);
     }
@@ -381,6 +504,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigParameter_NotEqual(String configParameter) {
+        setConfigParameter_NotTerm(configParameter, null);
+    }
+
+    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setConfigParameter_NotTerm(configParameter, opLambda);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter) {
+        setConfigParameter_NotTerm(configParameter, null);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configParameter", configParameter));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigParameter_Terms(Collection<String> configParameterList) {
         setConfigParameter_Terms(configParameterList, null);
     }
@@ -528,6 +670,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -675,6 +836,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -811,6 +991,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDepth_NotEqual(Integer depth) {
+        setDepth_NotTerm(depth, null);
+    }
+
+    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setDepth_NotTerm(depth, opLambda);
+    }
+
+    public void setDepth_NotTerm(Integer depth) {
+        setDepth_NotTerm(depth, null);
+    }
+
+    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("depth", depth));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDepth_Terms(Collection<Integer> depthList) {
         setDepth_Terms(depthList, null);
     }
@@ -947,6 +1146,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedDocUrls_NotEqual(String excludedDocUrls) {
+        setExcludedDocUrls_NotTerm(excludedDocUrls, null);
+    }
+
+    public void setExcludedDocUrls_NotEqual(String excludedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExcludedDocUrls_NotTerm(excludedDocUrls, opLambda);
+    }
+
+    public void setExcludedDocUrls_NotTerm(String excludedDocUrls) {
+        setExcludedDocUrls_NotTerm(excludedDocUrls, null);
+    }
+
+    public void setExcludedDocUrls_NotTerm(String excludedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedDocUrls", excludedDocUrls));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedDocUrls_Terms(Collection<String> excludedDocUrlsList) {
         setExcludedDocUrls_Terms(excludedDocUrlsList, null);
     }
@@ -1094,6 +1312,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedUrls_NotEqual(String excludedUrls) {
+        setExcludedUrls_NotTerm(excludedUrls, null);
+    }
+
+    public void setExcludedUrls_NotEqual(String excludedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setExcludedUrls_NotTerm(excludedUrls, opLambda);
+    }
+
+    public void setExcludedUrls_NotTerm(String excludedUrls) {
+        setExcludedUrls_NotTerm(excludedUrls, null);
+    }
+
+    public void setExcludedUrls_NotTerm(String excludedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedUrls", excludedUrls));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedUrls_Terms(Collection<String> excludedUrlsList) {
         setExcludedUrls_Terms(excludedUrlsList, null);
     }
@@ -1222,167 +1459,39 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setIncludedDocUrls_Equal(String includedDocUrls) {
+        setIncludedDocUrls_Term(includedDocUrls, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedDocUrls_Equal(String includedDocUrls, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setIncludedDocUrls_Term(includedDocUrls, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setIncludedDocUrls_Term(String includedDocUrls) {
+        setIncludedDocUrls_Term(includedDocUrls, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setIncludedDocUrls_Term(String includedDocUrls, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("includedDocUrls", includedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsWebConfigCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsWebConfigCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setIncludedDocUrls_NotEqual(String includedDocUrls) {
+        setIncludedDocUrls_NotTerm(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_Equal(String includedDocUrls) {
-        setIncludedDocUrls_Term(includedDocUrls, null);
-    }
-
-    public void setIncludedDocUrls_Equal(String includedDocUrls, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setIncludedDocUrls_Term(includedDocUrls, opLambda);
+    public void setIncludedDocUrls_NotEqual(String includedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIncludedDocUrls_NotTerm(includedDocUrls, opLambda);
     }
 
-    public void setIncludedDocUrls_Term(String includedDocUrls) {
-        setIncludedDocUrls_Term(includedDocUrls, null);
+    public void setIncludedDocUrls_NotTerm(String includedDocUrls) {
+        setIncludedDocUrls_NotTerm(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_Term(String includedDocUrls, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("includedDocUrls", includedDocUrls);
+    public void setIncludedDocUrls_NotTerm(String includedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedDocUrls", includedDocUrls));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1535,6 +1644,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedUrls_NotEqual(String includedUrls) {
+        setIncludedUrls_NotTerm(includedUrls, null);
+    }
+
+    public void setIncludedUrls_NotEqual(String includedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIncludedUrls_NotTerm(includedUrls, opLambda);
+    }
+
+    public void setIncludedUrls_NotTerm(String includedUrls) {
+        setIncludedUrls_NotTerm(includedUrls, null);
+    }
+
+    public void setIncludedUrls_NotTerm(String includedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedUrls", includedUrls));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedUrls_Terms(Collection<String> includedUrlsList) {
         setIncludedUrls_Terms(includedUrlsList, null);
     }
@@ -1682,6 +1810,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIntervalTime_NotEqual(Integer intervalTime) {
+        setIntervalTime_NotTerm(intervalTime, null);
+    }
+
+    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setIntervalTime_NotTerm(intervalTime, opLambda);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime) {
+        setIntervalTime_NotTerm(intervalTime, null);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("intervalTime", intervalTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
         setIntervalTime_Terms(intervalTimeList, null);
     }
@@ -1818,6 +1965,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount) {
+        setMaxAccessCount_NotTerm(maxAccessCount, null);
+    }
+
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount) {
+        setMaxAccessCount_NotTerm(maxAccessCount, null);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxAccessCount", maxAccessCount));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
         setMaxAccessCount_Terms(maxAccessCountList, null);
     }
@@ -1954,6 +2120,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
@@ -2101,6 +2286,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setNumOfThread_NotEqual(Integer numOfThread) {
+        setNumOfThread_NotTerm(numOfThread, null);
+    }
+
+    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setNumOfThread_NotTerm(numOfThread, opLambda);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread) {
+        setNumOfThread_NotTerm(numOfThread, null);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("numOfThread", numOfThread));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
         setNumOfThread_Terms(numOfThreadList, null);
     }
@@ -2237,6 +2441,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSortOrder_NotEqual(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder) {
+        setSortOrder_NotTerm(sortOrder, null);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
         setSortOrder_Terms(sortOrderList, null);
     }
@@ -2373,6 +2596,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_NotEqual(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy) {
+        setUpdatedBy_NotTerm(updatedBy, null);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
         setUpdatedBy_Terms(updatedByList, null);
     }
@@ -2520,6 +2762,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
         setUpdatedTime_Terms(updatedTimeList, null);
     }
@@ -2656,6 +2917,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrls_NotEqual(String urls) {
+        setUrls_NotTerm(urls, null);
+    }
+
+    public void setUrls_NotEqual(String urls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUrls_NotTerm(urls, opLambda);
+    }
+
+    public void setUrls_NotTerm(String urls) {
+        setUrls_NotTerm(urls, null);
+    }
+
+    public void setUrls_NotTerm(String urls, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("urls", urls));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrls_Terms(Collection<String> urlsList) {
         setUrls_Terms(urlsList, null);
     }
@@ -2803,6 +3083,25 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserAgent_NotEqual(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userAgent", userAgent));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserAgent_Terms(Collection<String> userAgentList) {
         setUserAgent_Terms(userAgentList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
index 9d19c865ef3e8d9e8f5dbc419cf173b0f0df8547..168b7c7ced9fe077d5c2034b2a8397e33fff3835 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigToLabelCF;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<WebConfigToLabelCQ, WebConfigToLabelCF> filteredLambda) {
+    public void filtered(FilteredCall<WebConfigToLabelCQ, WebConfigToLabelCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<WebConfigToLabelCQ, WebConfigToLabelCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        WebConfigToLabelCQ query = new WebConfigToLabelCQ();
-        WebConfigToLabelCF filter = new WebConfigToLabelCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<WebConfigToLabelCQ, WebConfigToLabelCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<WebConfigToLabelCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<WebConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        WebConfigToLabelCQ notQuery = new WebConfigToLabelCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         WebConfigToLabelCQ mustQuery = new WebConfigToLabelCQ();
         WebConfigToLabelCQ shouldQuery = new WebConfigToLabelCQ();
         WebConfigToLabelCQ mustNotQuery = new WebConfigToLabelCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        WebConfigToLabelCQ filterQuery = new WebConfigToLabelCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -104,137 +121,57 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("id", id);
+        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_InScope(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_InScope(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
+    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_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsWebConfigToLabelCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsWebConfigToLabelCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -257,6 +194,25 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_NotEqual(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
+    }
+
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId) {
+        setLabelTypeId_NotTerm(labelTypeId, null);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
         setLabelTypeId_Terms(labelTypeIdList, null);
     }
@@ -404,6 +360,25 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_NotEqual(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
         setWebConfigId_Terms(webConfigIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
index 343fbb83d210701df4dbbdba3070aabd37156aac..cccb1f789f7c7c6b79a4106284b354b07be98e97 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.config.cbean.cf.WebConfigToRoleCF;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,17 +56,29 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<WebConfigToRoleCQ, WebConfigToRoleCF> filteredLambda) {
+    public void filtered(FilteredCall<WebConfigToRoleCQ, WebConfigToRoleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<WebConfigToRoleCQ, WebConfigToRoleCF> filteredLambda,
-            ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        WebConfigToRoleCQ query = new WebConfigToRoleCQ();
-        WebConfigToRoleCF filter = new WebConfigToRoleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<WebConfigToRoleCQ, WebConfigToRoleCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<WebConfigToRoleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<WebConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        WebConfigToRoleCQ notQuery = new WebConfigToRoleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -79,9 +93,12 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         WebConfigToRoleCQ mustQuery = new WebConfigToRoleCQ();
         WebConfigToRoleCQ shouldQuery = new WebConfigToRoleCQ();
         WebConfigToRoleCQ mustNotQuery = new WebConfigToRoleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        WebConfigToRoleCQ filterQuery = new WebConfigToRoleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -104,137 +121,57 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("id", id);
+        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_InScope(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_InScope(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
+    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_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsWebConfigToRoleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsWebConfigToRoleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -257,6 +194,25 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_NotEqual(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
+    }
+
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId) {
+        setRoleTypeId_NotTerm(roleTypeId, null);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
         setRoleTypeId_Terms(roleTypeIdList, null);
     }
@@ -404,6 +360,25 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_NotEqual(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId) {
+        setWebConfigId_NotTerm(webConfigId, null);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {
         setWebConfigId_Terms(webConfigIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java
index f593bfcfc28da91f2b6525ee81de72f0b957cb01..d256458ba134844e30aec75df5e5d3b49812bc85 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java
@@ -24,12 +24,10 @@ public class BoostDocumentRule extends BsBoostDocumentRule {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java
index 29e5045d6e33c0e703761b25568b7306149c5c98..17352b1d2fa2cc1de7f6ef919e7f1b04050f96fa 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java
@@ -35,12 +35,10 @@ public class CrawlingSession extends BsCrawlingSession {
         setSessionId(sessionId);
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java
index d90cf744465704a92df32f3d76fcd22c5ed4b6f3..ddffb9805e08c9c754b72f9fc5a598238e93b6eb 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java
@@ -32,12 +32,10 @@ public class CrawlingSessionInfo extends BsCrawlingSessionInfo {
 
     private OptionalEntity<CrawlingSession> crawlingSession;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
index eef9f92aa69a20cdce2b6739d0ee019e13dc0ccb..0e6bbebfc399147ff4b2313e12d5b40332e35863 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
@@ -382,7 +382,6 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java
index 609b0f128f4b061aab37ed8ff35cade1203f909a..388c0b39ffcbd1440c0e0f969bbfae1eb2ceb3de 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java
@@ -24,12 +24,10 @@ public class DataConfigToLabel extends BsDataConfigToLabel {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java
index da47f4933d91211c35c245c056f0f69d82de659e..a30b3b64fe1c28d44ef106af82f3bced89ca8be8 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java
@@ -24,12 +24,10 @@ public class DataConfigToRole extends BsDataConfigToRole {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java
index 3f030183fbb8ba9ea5749cff328ae7943e0a4f82..c966c3b82e8a19da384e14ce08e40abfecf43c6b 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java
@@ -24,12 +24,10 @@ public class FailureUrl extends BsFailureUrl {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
index 94679354909af2b643b568646d0f3f1f70655360..78eedf38fce0fd86eb124f734665eaa97d19af82 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java
@@ -27,12 +27,10 @@ public class FileAuthentication extends BsFileAuthentication {
     private static final long serialVersionUID = 1L;
     private FileConfig fileConfig;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
index bc91ecc0c5fc8fca885a787f848a4ddd79700ceb..9f83c676dfef0e7b0a76a9fcedd9c0bcd91f852b 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
@@ -293,7 +293,6 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java
index a12bc59ae76f6b69c00aafcf56e695b11f457951..fdee4b9b22d3d4328a1727342de7a5d4c9d04bfa 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java
@@ -24,12 +24,10 @@ public class FileConfigToLabel extends BsFileConfigToLabel {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java
index 1448a6be7d275ac8d6c0b4bcba8fbe6fc6dea03d..bbc24522197466c7209e69d49127b1c8d5bdb40e 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java
@@ -24,12 +24,10 @@ public class FileConfigToRole extends BsFileConfigToRole {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java
index 4bf5ba7ecadd2ca55bf11f9336b82b1f0c6202d7..7de6258011827ef7e9838c05d01dc4ef2c95a830 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java
@@ -45,12 +45,10 @@ public class JobLog extends BsJobLog {
         return scheduledJob;
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java
index e9722cfca976973378acd5df1144132c86c26eae..aeb119475496fdae76279bac9387959379e43649 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java
@@ -24,12 +24,10 @@ public class KeyMatch extends BsKeyMatch {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java
index 60650a04dbe1b3da52e0f6e53d0dbc13e71a3698..48b090012cfcd523411af5c644e8ffc78f1269d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java
@@ -24,12 +24,10 @@ public class LabelToRole extends BsLabelToRole {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java
index 1fd8c936f6899e9b3e5bfe56c4973b31c6325572..1a39845791ff691dcc2a0decade869f45d424df2 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java
@@ -80,12 +80,10 @@ public class LabelType extends BsLabelType {
         return roleValueList;
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/OverlappingHost.java b/src/main/java/org/codelibs/fess/es/config/exentity/OverlappingHost.java
index 159b6e8e7ec49fc51362aca14ec3801d430058fb..6718afab107a1dcd9356bd867c7558a684df96d6 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/OverlappingHost.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/OverlappingHost.java
@@ -24,12 +24,10 @@ public class OverlappingHost extends BsOverlappingHost {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
index b4b5100b45b087fae985877aef2f6c9d2e6fcea3..3f663b7233fc2812c9572a12c176303d9ed6b773 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java
@@ -29,12 +29,10 @@ public class PathMapping extends BsPathMapping {
 
     private Pattern regexPattern;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
index 8f7b50f887ad2a12a0835d3359d50de1bc46e0e7..f071bd496f69fdddff7187a0279109f444cb4809 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java
@@ -27,12 +27,10 @@ public class RequestHeader extends BsRequestHeader {
     private static final long serialVersionUID = 1L;
     private WebConfig webConfig;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java
index 0c721d12cac896360ed29a0953d97784d4cd10fd..684363468d0bce4553b6e73e18d3a0bdfae22f62 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java
@@ -24,12 +24,10 @@ public class RoleType extends BsRoleType {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
index e9aef8da7ed8b308521c350d6bf5f7495cd2d1f5..2e4f8ff940109d0d57015a93760e9be517e19592 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
@@ -48,12 +48,10 @@ public class ScheduledJob extends BsScheduledJob {
         new Thread(() -> new TriggeredJob().execute(scheduledJob)).start();
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java
index e69af01ae406fffe155d49f080bbb0b285ab1f57..5d17b9ee01b50e7702b0a0de63548669912115ae 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/SuggestBadWord.java
@@ -24,12 +24,10 @@ public class SuggestBadWord extends BsSuggestBadWord {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java
index faf230b7e55286d08e3a4719ff58157593a4aba5..9406c84ce8bcb3341cf0973d71873e63b2db7f9f 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/SuggestElevateWord.java
@@ -24,12 +24,10 @@ public class SuggestElevateWord extends BsSuggestElevateWord {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
index 170c8b039161cef42e591167d72c0f4361a63c52..21ee331d1d26f971c683869703a2c79e92584813 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
@@ -108,12 +108,10 @@ public class WebAuthentication extends BsWebAuthentication {
         return webConfig;
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
index a17b2934f7e247fb5acea65b7ff3c4f266de20c0..43a14532b68b892afd19079433a3b6a775c09fdc 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
@@ -302,7 +302,6 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java
index 97b166c2714c60fa8388307731573349cec9e10e..b6fa4d0ce0817884c22479afb168229e48ab8664 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java
@@ -24,12 +24,10 @@ public class WebConfigToLabel extends BsWebConfigToLabel {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java
index 293a6ccc4894682383d196c7fa30e9925238679f..54c50b2c52fffe14cacd146ed96faafab9913b9b 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java
@@ -24,12 +24,10 @@ public class WebConfigToRole extends BsWebConfigToRole {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionFilter.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionFilter.java
deleted file mode 100644
index fb97fd4b82b8bf511e933875d64332d2bb6ff865..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionFilter.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2012-2015 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.allcommon;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
-import org.elasticsearch.index.query.IdsFilterBuilder;
-import org.elasticsearch.index.query.MatchAllFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.ScriptFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EsAbstractConditionFilter {
-
-    // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    protected List<FilterBuilder> filterBuilderList;
-
-    // ===================================================================================
-    //                                                                             Control
-    //                                                                             =======
-    public boolean hasFilters() {
-        return filterBuilderList != null && !filterBuilderList.isEmpty();
-    }
-
-    public FilterBuilder getFilter() {
-        if (filterBuilderList == null) {
-            return null;
-        } else if (filterBuilderList.size() == 1) {
-            return filterBuilderList.get(0);
-        }
-        return FilterBuilders.andFilter(filterBuilderList.toArray(new FilterBuilder[filterBuilderList.size()]));
-    }
-
-    public void addFilter(FilterBuilder filterBuilder) {
-        regF(filterBuilder);
-    }
-
-    // ===================================================================================
-    //                                                                               Query
-    //                                                                               =====
-    public void setIds_Equal(Collection<String> idList) {
-        checkEsInvalidQueryCollection("ids", idList);
-        doSetIds_Equal(idList, null);
-    }
-
-    public void setIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        checkEsInvalidQueryCollection("ids", idList);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetIds_Equal(idList, opLambda);
-    }
-
-    protected void doSetIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        IdsFilterBuilder builder = regIdsF(idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void matchAll() {
-        doMatchAll(null);
-    }
-
-    public void matchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        assertObjectNotNull("opLambda", opLambda);
-        doMatchAll(opLambda);
-    }
-
-    protected void doMatchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        MatchAllFilterBuilder builder = FilterBuilders.matchAllFilter();
-        regF(builder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScript(String script) {
-        checkEsInvalidQuery("script", script);
-        doSetScript(script, null);
-    }
-
-    public void setScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        checkEsInvalidQuery("script", script);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetScript(script, opLambda);
-    }
-
-    protected void doSetScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        ScriptFilterBuilder builder = regScriptF(script);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                            Register
-    //                                                                            ========
-    protected void regF(FilterBuilder builder) {
-        assertObjectNotNull("builder", builder);
-        if (filterBuilderList == null) {
-            filterBuilderList = new ArrayList<>();
-        }
-        filterBuilderList.add(builder);
-    }
-
-    protected TermFilterBuilder regTermF(String name, Object value) {
-        checkEsInvalidQuery(name, value);
-        TermFilterBuilder termFilter = FilterBuilders.termFilter(name, value);
-        regF(termFilter);
-        return termFilter;
-    }
-
-    protected TermsFilterBuilder regTermsF(String name, Collection<?> values) {
-        checkEsInvalidQueryCollection(name, values);
-        TermsFilterBuilder termsFilter = FilterBuilders.termsFilter(name, values);
-        regF(termsFilter);
-        return termsFilter;
-    }
-
-    protected PrefixFilterBuilder regPrefixF(String name, String value) {
-        checkEsInvalidQuery(name, value);
-        PrefixFilterBuilder prefixFilter = FilterBuilders.prefixFilter(name, value);
-        regF(prefixFilter);
-        return prefixFilter;
-    }
-
-    protected ExistsFilterBuilder regExistsF(String name) {
-        ExistsFilterBuilder existsFilter = FilterBuilders.existsFilter(name);
-        regF(existsFilter);
-        return existsFilter;
-    }
-
-    protected MissingFilterBuilder regMissingF(String name) {
-        MissingFilterBuilder missingFilter = FilterBuilders.missingFilter(name);
-        regF(missingFilter);
-        return missingFilter;
-    }
-
-    protected RangeFilterBuilder regRangeF(String name, ConditionKey ck, Object value) {
-        checkEsInvalidQuery(name, value);
-        assertObjectNotNull("ck", ck);
-        for (FilterBuilder builder : filterBuilderList) {
-            if (builder instanceof RangeFilterBuilder) {
-                RangeFilterBuilder rangeFilterBuilder = (RangeFilterBuilder) builder;
-                if (rangeFilterBuilder.toString().replaceAll("\\s", "").startsWith("{\"range\":{\"" + name + "\"")) {
-                    addRangeC(rangeFilterBuilder, ck, value);
-                    return rangeFilterBuilder;
-                }
-            }
-        }
-        RangeFilterBuilder rangeFilterBuilder = FilterBuilders.rangeFilter(name);
-        addRangeC(rangeFilterBuilder, ck, value);
-        regF(rangeFilterBuilder);
-        return rangeFilterBuilder;
-    }
-
-    protected void addRangeC(RangeFilterBuilder builder, ConditionKey ck, Object value) {
-        assertObjectNotNull("builder", builder);
-        assertObjectNotNull("ck", ck);
-        if (ck.equals(ConditionKey.CK_GREATER_THAN)) {
-            builder.gt(value);
-        } else if (ck.equals(ConditionKey.CK_GREATER_EQUAL)) {
-            builder.gte(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_THAN)) {
-            builder.lt(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_EQUAL)) {
-            builder.lte(value);
-        }
-    }
-
-    protected ScriptFilterBuilder regScriptF(String script) {
-        checkEsInvalidQuery("script", script);
-        ScriptFilterBuilder scriptFilter = FilterBuilders.scriptFilter(script);
-        regF(scriptFilter);
-        return scriptFilter;
-    }
-
-    protected IdsFilterBuilder regIdsF(Collection<?> values) {
-        checkEsInvalidQueryCollection("idsF", values);
-        IdsFilterBuilder idsFilter = FilterBuilders.idsFilter(values.toArray(new String[values.size()]));
-        regF(idsFilter);
-        return idsFilter;
-    }
-
-    protected BoolFilterBuilder regBoolF(List<FilterBuilder> mustList, List<FilterBuilder> shouldList, List<FilterBuilder> mustNotList) {
-        assertObjectNotNull("mustList", mustList);
-        assertObjectNotNull("shouldList", shouldList);
-        assertObjectNotNull("mustNotList", mustNotList);
-        BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
-        mustList.forEach(query -> {
-            boolFilter.must(query);
-        });
-        shouldList.forEach(query -> {
-            boolFilter.should(query);
-        });
-        mustNotList.forEach(query -> {
-            boolFilter.mustNot(query);
-        });
-        return boolFilter;
-    }
-
-    protected AndFilterBuilder regAndF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        AndFilterBuilder andFilter = FilterBuilders.andFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected OrFilterBuilder regOrF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        OrFilterBuilder andFilter = FilterBuilders.orFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected NotFilterBuilder regNotF(FilterBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        NotFilterBuilder notFilter = FilterBuilders.notFilter(filter);
-        regF(notFilter);
-        return notFilter;
-    }
-
-    protected QueryFilterBuilder regQueryF(QueryBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        QueryFilterBuilder queryFilter = FilterBuilders.queryFilter(filter);
-        regF(queryFilter);
-        return queryFilter;
-    }
-
-    // ===================================================================================
-    //                                                                       Invalid Query
-    //                                                                       =============
-    protected void checkEsInvalidQuery(String name, Object value) {
-        if (value == null || (value instanceof String && ((String) value).isEmpty())) {
-            String msg = "Cannot register null or empty query: name=" + name + " value=" + value;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    protected void checkEsInvalidQueryCollection(String name, Collection<?> values) {
-        if (values == null || values.isEmpty()) {
-            String msg = "Cannot register null or empty query collection: name=" + name + " values=" + values;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                      General Helper
-    //                                                                      ==============
-    protected void assertObjectNotNull(String variableName, Object value) {
-        if (variableName == null) {
-            String msg = "The value should not be null: variableName=null value=" + value;
-            throw new IllegalArgumentException(msg);
-        }
-        if (value == null) {
-            String msg = "The value should not be null: variableName=" + variableName;
-            throw new IllegalArgumentException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                        Assist Class
-    //                                                                        ============
-    @FunctionalInterface
-    public interface ConditionOptionCall<OP extends FilterBuilder> {
-
-        /**
-         * @param op The option of condition to be set up. (NotNull)
-         */
-        void callback(OP op);
-    }
-
-    @FunctionalInterface
-    public interface BoolCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF must, CF should, CF mustNot);
-    }
-
-    @FunctionalInterface
-    public interface OperatorCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF and);
-    }
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index 5352077412f122be495aa026262ea07cbf0610c7..14389c91209c9b292fb925950b98cb870e25bbb3 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -33,9 +33,8 @@ import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 import org.elasticsearch.index.query.FuzzyQueryBuilder;
+import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -141,16 +140,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
-    protected FilteredQueryBuilder regFilteredQ(QueryBuilder queryBuilder, FilterBuilder filterBuilder) {
-        assertObjectNotNull("queryBuilder", queryBuilder);
-        assertObjectNotNull("filterBuilder", filterBuilder);
-        return QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
-    }
 
-    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList) {
+    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList,
+            List<QueryBuilder> filterList) {
         assertObjectNotNull("mustList", mustList);
         assertObjectNotNull("shouldList", shouldList);
         assertObjectNotNull("mustNotList", mustNotList);
+        assertObjectNotNull("filterList", filterList);
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         mustList.forEach(query -> {
             boolQuery.must(query);
@@ -161,6 +157,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         mustNotList.forEach(query -> {
             boolQuery.mustNot(query);
         });
+        filterList.forEach(query -> {
+            boolQuery.filter(query);
+        });
         return boolQuery;
     }
 
@@ -178,6 +177,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return termsQuery;
     }
 
+    protected IdsQueryBuilder regIdsQ(Collection<String> values) {
+        checkEsInvalidQueryCollection("_id", values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        regQ(idsQuery);
+        return idsQuery;
+    }
+
     protected MatchQueryBuilder regMatchQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
         MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, value);
@@ -453,11 +459,11 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface BoolCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ must, CQ should, CQ mustNot);
+        void callback(CQ must, CQ should, CQ mustNot, CQ filter);
     }
 
     @FunctionalInterface
-    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionFilter> {
+    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionQuery> {
 
         void callback(CQ query, CF filter);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
index dca7a6a4755055e72f241cf6421d277cdc7b6a4c..52a14ab94c07ce8f932aae9ac98bcbabde179e0c 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
@@ -176,39 +176,54 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl
     }
 
     // ===================================================================================
-    //                                                                      Basic Override
+    //                                                                      Classification
     //                                                                      ==============
     @Override
-    public int instanceHash() { // #pending
-        return 0;
+    public void myunlockUndefinedClassificationAccess() {
     }
 
     @Override
-    public String toStringWithRelation() { // #pending
-        return null;
+    public boolean myundefinedClassificationAccessAllowed() {
+        return false;
     }
 
-    @Override
-    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
-        return null;
+    // ===================================================================================
+    //                                                                        Empty String
+    //                                                                        ============
+    protected String convertEmptyToNull(String value) {
+        return (value != null && value.length() == 0) ? null : value;
     }
 
     // ===================================================================================
-    //                                                                      Classification
+    //                                                                              Source
+    //                                                                              ======
+    public abstract Map<String, Object> toSource();
+
+    // ===================================================================================
+    //                                                                      Basic Override
     //                                                                      ==============
+    // #pending hashCode(), equals()
     @Override
-    public void myunlockUndefinedClassificationAccess() {
+    public int instanceHash() {
+        return super.hashCode();
     }
 
     @Override
-    public boolean myundefinedClassificationAccessAllowed() {
-        return false;
+    public String toString() {
+        return getClass().getSimpleName() + ":" + doBuildColumnString(", ") + "@" + Integer.toHexString(hashCode());
     }
 
-    // ===================================================================================
-    //                                                                              Source
-    //                                                                              ======
-    public abstract Map<String, Object> toSource();
+    protected abstract String doBuildColumnString(String dm);
+
+    @Override
+    public String toStringWithRelation() { // #pending
+        return toString();
+    }
+
+    @Override
+    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
+        return toString();
+    }
 
     // ===================================================================================
     //                                                                        Assist Class
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
index 06359e3a41baac53e3e2ebfaaa2d8199ef61694a..8102b2943929a1edd9bbe5ebb2f86bda80d607bd 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
@@ -74,7 +74,6 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior<ClickLog, ClickLo
     protected <RESULT extends ClickLog> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setRequestedTime(DfTypeUtil.toLong(source.get("requestedTime")));
             result.setSearchLogId(DfTypeUtil.toString(source.get("searchLogId")));
             result.setUrl(DfTypeUtil.toString(source.get("url")));
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsEventLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsEventLogBhv.java
index 6cefde4fd663564ad08bfce26f29afa8f8215e3d..7c8f1e173e8f1545fa5fdde7292f3be1e811b7e6 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsEventLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsEventLogBhv.java
@@ -77,7 +77,6 @@ public abstract class BsEventLogBhv extends EsAbstractBehavior<EventLog, EventLo
             result.setCreatedAt(DfTypeUtil.toLocalDateTime(source.get("createdAt")));
             result.setCreatedBy(DfTypeUtil.toString(source.get("createdBy")));
             result.setEventType(DfTypeUtil.toString(source.get("eventType")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setMessage(DfTypeUtil.toString(source.get("message")));
             result.setPath(DfTypeUtil.toString(source.get("path")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
index 0ab99e8c5c15b31977ac36c665da2a830dfa377e..c1b6f0cbd86f564cf749986d66cf446ca5e25086 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
@@ -75,7 +75,6 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior<FavoriteLog, F
         try {
             final RESULT result = entityType.newInstance();
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setUrl(DfTypeUtil.toString(source.get("url")));
             result.setUserInfoId(DfTypeUtil.toString(source.get("userInfoId")));
             return result;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchFieldLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchFieldLogBhv.java
index ad61b2ee8f569306ea5f7bb94cb191055afe3ca8..d6b5e44f7bd1a5b2364565891bf26f7e0bc063e1 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchFieldLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchFieldLogBhv.java
@@ -74,7 +74,6 @@ public abstract class BsSearchFieldLogBhv extends EsAbstractBehavior<SearchField
     protected <RESULT extends SearchFieldLog> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setSearchLogId(DfTypeUtil.toString(source.get("searchLogId")));
             result.setValue(DfTypeUtil.toString(source.get("value")));
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
index 40890dea9880fdfac1b14a96d25c6a4ff2a5601b..f0b167ec2365c11d1c5dfc15b3b1d10dee10171f 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
@@ -77,7 +77,6 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior<SearchLog, Searc
             result.setAccessType(DfTypeUtil.toString(source.get("accessType")));
             result.setClientIp(DfTypeUtil.toString(source.get("clientIp")));
             result.setHitCount(DfTypeUtil.toLong(source.get("hitCount")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setQueryOffset(DfTypeUtil.toInteger(source.get("queryOffset")));
             result.setQueryPageSize(DfTypeUtil.toInteger(source.get("queryPageSize")));
             result.setReferer(DfTypeUtil.toString(source.get("referer")));
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
index 236787fddb7a5fb2fe5e30a1c79cb16b20933394..f46db472bdf21299b437c6fb2c2fb70d48b33849 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
@@ -76,7 +76,6 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior<UserInfo, UserInf
             final RESULT result = entityType.newInstance();
             result.setCode(DfTypeUtil.toString(source.get("code")));
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
index 617121a8080d0c0a6f992961f22170dea6b464ff..1a53873911816db5997d0dca867ea3ed5c9b9a76 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
  */
 public class BsClickLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public ClickLogDbm asDBMeta() {
-        return ClickLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "click_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -56,18 +49,55 @@ public class BsClickLog extends EsAbstractEntity {
     // [Referrers] *comment only
 
     // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public ClickLogDbm asDBMeta() {
+        return ClickLogDbm.getInstance();
     }
 
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
+    @Override
+    public String asTableDbName() {
+        return "click_log";
     }
 
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (requestedTime != null) {
+            sourceMap.put("requestedTime", requestedTime);
+        }
+        if (searchLogId != null) {
+            sourceMap.put("searchLogId", searchLogId);
+        }
+        if (url != null) {
+            sourceMap.put("url", url);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(requestedTime);
+        sb.append(dm).append(searchLogId);
+        sb.append(dm).append(url);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
     public Long getRequestedTime() {
         checkSpecifiedProperty("requestedTime");
         return requestedTime;
@@ -80,7 +110,7 @@ public class BsClickLog extends EsAbstractEntity {
 
     public String getSearchLogId() {
         checkSpecifiedProperty("searchLogId");
-        return searchLogId;
+        return convertEmptyToNull(searchLogId);
     }
 
     public void setSearchLogId(String value) {
@@ -90,29 +120,11 @@ public class BsClickLog extends EsAbstractEntity {
 
     public String getUrl() {
         checkSpecifiedProperty("url");
-        return url;
+        return convertEmptyToNull(url);
     }
 
     public void setUrl(String value) {
         registerModifiedProperty("url");
         this.url = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (requestedTime != null) {
-            sourceMap.put("requestedTime", requestedTime);
-        }
-        if (searchLogId != null) {
-            sourceMap.put("searchLogId", searchLogId);
-        }
-        if (url != null) {
-            sourceMap.put("url", url);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsEventLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsEventLog.java
index be40e2a2a40096a11526d2c1f781f582131e8334..e53d7054bad5f6890659e131e36a450014af1c06 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsEventLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsEventLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.EventLogDbm;
  */
 public class BsEventLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public EventLogDbm asDBMeta() {
-        return EventLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "event_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -61,6 +54,61 @@ public class BsEventLog extends EsAbstractEntity {
 
     // [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
     //                                                                            ========
@@ -76,7 +124,7 @@ public class BsEventLog extends EsAbstractEntity {
 
     public String getCreatedBy() {
         checkSpecifiedProperty("createdBy");
-        return createdBy;
+        return convertEmptyToNull(createdBy);
     }
 
     public void setCreatedBy(String value) {
@@ -86,7 +134,7 @@ public class BsEventLog extends EsAbstractEntity {
 
     public String getEventType() {
         checkSpecifiedProperty("eventType");
-        return eventType;
+        return convertEmptyToNull(eventType);
     }
 
     public void setEventType(String value) {
@@ -94,19 +142,9 @@ public class BsEventLog extends EsAbstractEntity {
         this.eventType = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getMessage() {
         checkSpecifiedProperty("message");
-        return message;
+        return convertEmptyToNull(message);
     }
 
     public void setMessage(String value) {
@@ -116,35 +154,11 @@ public class BsEventLog extends EsAbstractEntity {
 
     public String getPath() {
         checkSpecifiedProperty("path");
-        return path;
+        return convertEmptyToNull(path);
     }
 
     public void setPath(String value) {
         registerModifiedProperty("path");
         this.path = value;
     }
-
-    @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 (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (message != null) {
-            sourceMap.put("message", message);
-        }
-        if (path != null) {
-            sourceMap.put("path", path);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
index 0ac12da0f87c6e7b2a06d50c767bf2ea4b0d4c8a..4561d86bb214b67c82628a0271c80796a10890a0 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
  */
 public class BsFavoriteLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public FavoriteLogDbm asDBMeta() {
-        return FavoriteLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "favorite_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -55,6 +48,53 @@ public class BsFavoriteLog extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public FavoriteLogDbm asDBMeta() {
+        return FavoriteLogDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "favorite_log";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (url != null) {
+            sourceMap.put("url", url);
+        }
+        if (userInfoId != null) {
+            sourceMap.put("userInfoId", userInfoId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(url);
+        sb.append(dm).append(userInfoId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -68,19 +108,9 @@ public class BsFavoriteLog extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getUrl() {
         checkSpecifiedProperty("url");
-        return url;
+        return convertEmptyToNull(url);
     }
 
     public void setUrl(String value) {
@@ -90,29 +120,11 @@ public class BsFavoriteLog extends EsAbstractEntity {
 
     public String getUserInfoId() {
         checkSpecifiedProperty("userInfoId");
-        return userInfoId;
+        return convertEmptyToNull(userInfoId);
     }
 
     public void setUserInfoId(String value) {
         registerModifiedProperty("userInfoId");
         this.userInfoId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (url != null) {
-            sourceMap.put("url", url);
-        }
-        if (userInfoId != null) {
-            sourceMap.put("userInfoId", userInfoId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchFieldLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchFieldLog.java
index dcc6fa7581659c8d97143ee562328527c3d7f42c..5c7a6acab367313888b3be46063eb8cfe31e3302 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchFieldLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchFieldLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.SearchFieldLogDbm;
  */
 public class BsSearchFieldLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public SearchFieldLogDbm asDBMeta() {
-        return SearchFieldLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "search_field_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -56,21 +49,58 @@ public class BsSearchFieldLog extends EsAbstractEntity {
     // [Referrers] *comment only
 
     // ===================================================================================
-    //                                                                            Accessor
-    //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public SearchFieldLogDbm asDBMeta() {
+        return SearchFieldLogDbm.getInstance();
     }
 
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
+    @Override
+    public String asTableDbName() {
+        return "search_field_log";
     }
 
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (searchLogId != null) {
+            sourceMap.put("searchLogId", searchLogId);
+        }
+        if (value != null) {
+            sourceMap.put("value", value);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(name);
+        sb.append(dm).append(searchLogId);
+        sb.append(dm).append(value);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
+    // ===================================================================================
+    //                                                                            Accessor
+    //                                                                            ========
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -80,7 +110,7 @@ public class BsSearchFieldLog extends EsAbstractEntity {
 
     public String getSearchLogId() {
         checkSpecifiedProperty("searchLogId");
-        return searchLogId;
+        return convertEmptyToNull(searchLogId);
     }
 
     public void setSearchLogId(String value) {
@@ -90,29 +120,11 @@ public class BsSearchFieldLog extends EsAbstractEntity {
 
     public String getValue() {
         checkSpecifiedProperty("value");
-        return value;
+        return convertEmptyToNull(value);
     }
 
     public void setValue(String value) {
         registerModifiedProperty("value");
         this.value = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (searchLogId != null) {
-            sourceMap.put("searchLogId", searchLogId);
-        }
-        if (value != null) {
-            sourceMap.put("value", value);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
index add595b2e9eb24c4c3d5f161ed75e4faf7092082..74932d9d5b738f41791873d66cdc775fdee7b38d 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
  */
 public class BsSearchLog extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public SearchLogDbm asDBMeta() {
-        return SearchLogDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "search_log";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -82,12 +75,95 @@ public class BsSearchLog extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public SearchLogDbm asDBMeta() {
+        return SearchLogDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "search_log";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (accessType != null) {
+            sourceMap.put("accessType", accessType);
+        }
+        if (clientIp != null) {
+            sourceMap.put("clientIp", clientIp);
+        }
+        if (hitCount != null) {
+            sourceMap.put("hitCount", hitCount);
+        }
+        if (queryOffset != null) {
+            sourceMap.put("queryOffset", queryOffset);
+        }
+        if (queryPageSize != null) {
+            sourceMap.put("queryPageSize", queryPageSize);
+        }
+        if (referer != null) {
+            sourceMap.put("referer", referer);
+        }
+        if (requestedTime != null) {
+            sourceMap.put("requestedTime", requestedTime);
+        }
+        if (responseTime != null) {
+            sourceMap.put("responseTime", responseTime);
+        }
+        if (searchWord != null) {
+            sourceMap.put("searchWord", searchWord);
+        }
+        if (userAgent != null) {
+            sourceMap.put("userAgent", userAgent);
+        }
+        if (userInfoId != null) {
+            sourceMap.put("userInfoId", userInfoId);
+        }
+        if (userSessionId != null) {
+            sourceMap.put("userSessionId", userSessionId);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(accessType);
+        sb.append(dm).append(clientIp);
+        sb.append(dm).append(hitCount);
+        sb.append(dm).append(queryOffset);
+        sb.append(dm).append(queryPageSize);
+        sb.append(dm).append(referer);
+        sb.append(dm).append(requestedTime);
+        sb.append(dm).append(responseTime);
+        sb.append(dm).append(searchWord);
+        sb.append(dm).append(userAgent);
+        sb.append(dm).append(userInfoId);
+        sb.append(dm).append(userSessionId);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getAccessType() {
         checkSpecifiedProperty("accessType");
-        return accessType;
+        return convertEmptyToNull(accessType);
     }
 
     public void setAccessType(String value) {
@@ -97,7 +173,7 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getClientIp() {
         checkSpecifiedProperty("clientIp");
-        return clientIp;
+        return convertEmptyToNull(clientIp);
     }
 
     public void setClientIp(String value) {
@@ -115,16 +191,6 @@ public class BsSearchLog extends EsAbstractEntity {
         this.hitCount = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Integer getQueryOffset() {
         checkSpecifiedProperty("queryOffset");
         return queryOffset;
@@ -147,7 +213,7 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getReferer() {
         checkSpecifiedProperty("referer");
-        return referer;
+        return convertEmptyToNull(referer);
     }
 
     public void setReferer(String value) {
@@ -177,7 +243,7 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getSearchWord() {
         checkSpecifiedProperty("searchWord");
-        return searchWord;
+        return convertEmptyToNull(searchWord);
     }
 
     public void setSearchWord(String value) {
@@ -187,7 +253,7 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getUserAgent() {
         checkSpecifiedProperty("userAgent");
-        return userAgent;
+        return convertEmptyToNull(userAgent);
     }
 
     public void setUserAgent(String value) {
@@ -197,7 +263,7 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getUserInfoId() {
         checkSpecifiedProperty("userInfoId");
-        return userInfoId;
+        return convertEmptyToNull(userInfoId);
     }
 
     public void setUserInfoId(String value) {
@@ -207,56 +273,11 @@ public class BsSearchLog extends EsAbstractEntity {
 
     public String getUserSessionId() {
         checkSpecifiedProperty("userSessionId");
-        return userSessionId;
+        return convertEmptyToNull(userSessionId);
     }
 
     public void setUserSessionId(String value) {
         registerModifiedProperty("userSessionId");
         this.userSessionId = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (accessType != null) {
-            sourceMap.put("accessType", accessType);
-        }
-        if (clientIp != null) {
-            sourceMap.put("clientIp", clientIp);
-        }
-        if (hitCount != null) {
-            sourceMap.put("hitCount", hitCount);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (queryOffset != null) {
-            sourceMap.put("queryOffset", queryOffset);
-        }
-        if (queryPageSize != null) {
-            sourceMap.put("queryPageSize", queryPageSize);
-        }
-        if (referer != null) {
-            sourceMap.put("referer", referer);
-        }
-        if (requestedTime != null) {
-            sourceMap.put("requestedTime", requestedTime);
-        }
-        if (responseTime != null) {
-            sourceMap.put("responseTime", responseTime);
-        }
-        if (searchWord != null) {
-            sourceMap.put("searchWord", searchWord);
-        }
-        if (userAgent != null) {
-            sourceMap.put("userAgent", userAgent);
-        }
-        if (userInfoId != null) {
-            sourceMap.put("userInfoId", userInfoId);
-        }
-        if (userSessionId != null) {
-            sourceMap.put("userSessionId", userSessionId);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java
index fb3bad26aaf271854c602642cf990521b7b2274c..c8e6d7f776b83c7f1c72f0e8f02a6e053539c486 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
  */
 public class BsUserInfo extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public UserInfoDbm asDBMeta() {
-        return UserInfoDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "user_info";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -55,12 +48,59 @@ public class BsUserInfo extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public UserInfoDbm asDBMeta() {
+        return UserInfoDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "user_info";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (code != null) {
+            sourceMap.put("code", code);
+        }
+        if (createdTime != null) {
+            sourceMap.put("createdTime", createdTime);
+        }
+        if (updatedTime != null) {
+            sourceMap.put("updatedTime", updatedTime);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(code);
+        sb.append(dm).append(createdTime);
+        sb.append(dm).append(updatedTime);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
     public String getCode() {
         checkSpecifiedProperty("code");
-        return code;
+        return convertEmptyToNull(code);
     }
 
     public void setCode(String value) {
@@ -78,16 +118,6 @@ public class BsUserInfo extends EsAbstractEntity {
         this.createdTime = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public Long getUpdatedTime() {
         checkSpecifiedProperty("updatedTime");
         return updatedTime;
@@ -97,22 +127,4 @@ public class BsUserInfo extends EsAbstractEntity {
         registerModifiedProperty("updatedTime");
         this.updatedTime = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (code != null) {
-            sourceMap.put("code", code);
-        }
-        if (createdTime != null) {
-            sourceMap.put("createdTime", createdTime);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (updatedTime != null) {
-            sourceMap.put("updatedTime", updatedTime);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
index 5fae6e67c9d942a5e9293eb8171227600f8a3612..bc1a6a44cab1bb542f81888386effdd5d01da78e 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
@@ -79,7 +79,6 @@ public class ClickLogDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((ClickLog) et).getId(), (et, vl) -> ((ClickLog) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedTime(), (et, vl) -> ((ClickLog) et).setRequestedTime(DfTypeUtil.toLong(vl)),
                 "requestedTime");
         setupEpg(_epgMap, et -> ((ClickLog) et).getSearchLogId(), (et, vl) -> ((ClickLog) et).setSearchLogId(DfTypeUtil.toString(vl)),
@@ -121,8 +120,6 @@ public class ClickLogDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRequestedTime = cci("requestedTime", "requestedTime", null, null, Long.class, "requestedTime", null,
             false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false,
@@ -130,10 +127,6 @@ public class ClickLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
             null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnRequestedTime() {
         return _columnRequestedTime;
     }
@@ -148,7 +141,6 @@ public class ClickLogDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnRequestedTime());
         ls.add(columnSearchLogId());
         ls.add(columnUrl());
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java
index 77c845d17284eea514a5410d32949687341d15d9..73e0e724e5e1f20a0cdfcf491549df71b7f5b4e6 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java
@@ -85,7 +85,6 @@ public class EventLogDbm extends AbstractDBMeta {
                 "createdBy");
         setupEpg(_epgMap, et -> ((EventLog) et).getEventType(), (et, vl) -> ((EventLog) et).setEventType(DfTypeUtil.toString(vl)),
                 "eventType");
-        setupEpg(_epgMap, et -> ((EventLog) et).getId(), (et, vl) -> ((EventLog) et).setId(DfTypeUtil.toString(vl)), "id");
         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");
     }
@@ -130,8 +129,6 @@ public class EventLogDbm extends AbstractDBMeta {
             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 _columnId = cci("id", "id", null, null, String.class, "id", 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,
@@ -149,10 +146,6 @@ public class EventLogDbm extends AbstractDBMeta {
         return _columnEventType;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnMessage() {
         return _columnMessage;
     }
@@ -166,7 +159,6 @@ public class EventLogDbm extends AbstractDBMeta {
         ls.add(columnCreatedAt());
         ls.add(columnCreatedBy());
         ls.add(columnEventType());
-        ls.add(columnId());
         ls.add(columnMessage());
         ls.add(columnPath());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
index 9b172eaeb0ede95fcce92f8e19ee17947def51a6..cbb590fda605c9f83454a1d01fb5e8d0c16602a0 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
@@ -81,7 +81,6 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     {
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedTime(), (et, vl) -> ((FavoriteLog) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
-        setupEpg(_epgMap, et -> ((FavoriteLog) et).getId(), (et, vl) -> ((FavoriteLog) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url");
         setupEpg(_epgMap, et -> ((FavoriteLog) et).getUserInfoId(), (et, vl) -> ((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)),
                 "userInfoId");
@@ -123,8 +122,6 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
             null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
@@ -134,10 +131,6 @@ public class FavoriteLogDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnUrl() {
         return _columnUrl;
     }
@@ -149,7 +142,6 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnUrl());
         ls.add(columnUserInfoId());
         return ls;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
index 545e861da166680b569f092875edc606692b3ba9..581a24cf97a54a0621ca859146cc13462fb53e3c 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
@@ -79,7 +79,6 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((SearchFieldLog) et).getId(), (et, vl) -> ((SearchFieldLog) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((SearchFieldLog) et).getName(), (et, vl) -> ((SearchFieldLog) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((SearchFieldLog) et).getSearchLogId(),
                 (et, vl) -> ((SearchFieldLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId");
@@ -121,8 +120,6 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false,
@@ -130,10 +127,6 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
             0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -148,7 +141,6 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnSearchLogId());
         ls.add(columnValue());
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
index 8ee0cf98a0bf8e99d589308d98960c1c080409d3..b85c57cba3dc3edf7a4e7ee4dbbd60d5f09fae3e 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
@@ -84,7 +84,6 @@ public class SearchLogDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)),
                 "clientIp");
         setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount");
-        setupEpg(_epgMap, et -> ((SearchLog) et).getId(), (et, vl) -> ((SearchLog) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((SearchLog) et).getQueryOffset(), (et, vl) -> ((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)),
                 "queryOffset");
         setupEpg(_epgMap, et -> ((SearchLog) et).getQueryPageSize(),
@@ -144,8 +143,6 @@ public class SearchLogDbm extends AbstractDBMeta {
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false,
             "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize",
@@ -177,10 +174,6 @@ public class SearchLogDbm extends AbstractDBMeta {
         return _columnHitCount;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnQueryOffset() {
         return _columnQueryOffset;
     }
@@ -222,7 +215,6 @@ public class SearchLogDbm extends AbstractDBMeta {
         ls.add(columnAccessType());
         ls.add(columnClientIp());
         ls.add(columnHitCount());
-        ls.add(columnId());
         ls.add(columnQueryOffset());
         ls.add(columnQueryPageSize());
         ls.add(columnReferer());
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java
index 1221d143341116bfb97ea95bad914bf9e28f43fc..444ae6a5c858ec2a691de482c733713041321294 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java
@@ -82,7 +82,6 @@ public class UserInfoDbm extends AbstractDBMeta {
         setupEpg(_epgMap, et -> ((UserInfo) et).getCode(), (et, vl) -> ((UserInfo) et).setCode(DfTypeUtil.toString(vl)), "code");
         setupEpg(_epgMap, et -> ((UserInfo) et).getCreatedTime(), (et, vl) -> ((UserInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)),
                 "createdTime");
-        setupEpg(_epgMap, et -> ((UserInfo) et).getId(), (et, vl) -> ((UserInfo) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((UserInfo) et).getUpdatedTime(), (et, vl) -> ((UserInfo) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
                 "updatedTime");
     }
@@ -125,8 +124,6 @@ public class UserInfoDbm extends AbstractDBMeta {
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
@@ -138,10 +135,6 @@ public class UserInfoDbm extends AbstractDBMeta {
         return _columnCreatedTime;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnUpdatedTime() {
         return _columnUpdatedTime;
     }
@@ -150,7 +143,6 @@ public class UserInfoDbm extends AbstractDBMeta {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnCode());
         ls.add(columnCreatedTime());
-        ls.add(columnId());
         ls.add(columnUpdatedTime());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
index 02b21d4cdce448dfcff0da152634427b1dae471d..518563f800e290c366709c7ba8537549c3d95668 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
@@ -155,7 +155,7 @@ public class BsClickLogCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnRequestedTime() {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java
index cc14f4d17ef88c52160565114ed0fc58f2071f60..f4f4727ddf4c103adb4a962889346a0788c6e415 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java
@@ -154,6 +154,10 @@ public class BsEventLogCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCreatedAt() {
             doColumn("createdAt");
         }
@@ -166,10 +170,6 @@ public class BsEventLogCB extends EsAbstractConditionBean {
             doColumn("eventType");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnMessage() {
             doColumn("message");
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
index ce84ffe7e4dbec4aa37bb6cb714ecc214dbaee4e..08c3e9705945e92325b13b341fd2c101448f909a 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
@@ -154,12 +154,12 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnCreatedTime() {
-            doColumn("createdTime");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnCreatedTime() {
+            doColumn("createdTime");
         }
 
         public void columnUrl() {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java
index 95541f2170f63ee5f472cbe0b6c3c0e40762fc5e..4a4302353699c2b75315846a78c23de150c776f9 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java
@@ -155,7 +155,7 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnName() {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
index fb0a3aa81d52bb398161ae605dee8ff8fef4ec37..ae41a338f2b321e78b67833203739f9f2b3e063d 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
@@ -154,6 +154,10 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnAccessType() {
             doColumn("accessType");
         }
@@ -166,10 +170,6 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
             doColumn("hitCount");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnQueryOffset() {
             doColumn("queryOffset");
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
index 569cdc0308905164b82bc761b40a3ee91ecde2e3..498a91821fecfc6ff2a1cbd3a4fba1a37abb5e54 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
@@ -154,6 +154,10 @@ public class BsUserInfoCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
+        public void columnId() {
+            doColumn("_id");
+        }
+
         public void columnCode() {
             doColumn("code");
         }
@@ -162,10 +166,6 @@ public class BsUserInfoCB extends EsAbstractConditionBean {
             doColumn("createdTime");
         }
 
-        public void columnId() {
-            doColumn("id");
-        }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/ClickLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/ClickLogCF.java
deleted file mode 100644
index 778690f440b8e1049dfb6a60dce2a52696f44c72..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/ClickLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsClickLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class ClickLogCF extends BsClickLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/EventLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/EventLogCF.java
deleted file mode 100644
index 294fa1b5737b98f922f66adf8d9ee2ba2eeacfb9..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/EventLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsEventLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EventLogCF extends BsEventLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/FavoriteLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/FavoriteLogCF.java
deleted file mode 100644
index ce69abaf76c9176106777b55c395e709818eab5f..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/FavoriteLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsFavoriteLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FavoriteLogCF extends BsFavoriteLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchFieldLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchFieldLogCF.java
deleted file mode 100644
index 98a5dbee2439d564f2a1a821c4f77ae7615b3838..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchFieldLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsSearchFieldLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SearchFieldLogCF extends BsSearchFieldLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchLogCF.java
deleted file mode 100644
index ab748f56932b84b70c0d76a2974cd831c3d46540..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/SearchLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsSearchLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SearchLogCF extends BsSearchLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/UserInfoCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/UserInfoCF.java
deleted file mode 100644
index 7c12354a7ebd047f3d34d086b7c5ed9bfc3c8f8e..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/UserInfoCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf;
-
-import org.codelibs.fess.es.log.cbean.cf.bs.BsUserInfoCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class UserInfoCF extends BsUserInfoCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsClickLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsClickLogCF.java
deleted file mode 100644
index b00effdd62fab644be9df6343f97ddab25b68faf..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsClickLogCF.java
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.ClickLogCF;
-import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsClickLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<ClickLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<ClickLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        ClickLogCF mustFilter = new ClickLogCF();
-        ClickLogCF shouldFilter = new ClickLogCF();
-        ClickLogCF mustNotFilter = new ClickLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<ClickLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<ClickLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        ClickLogCF andFilter = new ClickLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<ClickLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<ClickLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        ClickLogCF orFilter = new ClickLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<ClickLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<ClickLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        ClickLogCF notFilter = new ClickLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<ClickLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<ClickLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        ClickLogCQ query = new ClickLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_NotEqual(Long requestedTime) {
-        setRequestedTime_NotEqual(requestedTime, null, null);
-    }
-
-    public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRequestedTime_Equal(requestedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRequestedTime_Equal(Long requestedTime) {
-        setRequestedTime_Term(requestedTime, null);
-    }
-
-    public void setRequestedTime_Equal(Long requestedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRequestedTime_Term(requestedTime, opLambda);
-    }
-
-    public void setRequestedTime_Term(Long requestedTime) {
-        setRequestedTime_Term(requestedTime, null);
-    }
-
-    public void setRequestedTime_Term(Long requestedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("requestedTime", requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_Terms(Collection<Long> requestedTimeList) {
-        setRequestedTime_Terms(requestedTimeList, null);
-    }
-
-    public void setRequestedTime_Terms(Collection<Long> requestedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("requestedTime", requestedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_InScope(Collection<Long> requestedTimeList) {
-        setRequestedTime_Terms(requestedTimeList, null);
-    }
-
-    public void setRequestedTime_InScope(Collection<Long> requestedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRequestedTime_Terms(requestedTimeList, opLambda);
-    }
-
-    public void setRequestedTime_Exists() {
-        setRequestedTime_Exists(null);
-    }
-
-    public void setRequestedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("requestedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_Missing() {
-        setRequestedTime_Missing(null);
-    }
-
-    public void setRequestedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("requestedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_GreaterThan(Long requestedTime) {
-        setRequestedTime_GreaterThan(requestedTime, null);
-    }
-
-    public void setRequestedTime_GreaterThan(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_GREATER_THAN, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_LessThan(Long requestedTime) {
-        setRequestedTime_LessThan(requestedTime, null);
-    }
-
-    public void setRequestedTime_LessThan(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_LESS_THAN, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_GreaterEqual(Long requestedTime) {
-        setRequestedTime_GreaterEqual(requestedTime, null);
-    }
-
-    public void setRequestedTime_GreaterEqual(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_GREATER_EQUAL, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_LessEqual(Long requestedTime) {
-        setRequestedTime_LessEqual(requestedTime, null);
-    }
-
-    public void setRequestedTime_LessEqual(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_LESS_EQUAL, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_NotEqual(String searchLogId) {
-        setSearchLogId_NotEqual(searchLogId, null, null);
-    }
-
-    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSearchLogId_Equal(searchLogId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSearchLogId_Equal(String searchLogId) {
-        setSearchLogId_Term(searchLogId, null);
-    }
-
-    public void setSearchLogId_Equal(String searchLogId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSearchLogId_Term(searchLogId, opLambda);
-    }
-
-    public void setSearchLogId_Term(String searchLogId) {
-        setSearchLogId_Term(searchLogId, null);
-    }
-
-    public void setSearchLogId_Term(String searchLogId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("searchLogId", searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Terms(Collection<String> searchLogIdList) {
-        setSearchLogId_Terms(searchLogIdList, null);
-    }
-
-    public void setSearchLogId_Terms(Collection<String> searchLogIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("searchLogId", searchLogIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_InScope(Collection<String> searchLogIdList) {
-        setSearchLogId_Terms(searchLogIdList, null);
-    }
-
-    public void setSearchLogId_InScope(Collection<String> searchLogIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSearchLogId_Terms(searchLogIdList, opLambda);
-    }
-
-    public void setSearchLogId_Prefix(String searchLogId) {
-        setSearchLogId_Prefix(searchLogId, null);
-    }
-
-    public void setSearchLogId_Prefix(String searchLogId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("searchLogId", searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Exists() {
-        setSearchLogId_Exists(null);
-    }
-
-    public void setSearchLogId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("searchLogId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Missing() {
-        setSearchLogId_Missing(null);
-    }
-
-    public void setSearchLogId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("searchLogId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_GreaterThan(String searchLogId) {
-        setSearchLogId_GreaterThan(searchLogId, null);
-    }
-
-    public void setSearchLogId_GreaterThan(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_GREATER_THAN, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_LessThan(String searchLogId) {
-        setSearchLogId_LessThan(searchLogId, null);
-    }
-
-    public void setSearchLogId_LessThan(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_LESS_THAN, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_GreaterEqual(String searchLogId) {
-        setSearchLogId_GreaterEqual(searchLogId, null);
-    }
-
-    public void setSearchLogId_GreaterEqual(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_GREATER_EQUAL, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_LessEqual(String searchLogId) {
-        setSearchLogId_LessEqual(searchLogId, null);
-    }
-
-    public void setSearchLogId_LessEqual(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_LESS_EQUAL, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_NotEqual(String url) {
-        setUrl_NotEqual(url, null, null);
-    }
-
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUrl_Equal(url, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUrl_Equal(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Equal(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUrl_Term(url, opLambda);
-    }
-
-    public void setUrl_Term(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Term(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Terms(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_Terms(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("url", urlList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_InScope(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_InScope(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUrl_Terms(urlList, opLambda);
-    }
-
-    public void setUrl_Prefix(String url) {
-        setUrl_Prefix(url, null);
-    }
-
-    public void setUrl_Prefix(String url, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Exists() {
-        setUrl_Exists(null);
-    }
-
-    public void setUrl_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Missing() {
-        setUrl_Missing(null);
-    }
-
-    public void setUrl_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterThan(String url) {
-        setUrl_GreaterThan(url, null);
-    }
-
-    public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessThan(String url) {
-        setUrl_LessThan(url, null);
-    }
-
-    public void setUrl_LessThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterEqual(String url) {
-        setUrl_GreaterEqual(url, null);
-    }
-
-    public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessEqual(String url) {
-        setUrl_LessEqual(url, null);
-    }
-
-    public void setUrl_LessEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsEventLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsEventLogCF.java
deleted file mode 100644
index 7f6d025b72cf1e4be5f25cc770e2f0fe1221089e..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsEventLogCF.java
+++ /dev/null
@@ -1,879 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.EventLogCF;
-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.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsEventLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<EventLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<EventLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        EventLogCF mustFilter = new EventLogCF();
-        EventLogCF shouldFilter = new EventLogCF();
-        EventLogCF mustNotFilter = new EventLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<EventLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<EventLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        EventLogCF andFilter = new EventLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<EventLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<EventLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        EventLogCF orFilter = new EventLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<EventLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<EventLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        EventLogCF notFilter = new EventLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<EventLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<EventLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        EventLogCQ query = new EventLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt) {
-        setCreatedAt_NotEqual(createdAt, null, null);
-    }
-
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedAt_Equal(createdAt, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedAt_Equal(LocalDateTime createdAt) {
-        setCreatedAt_Term(createdAt, null);
-    }
-
-    public void setCreatedAt_Equal(LocalDateTime createdAt, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedAt_Term(createdAt, opLambda);
-    }
-
-    public void setCreatedAt_Term(LocalDateTime createdAt) {
-        setCreatedAt_Term(createdAt, null);
-    }
-
-    public void setCreatedAt_Term(LocalDateTime createdAt, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedAt_Terms(createdAtList, opLambda);
-    }
-
-    public void setCreatedAt_Exists() {
-        setCreatedAt_Exists(null);
-    }
-
-    public void setCreatedAt_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdAt");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_Missing() {
-        setCreatedAt_Missing(null);
-    }
-
-    public void setCreatedAt_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdAt");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedAt_GreaterThan(LocalDateTime createdAt) {
-        setCreatedAt_GreaterThan(createdAt, null);
-    }
-
-    public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy) {
-        setCreatedBy_NotEqual(createdBy, null, null);
-    }
-
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedBy_Equal(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Equal(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedBy_Term(createdBy, opLambda);
-    }
-
-    public void setCreatedBy_Term(String createdBy) {
-        setCreatedBy_Term(createdBy, null);
-    }
-
-    public void setCreatedBy_Term(String createdBy, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setCreatedBy_Terms(createdByList, opLambda);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy) {
-        setCreatedBy_Prefix(createdBy, null);
-    }
-
-    public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Exists() {
-        setCreatedBy_Exists(null);
-    }
-
-    public void setCreatedBy_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_Missing() {
-        setCreatedBy_Missing(null);
-    }
-
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdBy");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy) {
-        setCreatedBy_GreaterThan(createdBy, null);
-    }
-
-    public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_NotEqual(String eventType) {
-        setEventType_NotEqual(eventType, null, null);
-    }
-
-    public void setEventType_NotEqual(String eventType, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setEventType_Equal(eventType, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setEventType_Equal(String eventType) {
-        setEventType_Term(eventType, null);
-    }
-
-    public void setEventType_Equal(String eventType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setEventType_Term(eventType, opLambda);
-    }
-
-    public void setEventType_Term(String eventType) {
-        setEventType_Term(eventType, null);
-    }
-
-    public void setEventType_Term(String eventType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setEventType_Terms(eventTypeList, opLambda);
-    }
-
-    public void setEventType_Prefix(String eventType) {
-        setEventType_Prefix(eventType, null);
-    }
-
-    public void setEventType_Prefix(String eventType, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("eventType", eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_Exists() {
-        setEventType_Exists(null);
-    }
-
-    public void setEventType_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("eventType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_Missing() {
-        setEventType_Missing(null);
-    }
-
-    public void setEventType_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("eventType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setEventType_GreaterThan(String eventType) {
-        setEventType_GreaterThan(eventType, null);
-    }
-
-    public void setEventType_GreaterThan(String eventType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("eventType", ConditionKey.CK_LESS_EQUAL, eventType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_NotEqual(String message) {
-        setMessage_NotEqual(message, null, null);
-    }
-
-    public void setMessage_NotEqual(String message, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setMessage_Equal(message, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setMessage_Equal(String message) {
-        setMessage_Term(message, null);
-    }
-
-    public void setMessage_Equal(String message, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setMessage_Term(message, opLambda);
-    }
-
-    public void setMessage_Term(String message) {
-        setMessage_Term(message, null);
-    }
-
-    public void setMessage_Term(String message, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setMessage_Terms(messageList, opLambda);
-    }
-
-    public void setMessage_Prefix(String message) {
-        setMessage_Prefix(message, null);
-    }
-
-    public void setMessage_Prefix(String message, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("message", message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_Exists() {
-        setMessage_Exists(null);
-    }
-
-    public void setMessage_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("message");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_Missing() {
-        setMessage_Missing(null);
-    }
-
-    public void setMessage_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("message");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setMessage_GreaterThan(String message) {
-        setMessage_GreaterThan(message, null);
-    }
-
-    public void setMessage_GreaterThan(String message, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("message", ConditionKey.CK_LESS_EQUAL, message);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_NotEqual(String path) {
-        setPath_NotEqual(path, null, null);
-    }
-
-    public void setPath_NotEqual(String path, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPath_Equal(path, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPath_Equal(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Equal(String path, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPath_Term(path, opLambda);
-    }
-
-    public void setPath_Term(String path) {
-        setPath_Term(path, null);
-    }
-
-    public void setPath_Term(String path, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("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<TermsFilterBuilder> opLambda) {
-        setPath_Terms(pathList, opLambda);
-    }
-
-    public void setPath_Prefix(String path) {
-        setPath_Prefix(path, null);
-    }
-
-    public void setPath_Prefix(String path, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("path", path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Exists() {
-        setPath_Exists(null);
-    }
-
-    public void setPath_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("path");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_Missing() {
-        setPath_Missing(null);
-    }
-
-    public void setPath_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("path");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPath_GreaterThan(String path) {
-        setPath_GreaterThan(path, null);
-    }
-
-    public void setPath_GreaterThan(String path, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("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<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("path", ConditionKey.CK_LESS_EQUAL, path);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsFavoriteLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsFavoriteLogCF.java
deleted file mode 100644
index a1285543a19b8a0c8a310975bf6ebbe832b4a144..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsFavoriteLogCF.java
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.FavoriteLogCF;
-import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsFavoriteLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<FavoriteLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<FavoriteLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        FavoriteLogCF mustFilter = new FavoriteLogCF();
-        FavoriteLogCF shouldFilter = new FavoriteLogCF();
-        FavoriteLogCF mustNotFilter = new FavoriteLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<FavoriteLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<FavoriteLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        FavoriteLogCF andFilter = new FavoriteLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<FavoriteLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<FavoriteLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        FavoriteLogCF orFilter = new FavoriteLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<FavoriteLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<FavoriteLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        FavoriteLogCF notFilter = new FavoriteLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<FavoriteLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<FavoriteLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        FavoriteLogCQ query = new FavoriteLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_NotEqual(String url) {
-        setUrl_NotEqual(url, null, null);
-    }
-
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUrl_Equal(url, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUrl_Equal(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Equal(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUrl_Term(url, opLambda);
-    }
-
-    public void setUrl_Term(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Term(String url, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Terms(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_Terms(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("url", urlList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_InScope(Collection<String> urlList) {
-        setUrl_Terms(urlList, null);
-    }
-
-    public void setUrl_InScope(Collection<String> urlList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUrl_Terms(urlList, opLambda);
-    }
-
-    public void setUrl_Prefix(String url) {
-        setUrl_Prefix(url, null);
-    }
-
-    public void setUrl_Prefix(String url, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("url", url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Exists() {
-        setUrl_Exists(null);
-    }
-
-    public void setUrl_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_Missing() {
-        setUrl_Missing(null);
-    }
-
-    public void setUrl_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("url");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterThan(String url) {
-        setUrl_GreaterThan(url, null);
-    }
-
-    public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessThan(String url) {
-        setUrl_LessThan(url, null);
-    }
-
-    public void setUrl_LessThan(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_THAN, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_GreaterEqual(String url) {
-        setUrl_GreaterEqual(url, null);
-    }
-
-    public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_GREATER_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUrl_LessEqual(String url) {
-        setUrl_LessEqual(url, null);
-    }
-
-    public void setUrl_LessEqual(String url, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("url", ConditionKey.CK_LESS_EQUAL, url);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_NotEqual(String userInfoId) {
-        setUserInfoId_NotEqual(userInfoId, null, null);
-    }
-
-    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUserInfoId_Equal(userInfoId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUserInfoId_Equal(String userInfoId) {
-        setUserInfoId_Term(userInfoId, null);
-    }
-
-    public void setUserInfoId_Equal(String userInfoId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUserInfoId_Term(userInfoId, opLambda);
-    }
-
-    public void setUserInfoId_Term(String userInfoId) {
-        setUserInfoId_Term(userInfoId, null);
-    }
-
-    public void setUserInfoId_Term(String userInfoId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("userInfoId", userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Terms(Collection<String> userInfoIdList) {
-        setUserInfoId_Terms(userInfoIdList, null);
-    }
-
-    public void setUserInfoId_Terms(Collection<String> userInfoIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("userInfoId", userInfoIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_InScope(Collection<String> userInfoIdList) {
-        setUserInfoId_Terms(userInfoIdList, null);
-    }
-
-    public void setUserInfoId_InScope(Collection<String> userInfoIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUserInfoId_Terms(userInfoIdList, opLambda);
-    }
-
-    public void setUserInfoId_Prefix(String userInfoId) {
-        setUserInfoId_Prefix(userInfoId, null);
-    }
-
-    public void setUserInfoId_Prefix(String userInfoId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("userInfoId", userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Exists() {
-        setUserInfoId_Exists(null);
-    }
-
-    public void setUserInfoId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("userInfoId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Missing() {
-        setUserInfoId_Missing(null);
-    }
-
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("userInfoId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_GreaterThan(String userInfoId) {
-        setUserInfoId_GreaterThan(userInfoId, null);
-    }
-
-    public void setUserInfoId_GreaterThan(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_GREATER_THAN, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_LessThan(String userInfoId) {
-        setUserInfoId_LessThan(userInfoId, null);
-    }
-
-    public void setUserInfoId_LessThan(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_LESS_THAN, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_GreaterEqual(String userInfoId) {
-        setUserInfoId_GreaterEqual(userInfoId, null);
-    }
-
-    public void setUserInfoId_GreaterEqual(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_GREATER_EQUAL, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_LessEqual(String userInfoId) {
-        setUserInfoId_LessEqual(userInfoId, null);
-    }
-
-    public void setUserInfoId_LessEqual(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_LESS_EQUAL, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchFieldLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchFieldLogCF.java
deleted file mode 100644
index 199a884343e376ce8fb66cb7201b3f838cbedf6b..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchFieldLogCF.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.SearchFieldLogCF;
-import org.codelibs.fess.es.log.cbean.cq.SearchFieldLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsSearchFieldLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<SearchFieldLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<SearchFieldLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        SearchFieldLogCF mustFilter = new SearchFieldLogCF();
-        SearchFieldLogCF shouldFilter = new SearchFieldLogCF();
-        SearchFieldLogCF mustNotFilter = new SearchFieldLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<SearchFieldLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<SearchFieldLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        SearchFieldLogCF andFilter = new SearchFieldLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<SearchFieldLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<SearchFieldLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        SearchFieldLogCF orFilter = new SearchFieldLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<SearchFieldLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<SearchFieldLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        SearchFieldLogCF notFilter = new SearchFieldLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<SearchFieldLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<SearchFieldLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        SearchFieldLogCQ query = new SearchFieldLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_NotEqual(String searchLogId) {
-        setSearchLogId_NotEqual(searchLogId, null, null);
-    }
-
-    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSearchLogId_Equal(searchLogId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSearchLogId_Equal(String searchLogId) {
-        setSearchLogId_Term(searchLogId, null);
-    }
-
-    public void setSearchLogId_Equal(String searchLogId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSearchLogId_Term(searchLogId, opLambda);
-    }
-
-    public void setSearchLogId_Term(String searchLogId) {
-        setSearchLogId_Term(searchLogId, null);
-    }
-
-    public void setSearchLogId_Term(String searchLogId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("searchLogId", searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Terms(Collection<String> searchLogIdList) {
-        setSearchLogId_Terms(searchLogIdList, null);
-    }
-
-    public void setSearchLogId_Terms(Collection<String> searchLogIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("searchLogId", searchLogIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_InScope(Collection<String> searchLogIdList) {
-        setSearchLogId_Terms(searchLogIdList, null);
-    }
-
-    public void setSearchLogId_InScope(Collection<String> searchLogIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSearchLogId_Terms(searchLogIdList, opLambda);
-    }
-
-    public void setSearchLogId_Prefix(String searchLogId) {
-        setSearchLogId_Prefix(searchLogId, null);
-    }
-
-    public void setSearchLogId_Prefix(String searchLogId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("searchLogId", searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Exists() {
-        setSearchLogId_Exists(null);
-    }
-
-    public void setSearchLogId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("searchLogId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_Missing() {
-        setSearchLogId_Missing(null);
-    }
-
-    public void setSearchLogId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("searchLogId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_GreaterThan(String searchLogId) {
-        setSearchLogId_GreaterThan(searchLogId, null);
-    }
-
-    public void setSearchLogId_GreaterThan(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_GREATER_THAN, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_LessThan(String searchLogId) {
-        setSearchLogId_LessThan(searchLogId, null);
-    }
-
-    public void setSearchLogId_LessThan(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_LESS_THAN, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_GreaterEqual(String searchLogId) {
-        setSearchLogId_GreaterEqual(searchLogId, null);
-    }
-
-    public void setSearchLogId_GreaterEqual(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_GREATER_EQUAL, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchLogId_LessEqual(String searchLogId) {
-        setSearchLogId_LessEqual(searchLogId, null);
-    }
-
-    public void setSearchLogId_LessEqual(String searchLogId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchLogId", ConditionKey.CK_LESS_EQUAL, searchLogId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_NotEqual(String value) {
-        setValue_NotEqual(value, null, null);
-    }
-
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setValue_Equal(value, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setValue_Equal(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Equal(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setValue_Term(value, opLambda);
-    }
-
-    public void setValue_Term(String value) {
-        setValue_Term(value, null);
-    }
-
-    public void setValue_Term(String value, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Terms(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_Terms(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("value", valueList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_InScope(Collection<String> valueList) {
-        setValue_Terms(valueList, null);
-    }
-
-    public void setValue_InScope(Collection<String> valueList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setValue_Terms(valueList, opLambda);
-    }
-
-    public void setValue_Prefix(String value) {
-        setValue_Prefix(value, null);
-    }
-
-    public void setValue_Prefix(String value, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("value", value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Exists() {
-        setValue_Exists(null);
-    }
-
-    public void setValue_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_Missing() {
-        setValue_Missing(null);
-    }
-
-    public void setValue_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("value");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterThan(String value) {
-        setValue_GreaterThan(value, null);
-    }
-
-    public void setValue_GreaterThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessThan(String value) {
-        setValue_LessThan(value, null);
-    }
-
-    public void setValue_LessThan(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_THAN, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_GreaterEqual(String value) {
-        setValue_GreaterEqual(value, null);
-    }
-
-    public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_GREATER_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setValue_LessEqual(String value) {
-        setValue_LessEqual(value, null);
-    }
-
-    public void setValue_LessEqual(String value, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("value", ConditionKey.CK_LESS_EQUAL, value);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchLogCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchLogCF.java
deleted file mode 100644
index 20eb27efe4e7d17321837bb8cebcca5651f9b9ad..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsSearchLogCF.java
+++ /dev/null
@@ -1,1717 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.SearchLogCF;
-import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsSearchLogCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<SearchLogCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<SearchLogCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        SearchLogCF mustFilter = new SearchLogCF();
-        SearchLogCF shouldFilter = new SearchLogCF();
-        SearchLogCF mustNotFilter = new SearchLogCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<SearchLogCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<SearchLogCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        SearchLogCF andFilter = new SearchLogCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<SearchLogCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<SearchLogCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        SearchLogCF orFilter = new SearchLogCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<SearchLogCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<SearchLogCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        SearchLogCF notFilter = new SearchLogCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<SearchLogCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<SearchLogCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        SearchLogCQ query = new SearchLogCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setAccessType_NotEqual(String accessType) {
-        setAccessType_NotEqual(accessType, null, null);
-    }
-
-    public void setAccessType_NotEqual(String accessType, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setAccessType_Equal(accessType, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setAccessType_Equal(String accessType) {
-        setAccessType_Term(accessType, null);
-    }
-
-    public void setAccessType_Equal(String accessType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setAccessType_Term(accessType, opLambda);
-    }
-
-    public void setAccessType_Term(String accessType) {
-        setAccessType_Term(accessType, null);
-    }
-
-    public void setAccessType_Term(String accessType, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("accessType", accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_Terms(Collection<String> accessTypeList) {
-        setAccessType_Terms(accessTypeList, null);
-    }
-
-    public void setAccessType_Terms(Collection<String> accessTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("accessType", accessTypeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_InScope(Collection<String> accessTypeList) {
-        setAccessType_Terms(accessTypeList, null);
-    }
-
-    public void setAccessType_InScope(Collection<String> accessTypeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setAccessType_Terms(accessTypeList, opLambda);
-    }
-
-    public void setAccessType_Prefix(String accessType) {
-        setAccessType_Prefix(accessType, null);
-    }
-
-    public void setAccessType_Prefix(String accessType, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("accessType", accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_Exists() {
-        setAccessType_Exists(null);
-    }
-
-    public void setAccessType_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("accessType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_Missing() {
-        setAccessType_Missing(null);
-    }
-
-    public void setAccessType_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("accessType");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_GreaterThan(String accessType) {
-        setAccessType_GreaterThan(accessType, null);
-    }
-
-    public void setAccessType_GreaterThan(String accessType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("accessType", ConditionKey.CK_GREATER_THAN, accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_LessThan(String accessType) {
-        setAccessType_LessThan(accessType, null);
-    }
-
-    public void setAccessType_LessThan(String accessType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("accessType", ConditionKey.CK_LESS_THAN, accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_GreaterEqual(String accessType) {
-        setAccessType_GreaterEqual(accessType, null);
-    }
-
-    public void setAccessType_GreaterEqual(String accessType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("accessType", ConditionKey.CK_GREATER_EQUAL, accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setAccessType_LessEqual(String accessType) {
-        setAccessType_LessEqual(accessType, null);
-    }
-
-    public void setAccessType_LessEqual(String accessType, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("accessType", ConditionKey.CK_LESS_EQUAL, accessType);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_NotEqual(String clientIp) {
-        setClientIp_NotEqual(clientIp, null, null);
-    }
-
-    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setClientIp_Equal(clientIp, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setClientIp_Equal(String clientIp) {
-        setClientIp_Term(clientIp, null);
-    }
-
-    public void setClientIp_Equal(String clientIp, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setClientIp_Term(clientIp, opLambda);
-    }
-
-    public void setClientIp_Term(String clientIp) {
-        setClientIp_Term(clientIp, null);
-    }
-
-    public void setClientIp_Term(String clientIp, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Terms(Collection<String> clientIpList) {
-        setClientIp_Terms(clientIpList, null);
-    }
-
-    public void setClientIp_Terms(Collection<String> clientIpList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("clientIp", clientIpList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_InScope(Collection<String> clientIpList) {
-        setClientIp_Terms(clientIpList, null);
-    }
-
-    public void setClientIp_InScope(Collection<String> clientIpList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setClientIp_Terms(clientIpList, opLambda);
-    }
-
-    public void setClientIp_Prefix(String clientIp) {
-        setClientIp_Prefix(clientIp, null);
-    }
-
-    public void setClientIp_Prefix(String clientIp, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("clientIp", clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Exists() {
-        setClientIp_Exists(null);
-    }
-
-    public void setClientIp_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("clientIp");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_Missing() {
-        setClientIp_Missing(null);
-    }
-
-    public void setClientIp_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("clientIp");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_GreaterThan(String clientIp) {
-        setClientIp_GreaterThan(clientIp, null);
-    }
-
-    public void setClientIp_GreaterThan(String clientIp, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("clientIp", ConditionKey.CK_GREATER_THAN, clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_LessThan(String clientIp) {
-        setClientIp_LessThan(clientIp, null);
-    }
-
-    public void setClientIp_LessThan(String clientIp, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("clientIp", ConditionKey.CK_LESS_THAN, clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_GreaterEqual(String clientIp) {
-        setClientIp_GreaterEqual(clientIp, null);
-    }
-
-    public void setClientIp_GreaterEqual(String clientIp, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("clientIp", ConditionKey.CK_GREATER_EQUAL, clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setClientIp_LessEqual(String clientIp) {
-        setClientIp_LessEqual(clientIp, null);
-    }
-
-    public void setClientIp_LessEqual(String clientIp, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("clientIp", ConditionKey.CK_LESS_EQUAL, clientIp);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_NotEqual(Long hitCount) {
-        setHitCount_NotEqual(hitCount, null, null);
-    }
-
-    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setHitCount_Equal(hitCount, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setHitCount_Equal(Long hitCount) {
-        setHitCount_Term(hitCount, null);
-    }
-
-    public void setHitCount_Equal(Long hitCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setHitCount_Term(hitCount, opLambda);
-    }
-
-    public void setHitCount_Term(Long hitCount) {
-        setHitCount_Term(hitCount, null);
-    }
-
-    public void setHitCount_Term(Long hitCount, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("hitCount", hitCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Terms(Collection<Long> hitCountList) {
-        setHitCount_Terms(hitCountList, null);
-    }
-
-    public void setHitCount_Terms(Collection<Long> hitCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("hitCount", hitCountList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_InScope(Collection<Long> hitCountList) {
-        setHitCount_Terms(hitCountList, null);
-    }
-
-    public void setHitCount_InScope(Collection<Long> hitCountList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setHitCount_Terms(hitCountList, opLambda);
-    }
-
-    public void setHitCount_Exists() {
-        setHitCount_Exists(null);
-    }
-
-    public void setHitCount_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_Missing() {
-        setHitCount_Missing(null);
-    }
-
-    public void setHitCount_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("hitCount");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_GreaterThan(Long hitCount) {
-        setHitCount_GreaterThan(hitCount, null);
-    }
-
-    public void setHitCount_GreaterThan(Long hitCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hitCount", ConditionKey.CK_GREATER_THAN, hitCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_LessThan(Long hitCount) {
-        setHitCount_LessThan(hitCount, null);
-    }
-
-    public void setHitCount_LessThan(Long hitCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hitCount", ConditionKey.CK_LESS_THAN, hitCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_GreaterEqual(Long hitCount) {
-        setHitCount_GreaterEqual(hitCount, null);
-    }
-
-    public void setHitCount_GreaterEqual(Long hitCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hitCount", ConditionKey.CK_GREATER_EQUAL, hitCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setHitCount_LessEqual(Long hitCount) {
-        setHitCount_LessEqual(hitCount, null);
-    }
-
-    public void setHitCount_LessEqual(Long hitCount, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("hitCount", ConditionKey.CK_LESS_EQUAL, hitCount);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_NotEqual(Integer queryOffset) {
-        setQueryOffset_NotEqual(queryOffset, null, null);
-    }
-
-    public void setQueryOffset_NotEqual(Integer queryOffset, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setQueryOffset_Equal(queryOffset, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setQueryOffset_Equal(Integer queryOffset) {
-        setQueryOffset_Term(queryOffset, null);
-    }
-
-    public void setQueryOffset_Equal(Integer queryOffset, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setQueryOffset_Term(queryOffset, opLambda);
-    }
-
-    public void setQueryOffset_Term(Integer queryOffset) {
-        setQueryOffset_Term(queryOffset, null);
-    }
-
-    public void setQueryOffset_Term(Integer queryOffset, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("queryOffset", queryOffset);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_Terms(Collection<Integer> queryOffsetList) {
-        setQueryOffset_Terms(queryOffsetList, null);
-    }
-
-    public void setQueryOffset_Terms(Collection<Integer> queryOffsetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("queryOffset", queryOffsetList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_InScope(Collection<Integer> queryOffsetList) {
-        setQueryOffset_Terms(queryOffsetList, null);
-    }
-
-    public void setQueryOffset_InScope(Collection<Integer> queryOffsetList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setQueryOffset_Terms(queryOffsetList, opLambda);
-    }
-
-    public void setQueryOffset_Exists() {
-        setQueryOffset_Exists(null);
-    }
-
-    public void setQueryOffset_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("queryOffset");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_Missing() {
-        setQueryOffset_Missing(null);
-    }
-
-    public void setQueryOffset_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("queryOffset");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_GreaterThan(Integer queryOffset) {
-        setQueryOffset_GreaterThan(queryOffset, null);
-    }
-
-    public void setQueryOffset_GreaterThan(Integer queryOffset, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryOffset", ConditionKey.CK_GREATER_THAN, queryOffset);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_LessThan(Integer queryOffset) {
-        setQueryOffset_LessThan(queryOffset, null);
-    }
-
-    public void setQueryOffset_LessThan(Integer queryOffset, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryOffset", ConditionKey.CK_LESS_THAN, queryOffset);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_GreaterEqual(Integer queryOffset) {
-        setQueryOffset_GreaterEqual(queryOffset, null);
-    }
-
-    public void setQueryOffset_GreaterEqual(Integer queryOffset, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryOffset", ConditionKey.CK_GREATER_EQUAL, queryOffset);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryOffset_LessEqual(Integer queryOffset) {
-        setQueryOffset_LessEqual(queryOffset, null);
-    }
-
-    public void setQueryOffset_LessEqual(Integer queryOffset, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryOffset", ConditionKey.CK_LESS_EQUAL, queryOffset);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_NotEqual(Integer queryPageSize) {
-        setQueryPageSize_NotEqual(queryPageSize, null, null);
-    }
-
-    public void setQueryPageSize_NotEqual(Integer queryPageSize, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setQueryPageSize_Equal(queryPageSize, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setQueryPageSize_Equal(Integer queryPageSize) {
-        setQueryPageSize_Term(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_Equal(Integer queryPageSize, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setQueryPageSize_Term(queryPageSize, opLambda);
-    }
-
-    public void setQueryPageSize_Term(Integer queryPageSize) {
-        setQueryPageSize_Term(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_Term(Integer queryPageSize, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("queryPageSize", queryPageSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_Terms(Collection<Integer> queryPageSizeList) {
-        setQueryPageSize_Terms(queryPageSizeList, null);
-    }
-
-    public void setQueryPageSize_Terms(Collection<Integer> queryPageSizeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("queryPageSize", queryPageSizeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_InScope(Collection<Integer> queryPageSizeList) {
-        setQueryPageSize_Terms(queryPageSizeList, null);
-    }
-
-    public void setQueryPageSize_InScope(Collection<Integer> queryPageSizeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setQueryPageSize_Terms(queryPageSizeList, opLambda);
-    }
-
-    public void setQueryPageSize_Exists() {
-        setQueryPageSize_Exists(null);
-    }
-
-    public void setQueryPageSize_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("queryPageSize");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_Missing() {
-        setQueryPageSize_Missing(null);
-    }
-
-    public void setQueryPageSize_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("queryPageSize");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_GreaterThan(Integer queryPageSize) {
-        setQueryPageSize_GreaterThan(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_GreaterThan(Integer queryPageSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryPageSize", ConditionKey.CK_GREATER_THAN, queryPageSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_LessThan(Integer queryPageSize) {
-        setQueryPageSize_LessThan(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_LessThan(Integer queryPageSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryPageSize", ConditionKey.CK_LESS_THAN, queryPageSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_GreaterEqual(Integer queryPageSize) {
-        setQueryPageSize_GreaterEqual(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_GreaterEqual(Integer queryPageSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryPageSize", ConditionKey.CK_GREATER_EQUAL, queryPageSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setQueryPageSize_LessEqual(Integer queryPageSize) {
-        setQueryPageSize_LessEqual(queryPageSize, null);
-    }
-
-    public void setQueryPageSize_LessEqual(Integer queryPageSize, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("queryPageSize", ConditionKey.CK_LESS_EQUAL, queryPageSize);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_NotEqual(String referer) {
-        setReferer_NotEqual(referer, null, null);
-    }
-
-    public void setReferer_NotEqual(String referer, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setReferer_Equal(referer, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setReferer_Equal(String referer) {
-        setReferer_Term(referer, null);
-    }
-
-    public void setReferer_Equal(String referer, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setReferer_Term(referer, opLambda);
-    }
-
-    public void setReferer_Term(String referer) {
-        setReferer_Term(referer, null);
-    }
-
-    public void setReferer_Term(String referer, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("referer", referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_Terms(Collection<String> refererList) {
-        setReferer_Terms(refererList, null);
-    }
-
-    public void setReferer_Terms(Collection<String> refererList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("referer", refererList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_InScope(Collection<String> refererList) {
-        setReferer_Terms(refererList, null);
-    }
-
-    public void setReferer_InScope(Collection<String> refererList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setReferer_Terms(refererList, opLambda);
-    }
-
-    public void setReferer_Prefix(String referer) {
-        setReferer_Prefix(referer, null);
-    }
-
-    public void setReferer_Prefix(String referer, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("referer", referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_Exists() {
-        setReferer_Exists(null);
-    }
-
-    public void setReferer_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("referer");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_Missing() {
-        setReferer_Missing(null);
-    }
-
-    public void setReferer_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("referer");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_GreaterThan(String referer) {
-        setReferer_GreaterThan(referer, null);
-    }
-
-    public void setReferer_GreaterThan(String referer, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("referer", ConditionKey.CK_GREATER_THAN, referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_LessThan(String referer) {
-        setReferer_LessThan(referer, null);
-    }
-
-    public void setReferer_LessThan(String referer, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("referer", ConditionKey.CK_LESS_THAN, referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_GreaterEqual(String referer) {
-        setReferer_GreaterEqual(referer, null);
-    }
-
-    public void setReferer_GreaterEqual(String referer, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("referer", ConditionKey.CK_GREATER_EQUAL, referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setReferer_LessEqual(String referer) {
-        setReferer_LessEqual(referer, null);
-    }
-
-    public void setReferer_LessEqual(String referer, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("referer", ConditionKey.CK_LESS_EQUAL, referer);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_NotEqual(Long requestedTime) {
-        setRequestedTime_NotEqual(requestedTime, null, null);
-    }
-
-    public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRequestedTime_Equal(requestedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRequestedTime_Equal(Long requestedTime) {
-        setRequestedTime_Term(requestedTime, null);
-    }
-
-    public void setRequestedTime_Equal(Long requestedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRequestedTime_Term(requestedTime, opLambda);
-    }
-
-    public void setRequestedTime_Term(Long requestedTime) {
-        setRequestedTime_Term(requestedTime, null);
-    }
-
-    public void setRequestedTime_Term(Long requestedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("requestedTime", requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_Terms(Collection<Long> requestedTimeList) {
-        setRequestedTime_Terms(requestedTimeList, null);
-    }
-
-    public void setRequestedTime_Terms(Collection<Long> requestedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("requestedTime", requestedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_InScope(Collection<Long> requestedTimeList) {
-        setRequestedTime_Terms(requestedTimeList, null);
-    }
-
-    public void setRequestedTime_InScope(Collection<Long> requestedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRequestedTime_Terms(requestedTimeList, opLambda);
-    }
-
-    public void setRequestedTime_Exists() {
-        setRequestedTime_Exists(null);
-    }
-
-    public void setRequestedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("requestedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_Missing() {
-        setRequestedTime_Missing(null);
-    }
-
-    public void setRequestedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("requestedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_GreaterThan(Long requestedTime) {
-        setRequestedTime_GreaterThan(requestedTime, null);
-    }
-
-    public void setRequestedTime_GreaterThan(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_GREATER_THAN, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_LessThan(Long requestedTime) {
-        setRequestedTime_LessThan(requestedTime, null);
-    }
-
-    public void setRequestedTime_LessThan(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_LESS_THAN, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_GreaterEqual(Long requestedTime) {
-        setRequestedTime_GreaterEqual(requestedTime, null);
-    }
-
-    public void setRequestedTime_GreaterEqual(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_GREATER_EQUAL, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRequestedTime_LessEqual(Long requestedTime) {
-        setRequestedTime_LessEqual(requestedTime, null);
-    }
-
-    public void setRequestedTime_LessEqual(Long requestedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("requestedTime", ConditionKey.CK_LESS_EQUAL, requestedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_NotEqual(Integer responseTime) {
-        setResponseTime_NotEqual(responseTime, null, null);
-    }
-
-    public void setResponseTime_NotEqual(Integer responseTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setResponseTime_Equal(responseTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setResponseTime_Equal(Integer responseTime) {
-        setResponseTime_Term(responseTime, null);
-    }
-
-    public void setResponseTime_Equal(Integer responseTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setResponseTime_Term(responseTime, opLambda);
-    }
-
-    public void setResponseTime_Term(Integer responseTime) {
-        setResponseTime_Term(responseTime, null);
-    }
-
-    public void setResponseTime_Term(Integer responseTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("responseTime", responseTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_Terms(Collection<Integer> responseTimeList) {
-        setResponseTime_Terms(responseTimeList, null);
-    }
-
-    public void setResponseTime_Terms(Collection<Integer> responseTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("responseTime", responseTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_InScope(Collection<Integer> responseTimeList) {
-        setResponseTime_Terms(responseTimeList, null);
-    }
-
-    public void setResponseTime_InScope(Collection<Integer> responseTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setResponseTime_Terms(responseTimeList, opLambda);
-    }
-
-    public void setResponseTime_Exists() {
-        setResponseTime_Exists(null);
-    }
-
-    public void setResponseTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("responseTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_Missing() {
-        setResponseTime_Missing(null);
-    }
-
-    public void setResponseTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("responseTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_GreaterThan(Integer responseTime) {
-        setResponseTime_GreaterThan(responseTime, null);
-    }
-
-    public void setResponseTime_GreaterThan(Integer responseTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("responseTime", ConditionKey.CK_GREATER_THAN, responseTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_LessThan(Integer responseTime) {
-        setResponseTime_LessThan(responseTime, null);
-    }
-
-    public void setResponseTime_LessThan(Integer responseTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("responseTime", ConditionKey.CK_LESS_THAN, responseTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_GreaterEqual(Integer responseTime) {
-        setResponseTime_GreaterEqual(responseTime, null);
-    }
-
-    public void setResponseTime_GreaterEqual(Integer responseTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("responseTime", ConditionKey.CK_GREATER_EQUAL, responseTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setResponseTime_LessEqual(Integer responseTime) {
-        setResponseTime_LessEqual(responseTime, null);
-    }
-
-    public void setResponseTime_LessEqual(Integer responseTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("responseTime", ConditionKey.CK_LESS_EQUAL, responseTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_NotEqual(String searchWord) {
-        setSearchWord_NotEqual(searchWord, null, null);
-    }
-
-    public void setSearchWord_NotEqual(String searchWord, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setSearchWord_Equal(searchWord, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setSearchWord_Equal(String searchWord) {
-        setSearchWord_Term(searchWord, null);
-    }
-
-    public void setSearchWord_Equal(String searchWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setSearchWord_Term(searchWord, opLambda);
-    }
-
-    public void setSearchWord_Term(String searchWord) {
-        setSearchWord_Term(searchWord, null);
-    }
-
-    public void setSearchWord_Term(String searchWord, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("searchWord", searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_Terms(Collection<String> searchWordList) {
-        setSearchWord_Terms(searchWordList, null);
-    }
-
-    public void setSearchWord_Terms(Collection<String> searchWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("searchWord", searchWordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_InScope(Collection<String> searchWordList) {
-        setSearchWord_Terms(searchWordList, null);
-    }
-
-    public void setSearchWord_InScope(Collection<String> searchWordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setSearchWord_Terms(searchWordList, opLambda);
-    }
-
-    public void setSearchWord_Prefix(String searchWord) {
-        setSearchWord_Prefix(searchWord, null);
-    }
-
-    public void setSearchWord_Prefix(String searchWord, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("searchWord", searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_Exists() {
-        setSearchWord_Exists(null);
-    }
-
-    public void setSearchWord_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("searchWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_Missing() {
-        setSearchWord_Missing(null);
-    }
-
-    public void setSearchWord_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("searchWord");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_GreaterThan(String searchWord) {
-        setSearchWord_GreaterThan(searchWord, null);
-    }
-
-    public void setSearchWord_GreaterThan(String searchWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchWord", ConditionKey.CK_GREATER_THAN, searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_LessThan(String searchWord) {
-        setSearchWord_LessThan(searchWord, null);
-    }
-
-    public void setSearchWord_LessThan(String searchWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchWord", ConditionKey.CK_LESS_THAN, searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_GreaterEqual(String searchWord) {
-        setSearchWord_GreaterEqual(searchWord, null);
-    }
-
-    public void setSearchWord_GreaterEqual(String searchWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchWord", ConditionKey.CK_GREATER_EQUAL, searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setSearchWord_LessEqual(String searchWord) {
-        setSearchWord_LessEqual(searchWord, null);
-    }
-
-    public void setSearchWord_LessEqual(String searchWord, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("searchWord", ConditionKey.CK_LESS_EQUAL, searchWord);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_NotEqual(String userAgent) {
-        setUserAgent_NotEqual(userAgent, null, null);
-    }
-
-    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUserAgent_Equal(userAgent, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUserAgent_Equal(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Equal(String userAgent, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUserAgent_Term(userAgent, opLambda);
-    }
-
-    public void setUserAgent_Term(String userAgent) {
-        setUserAgent_Term(userAgent, null);
-    }
-
-    public void setUserAgent_Term(String userAgent, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_Terms(Collection<String> userAgentList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("userAgent", userAgentList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList) {
-        setUserAgent_Terms(userAgentList, null);
-    }
-
-    public void setUserAgent_InScope(Collection<String> userAgentList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUserAgent_Terms(userAgentList, opLambda);
-    }
-
-    public void setUserAgent_Prefix(String userAgent) {
-        setUserAgent_Prefix(userAgent, null);
-    }
-
-    public void setUserAgent_Prefix(String userAgent, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("userAgent", userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Exists() {
-        setUserAgent_Exists(null);
-    }
-
-    public void setUserAgent_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_Missing() {
-        setUserAgent_Missing(null);
-    }
-
-    public void setUserAgent_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("userAgent");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_GreaterThan(String userAgent) {
-        setUserAgent_GreaterThan(userAgent, null);
-    }
-
-    public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessThan(String userAgent) {
-        setUserAgent_LessThan(userAgent, null);
-    }
-
-    public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent) {
-        setUserAgent_GreaterEqual(userAgent, null);
-    }
-
-    public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserAgent_LessEqual(String userAgent) {
-        setUserAgent_LessEqual(userAgent, null);
-    }
-
-    public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_NotEqual(String userInfoId) {
-        setUserInfoId_NotEqual(userInfoId, null, null);
-    }
-
-    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUserInfoId_Equal(userInfoId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUserInfoId_Equal(String userInfoId) {
-        setUserInfoId_Term(userInfoId, null);
-    }
-
-    public void setUserInfoId_Equal(String userInfoId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUserInfoId_Term(userInfoId, opLambda);
-    }
-
-    public void setUserInfoId_Term(String userInfoId) {
-        setUserInfoId_Term(userInfoId, null);
-    }
-
-    public void setUserInfoId_Term(String userInfoId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("userInfoId", userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Terms(Collection<String> userInfoIdList) {
-        setUserInfoId_Terms(userInfoIdList, null);
-    }
-
-    public void setUserInfoId_Terms(Collection<String> userInfoIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("userInfoId", userInfoIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_InScope(Collection<String> userInfoIdList) {
-        setUserInfoId_Terms(userInfoIdList, null);
-    }
-
-    public void setUserInfoId_InScope(Collection<String> userInfoIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUserInfoId_Terms(userInfoIdList, opLambda);
-    }
-
-    public void setUserInfoId_Prefix(String userInfoId) {
-        setUserInfoId_Prefix(userInfoId, null);
-    }
-
-    public void setUserInfoId_Prefix(String userInfoId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("userInfoId", userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Exists() {
-        setUserInfoId_Exists(null);
-    }
-
-    public void setUserInfoId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("userInfoId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_Missing() {
-        setUserInfoId_Missing(null);
-    }
-
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("userInfoId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_GreaterThan(String userInfoId) {
-        setUserInfoId_GreaterThan(userInfoId, null);
-    }
-
-    public void setUserInfoId_GreaterThan(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_GREATER_THAN, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_LessThan(String userInfoId) {
-        setUserInfoId_LessThan(userInfoId, null);
-    }
-
-    public void setUserInfoId_LessThan(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_LESS_THAN, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_GreaterEqual(String userInfoId) {
-        setUserInfoId_GreaterEqual(userInfoId, null);
-    }
-
-    public void setUserInfoId_GreaterEqual(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_GREATER_EQUAL, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserInfoId_LessEqual(String userInfoId) {
-        setUserInfoId_LessEqual(userInfoId, null);
-    }
-
-    public void setUserInfoId_LessEqual(String userInfoId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userInfoId", ConditionKey.CK_LESS_EQUAL, userInfoId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_NotEqual(String userSessionId) {
-        setUserSessionId_NotEqual(userSessionId, null, null);
-    }
-
-    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUserSessionId_Equal(userSessionId, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUserSessionId_Equal(String userSessionId) {
-        setUserSessionId_Term(userSessionId, null);
-    }
-
-    public void setUserSessionId_Equal(String userSessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUserSessionId_Term(userSessionId, opLambda);
-    }
-
-    public void setUserSessionId_Term(String userSessionId) {
-        setUserSessionId_Term(userSessionId, null);
-    }
-
-    public void setUserSessionId_Term(String userSessionId, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_Terms(Collection<String> userSessionIdList) {
-        setUserSessionId_Terms(userSessionIdList, null);
-    }
-
-    public void setUserSessionId_Terms(Collection<String> userSessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("userSessionId", userSessionIdList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_InScope(Collection<String> userSessionIdList) {
-        setUserSessionId_Terms(userSessionIdList, null);
-    }
-
-    public void setUserSessionId_InScope(Collection<String> userSessionIdList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUserSessionId_Terms(userSessionIdList, opLambda);
-    }
-
-    public void setUserSessionId_Prefix(String userSessionId) {
-        setUserSessionId_Prefix(userSessionId, null);
-    }
-
-    public void setUserSessionId_Prefix(String userSessionId, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("userSessionId", userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_Exists() {
-        setUserSessionId_Exists(null);
-    }
-
-    public void setUserSessionId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("userSessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_Missing() {
-        setUserSessionId_Missing(null);
-    }
-
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("userSessionId");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_GreaterThan(String userSessionId) {
-        setUserSessionId_GreaterThan(userSessionId, null);
-    }
-
-    public void setUserSessionId_GreaterThan(String userSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userSessionId", ConditionKey.CK_GREATER_THAN, userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_LessThan(String userSessionId) {
-        setUserSessionId_LessThan(userSessionId, null);
-    }
-
-    public void setUserSessionId_LessThan(String userSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userSessionId", ConditionKey.CK_LESS_THAN, userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_GreaterEqual(String userSessionId) {
-        setUserSessionId_GreaterEqual(userSessionId, null);
-    }
-
-    public void setUserSessionId_GreaterEqual(String userSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userSessionId", ConditionKey.CK_GREATER_EQUAL, userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUserSessionId_LessEqual(String userSessionId) {
-        setUserSessionId_LessEqual(userSessionId, null);
-    }
-
-    public void setUserSessionId_LessEqual(String userSessionId, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("userSessionId", ConditionKey.CK_LESS_EQUAL, userSessionId);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsUserInfoCF.java b/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsUserInfoCF.java
deleted file mode 100644
index d1e6323cb0a45989cc421ba71d7750692b27d820..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cf/bs/BsUserInfoCF.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * Copyright 2012-2015 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.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.log.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.log.cbean.cf.UserInfoCF;
-import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsUserInfoCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<UserInfoCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<UserInfoCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        UserInfoCF mustFilter = new UserInfoCF();
-        UserInfoCF shouldFilter = new UserInfoCF();
-        UserInfoCF mustNotFilter = new UserInfoCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<UserInfoCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<UserInfoCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        UserInfoCF andFilter = new UserInfoCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<UserInfoCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<UserInfoCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        UserInfoCF orFilter = new UserInfoCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<UserInfoCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<UserInfoCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        UserInfoCF notFilter = new UserInfoCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<UserInfoCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery.OperatorCall<UserInfoCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        UserInfoCQ query = new UserInfoCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setCode_NotEqual(String code) {
-        setCode_NotEqual(code, null, null);
-    }
-
-    public void setCode_NotEqual(String code, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCode_Equal(code, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCode_Equal(String code) {
-        setCode_Term(code, null);
-    }
-
-    public void setCode_Equal(String code, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCode_Term(code, opLambda);
-    }
-
-    public void setCode_Term(String code) {
-        setCode_Term(code, null);
-    }
-
-    public void setCode_Term(String code, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("code", code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_Terms(Collection<String> codeList) {
-        setCode_Terms(codeList, null);
-    }
-
-    public void setCode_Terms(Collection<String> codeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("code", codeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_InScope(Collection<String> codeList) {
-        setCode_Terms(codeList, null);
-    }
-
-    public void setCode_InScope(Collection<String> codeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCode_Terms(codeList, opLambda);
-    }
-
-    public void setCode_Prefix(String code) {
-        setCode_Prefix(code, null);
-    }
-
-    public void setCode_Prefix(String code, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("code", code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_Exists() {
-        setCode_Exists(null);
-    }
-
-    public void setCode_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("code");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_Missing() {
-        setCode_Missing(null);
-    }
-
-    public void setCode_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("code");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_GreaterThan(String code) {
-        setCode_GreaterThan(code, null);
-    }
-
-    public void setCode_GreaterThan(String code, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("code", ConditionKey.CK_GREATER_THAN, code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_LessThan(String code) {
-        setCode_LessThan(code, null);
-    }
-
-    public void setCode_LessThan(String code, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("code", ConditionKey.CK_LESS_THAN, code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_GreaterEqual(String code) {
-        setCode_GreaterEqual(code, null);
-    }
-
-    public void setCode_GreaterEqual(String code, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("code", ConditionKey.CK_GREATER_EQUAL, code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCode_LessEqual(String code) {
-        setCode_LessEqual(code, null);
-    }
-
-    public void setCode_LessEqual(String code, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("code", ConditionKey.CK_LESS_EQUAL, code);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime) {
-        setCreatedTime_NotEqual(createdTime, null, null);
-    }
-
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setCreatedTime_Term(createdTime, opLambda);
-    }
-
-    public void setCreatedTime_Term(Long createdTime) {
-        setCreatedTime_Term(createdTime, null);
-    }
-
-    public void setCreatedTime_Term(Long createdTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("createdTime", createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_Terms(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList) {
-        setCreatedTime_Terms(createdTimeList, null);
-    }
-
-    public void setCreatedTime_InScope(Collection<Long> createdTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setCreatedTime_Terms(createdTimeList, opLambda);
-    }
-
-    public void setCreatedTime_Exists() {
-        setCreatedTime_Exists(null);
-    }
-
-    public void setCreatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_Missing() {
-        setCreatedTime_Missing(null);
-    }
-
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("createdTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime) {
-        setCreatedTime_GreaterThan(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime) {
-        setCreatedTime_LessThan(createdTime, null);
-    }
-
-    public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime) {
-        setCreatedTime_GreaterEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime) {
-        setCreatedTime_LessEqual(createdTime, null);
-    }
-
-    public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime) {
-        setUpdatedTime_NotEqual(updatedTime, null, null);
-    }
-
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setUpdatedTime_Equal(updatedTime, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("updatedTime", updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_Terms(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("updatedTime", updatedTimeList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList) {
-        setUpdatedTime_Terms(updatedTimeList, null);
-    }
-
-    public void setUpdatedTime_InScope(Collection<Long> updatedTimeList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setUpdatedTime_Terms(updatedTimeList, opLambda);
-    }
-
-    public void setUpdatedTime_Exists() {
-        setUpdatedTime_Exists(null);
-    }
-
-    public void setUpdatedTime_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_Missing() {
-        setUpdatedTime_Missing(null);
-    }
-
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("updatedTime");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime) {
-        setUpdatedTime_GreaterThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime) {
-        setUpdatedTime_LessThan(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime) {
-        setUpdatedTime_GreaterEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime) {
-        setUpdatedTime_LessEqual(updatedTime, null);
-    }
-
-    public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index 28ff392405526edf7c4ec9d59bac9eb464f134d3..24dccff80abbadb7fc41fe1294c3e5ad398af7da 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.ClickLogCF;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<ClickLogCQ, ClickLogCF> filteredLambda) {
+    public void filtered(FilteredCall<ClickLogCQ, ClickLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<ClickLogCQ, ClickLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        ClickLogCQ query = new ClickLogCQ();
-        ClickLogCF filter = new ClickLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<ClickLogCQ, ClickLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<ClickLogCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<ClickLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        ClickLogCQ notQuery = new ClickLogCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         ClickLogCQ mustQuery = new ClickLogCQ();
         ClickLogCQ shouldQuery = new ClickLogCQ();
         ClickLogCQ mustNotQuery = new ClickLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        ClickLogCQ filterQuery = new ClickLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -103,137 +121,57 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
+        TermQueryBuilder builder = regTermQ("_id", id);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    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_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsClickLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsClickLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -256,6 +194,25 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRequestedTime_NotEqual(Long requestedTime) {
+        setRequestedTime_NotTerm(requestedTime, null);
+    }
+
+    public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRequestedTime_NotTerm(requestedTime, opLambda);
+    }
+
+    public void setRequestedTime_NotTerm(Long requestedTime) {
+        setRequestedTime_NotTerm(requestedTime, null);
+    }
+
+    public void setRequestedTime_NotTerm(Long requestedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedTime", requestedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRequestedTime_Terms(Collection<Long> requestedTimeList) {
         setRequestedTime_Terms(requestedTimeList, null);
     }
@@ -392,6 +349,25 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSearchLogId_NotEqual(String searchLogId) {
+        setSearchLogId_NotTerm(searchLogId, null);
+    }
+
+    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSearchLogId_NotTerm(searchLogId, opLambda);
+    }
+
+    public void setSearchLogId_NotTerm(String searchLogId) {
+        setSearchLogId_NotTerm(searchLogId, null);
+    }
+
+    public void setSearchLogId_NotTerm(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("searchLogId", searchLogId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSearchLogId_Terms(Collection<String> searchLogIdList) {
         setSearchLogId_Terms(searchLogIdList, null);
     }
@@ -539,6 +515,25 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_NotEqual(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url) {
+        setUrl_NotTerm(url, null);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_Terms(Collection<String> urlList) {
         setUrl_Terms(urlList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java
index fb8d4676b5cc6ef6e82f699d257339eecec5543c..7b8ad225d65cb1dff25a941b9879d586b3801d32 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.EventLogCF;
 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.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<EventLogCQ, EventLogCF> filteredLambda) {
+    public void filtered(FilteredCall<EventLogCQ, EventLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<EventLogCQ, EventLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        EventLogCQ query = new EventLogCQ();
-        EventLogCF filter = new EventLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    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.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         EventLogCQ mustQuery = new EventLogCQ();
         EventLogCQ shouldQuery = new EventLogCQ();
         EventLogCQ mustNotQuery = new EventLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        EventLogCQ filterQuery = new EventLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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);
     }
@@ -109,6 +194,25 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -245,6 +349,25 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -392,6 +515,25 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
@@ -520,167 +662,39 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setMessage_Equal(String message) {
+        setMessage_Term(message, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMessage_Equal(String message, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setMessage_Term(message, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setMessage_Term(String message) {
+        setMessage_Term(message, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    public void setMessage_Term(String message, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("message", message);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setMessage_NotEqual(String message) {
+        setMessage_NotTerm(message, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMessage_NotEqual(String message, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setMessage_NotTerm(message, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setMessage_NotTerm(String message) {
+        setMessage_NotTerm(message, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public BsEventLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsEventLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        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);
+    public void setMessage_NotTerm(String message, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("message", message));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -833,6 +847,25 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    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);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index e93c92f46d83b6557da1674cecf618e1ea4fe7bf..da01df86b957584e1c08528a71ae44b34b04f338 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.FavoriteLogCF;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<FavoriteLogCQ, FavoriteLogCF> filteredLambda) {
+    public void filtered(FilteredCall<FavoriteLogCQ, FavoriteLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<FavoriteLogCQ, FavoriteLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        FavoriteLogCQ query = new FavoriteLogCQ();
-        FavoriteLogCF filter = new FavoriteLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<FavoriteLogCQ, FavoriteLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<FavoriteLogCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<FavoriteLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        FavoriteLogCQ notQuery = new FavoriteLogCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         FavoriteLogCQ mustQuery = new FavoriteLogCQ();
         FavoriteLogCQ shouldQuery = new FavoriteLogCQ();
         FavoriteLogCQ mustNotQuery = new FavoriteLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        FavoriteLogCQ filterQuery = new FavoriteLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsFavoriteLogCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsFavoriteLogCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCreatedTime_Equal(Long createdTime) {
         setCreatedTime_Term(createdTime, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -226,167 +330,39 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setUrl_Equal(String url) {
+        setUrl_Term(url, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrl_Equal(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUrl_Term(url, opLambda);
     }
 
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setUrl_Term(String url) {
+        setUrl_Term(url, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setUrl_Term(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrl_NotEqual(String url) {
+        setUrl_NotTerm(url, null);
     }
 
-    public BsFavoriteLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
+    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
     }
 
-    public BsFavoriteLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setUrl_NotTerm(String url) {
+        setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_Equal(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Equal(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUrl_Term(url, opLambda);
-    }
-
-    public void setUrl_Term(String url) {
-        setUrl_Term(url, null);
-    }
-
-    public void setUrl_Term(String url, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("url", url);
+    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,6 +515,25 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserInfoId_NotEqual(String userInfoId) {
+        setUserInfoId_NotTerm(userInfoId, null);
+    }
+
+    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUserInfoId_NotTerm(userInfoId, opLambda);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId) {
+        setUserInfoId_NotTerm(userInfoId, null);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userInfoId", userInfoId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserInfoId_Terms(Collection<String> userInfoIdList) {
         setUserInfoId_Terms(userInfoIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
index f339c8a881507a65d445b1882e98e58a48a11af5..9900ffc2b3d7b86cb17d1e1ff3c0bbc95443894e 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.SearchFieldLogCF;
 import org.codelibs.fess.es.log.cbean.cq.SearchFieldLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SearchFieldLogCQ, SearchFieldLogCF> filteredLambda) {
+    public void filtered(FilteredCall<SearchFieldLogCQ, SearchFieldLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SearchFieldLogCQ, SearchFieldLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        SearchFieldLogCQ query = new SearchFieldLogCQ();
-        SearchFieldLogCF filter = new SearchFieldLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<SearchFieldLogCQ, SearchFieldLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<SearchFieldLogCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<SearchFieldLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        SearchFieldLogCQ notQuery = new SearchFieldLogCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         SearchFieldLogCQ mustQuery = new SearchFieldLogCQ();
         SearchFieldLogCQ shouldQuery = new SearchFieldLogCQ();
         SearchFieldLogCQ mustNotQuery = new SearchFieldLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        SearchFieldLogCQ filterQuery = new SearchFieldLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -103,137 +121,57 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
+        TermQueryBuilder builder = regTermQ("_id", id);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    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_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsSearchFieldLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsSearchFieldLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -256,6 +194,25 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
@@ -403,6 +360,25 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSearchLogId_NotEqual(String searchLogId) {
+        setSearchLogId_NotTerm(searchLogId, null);
+    }
+
+    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSearchLogId_NotTerm(searchLogId, opLambda);
+    }
+
+    public void setSearchLogId_NotTerm(String searchLogId) {
+        setSearchLogId_NotTerm(searchLogId, null);
+    }
+
+    public void setSearchLogId_NotTerm(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("searchLogId", searchLogId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSearchLogId_Terms(Collection<String> searchLogIdList) {
         setSearchLogId_Terms(searchLogIdList, null);
     }
@@ -550,6 +526,25 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_NotEqual(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value) {
+        setValue_NotTerm(value, null);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_Terms(Collection<String> valueList) {
         setValue_Terms(valueList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index d9de7dba1862843c46fce6bb674f6820b60b9b36..d1728669a179b20af7203deafa6b3bede380db58 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.SearchLogCF;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<SearchLogCQ, SearchLogCF> filteredLambda) {
+    public void filtered(FilteredCall<SearchLogCQ, SearchLogCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<SearchLogCQ, SearchLogCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        SearchLogCQ query = new SearchLogCQ();
-        SearchLogCF filter = new SearchLogCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<SearchLogCQ, SearchLogCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<SearchLogCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<SearchLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        SearchLogCQ notQuery = new SearchLogCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         SearchLogCQ mustQuery = new SearchLogCQ();
         SearchLogCQ shouldQuery = new SearchLogCQ();
         SearchLogCQ mustNotQuery = new SearchLogCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        SearchLogCQ filterQuery = new SearchLogCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsSearchLogCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsSearchLogCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setAccessType_Equal(String accessType) {
         setAccessType_Term(accessType, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAccessType_NotEqual(String accessType) {
+        setAccessType_NotTerm(accessType, null);
+    }
+
+    public void setAccessType_NotEqual(String accessType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setAccessType_NotTerm(accessType, opLambda);
+    }
+
+    public void setAccessType_NotTerm(String accessType) {
+        setAccessType_NotTerm(accessType, null);
+    }
+
+    public void setAccessType_NotTerm(String accessType, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("accessType", accessType));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAccessType_Terms(Collection<String> accessTypeList) {
         setAccessType_Terms(accessTypeList, null);
     }
@@ -256,6 +360,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setClientIp_NotEqual(String clientIp) {
+        setClientIp_NotTerm(clientIp, null);
+    }
+
+    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setClientIp_NotTerm(clientIp, opLambda);
+    }
+
+    public void setClientIp_NotTerm(String clientIp) {
+        setClientIp_NotTerm(clientIp, null);
+    }
+
+    public void setClientIp_NotTerm(String clientIp, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("clientIp", clientIp));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setClientIp_Terms(Collection<String> clientIpList) {
         setClientIp_Terms(clientIpList, null);
     }
@@ -403,6 +526,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHitCount_NotEqual(Long hitCount) {
+        setHitCount_NotTerm(hitCount, null);
+    }
+
+    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setHitCount_NotTerm(hitCount, opLambda);
+    }
+
+    public void setHitCount_NotTerm(Long hitCount) {
+        setHitCount_NotTerm(hitCount, null);
+    }
+
+    public void setHitCount_NotTerm(Long hitCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hitCount", hitCount));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHitCount_Terms(Collection<Long> hitCountList) {
         setHitCount_Terms(hitCountList, null);
     }
@@ -520,167 +662,39 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setQueryOffset_Equal(Integer queryOffset) {
+        setQueryOffset_Term(queryOffset, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryOffset_Equal(Integer queryOffset, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setQueryOffset_Term(queryOffset, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setQueryOffset_Term(Integer queryOffset) {
+        setQueryOffset_Term(queryOffset, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setQueryOffset_Term(Integer queryOffset, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("queryOffset", queryOffset);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsSearchLogCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsSearchLogCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setQueryOffset_Equal(Integer queryOffset) {
-        setQueryOffset_Term(queryOffset, null);
+    public void setQueryOffset_NotEqual(Integer queryOffset) {
+        setQueryOffset_NotTerm(queryOffset, null);
     }
 
-    public void setQueryOffset_Equal(Integer queryOffset, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setQueryOffset_Term(queryOffset, opLambda);
+    public void setQueryOffset_NotEqual(Integer queryOffset, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setQueryOffset_NotTerm(queryOffset, opLambda);
     }
 
-    public void setQueryOffset_Term(Integer queryOffset) {
-        setQueryOffset_Term(queryOffset, null);
+    public void setQueryOffset_NotTerm(Integer queryOffset) {
+        setQueryOffset_NotTerm(queryOffset, null);
     }
 
-    public void setQueryOffset_Term(Integer queryOffset, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("queryOffset", queryOffset);
+    public void setQueryOffset_NotTerm(Integer queryOffset, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryOffset", queryOffset));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -822,6 +836,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQueryPageSize_NotEqual(Integer queryPageSize) {
+        setQueryPageSize_NotTerm(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_NotEqual(Integer queryPageSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setQueryPageSize_NotTerm(queryPageSize, opLambda);
+    }
+
+    public void setQueryPageSize_NotTerm(Integer queryPageSize) {
+        setQueryPageSize_NotTerm(queryPageSize, null);
+    }
+
+    public void setQueryPageSize_NotTerm(Integer queryPageSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryPageSize", queryPageSize));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQueryPageSize_Terms(Collection<Integer> queryPageSizeList) {
         setQueryPageSize_Terms(queryPageSizeList, null);
     }
@@ -958,6 +991,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setReferer_NotEqual(String referer) {
+        setReferer_NotTerm(referer, null);
+    }
+
+    public void setReferer_NotEqual(String referer, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setReferer_NotTerm(referer, opLambda);
+    }
+
+    public void setReferer_NotTerm(String referer) {
+        setReferer_NotTerm(referer, null);
+    }
+
+    public void setReferer_NotTerm(String referer, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("referer", referer));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setReferer_Terms(Collection<String> refererList) {
         setReferer_Terms(refererList, null);
     }
@@ -1105,6 +1157,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRequestedTime_NotEqual(Long requestedTime) {
+        setRequestedTime_NotTerm(requestedTime, null);
+    }
+
+    public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRequestedTime_NotTerm(requestedTime, opLambda);
+    }
+
+    public void setRequestedTime_NotTerm(Long requestedTime) {
+        setRequestedTime_NotTerm(requestedTime, null);
+    }
+
+    public void setRequestedTime_NotTerm(Long requestedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedTime", requestedTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRequestedTime_Terms(Collection<Long> requestedTimeList) {
         setRequestedTime_Terms(requestedTimeList, null);
     }
@@ -1241,6 +1312,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setResponseTime_NotEqual(Integer responseTime) {
+        setResponseTime_NotTerm(responseTime, null);
+    }
+
+    public void setResponseTime_NotEqual(Integer responseTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setResponseTime_NotTerm(responseTime, opLambda);
+    }
+
+    public void setResponseTime_NotTerm(Integer responseTime) {
+        setResponseTime_NotTerm(responseTime, null);
+    }
+
+    public void setResponseTime_NotTerm(Integer responseTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("responseTime", responseTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setResponseTime_Terms(Collection<Integer> responseTimeList) {
         setResponseTime_Terms(responseTimeList, null);
     }
@@ -1377,6 +1467,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSearchWord_NotEqual(String searchWord) {
+        setSearchWord_NotTerm(searchWord, null);
+    }
+
+    public void setSearchWord_NotEqual(String searchWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setSearchWord_NotTerm(searchWord, opLambda);
+    }
+
+    public void setSearchWord_NotTerm(String searchWord) {
+        setSearchWord_NotTerm(searchWord, null);
+    }
+
+    public void setSearchWord_NotTerm(String searchWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("searchWord", searchWord));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSearchWord_Terms(Collection<String> searchWordList) {
         setSearchWord_Terms(searchWordList, null);
     }
@@ -1524,6 +1633,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserAgent_NotEqual(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userAgent", userAgent));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserAgent_Terms(Collection<String> userAgentList) {
         setUserAgent_Terms(userAgentList, null);
     }
@@ -1671,6 +1799,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserInfoId_NotEqual(String userInfoId) {
+        setUserInfoId_NotTerm(userInfoId, null);
+    }
+
+    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUserInfoId_NotTerm(userInfoId, opLambda);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId) {
+        setUserInfoId_NotTerm(userInfoId, null);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userInfoId", userInfoId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserInfoId_Terms(Collection<String> userInfoIdList) {
         setUserInfoId_Terms(userInfoIdList, null);
     }
@@ -1818,6 +1965,25 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserSessionId_NotEqual(String userSessionId) {
+        setUserSessionId_NotTerm(userSessionId, null);
+    }
+
+    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUserSessionId_NotTerm(userSessionId, opLambda);
+    }
+
+    public void setUserSessionId_NotTerm(String userSessionId) {
+        setUserSessionId_NotTerm(userSessionId, null);
+    }
+
+    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userSessionId", userSessionId));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserSessionId_Terms(Collection<String> userSessionIdList) {
         setUserSessionId_Terms(userSessionIdList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index eded62139e743fef57ac95f89b9f933f9cc24caf..70ec5b21a9167358d40586c55f0821784561e9f3 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.log.cbean.cf.UserInfoCF;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<UserInfoCQ, UserInfoCF> filteredLambda) {
+    public void filtered(FilteredCall<UserInfoCQ, UserInfoCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<UserInfoCQ, UserInfoCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        UserInfoCQ query = new UserInfoCQ();
-        UserInfoCF filter = new UserInfoCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<UserInfoCQ, UserInfoCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<UserInfoCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<UserInfoCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        UserInfoCQ notQuery = new UserInfoCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         UserInfoCQ mustQuery = new UserInfoCQ();
         UserInfoCQ shouldQuery = new UserInfoCQ();
         UserInfoCQ mustNotQuery = new UserInfoCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        UserInfoCQ filterQuery = new UserInfoCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsUserInfoCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsUserInfoCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setCode_Equal(String code) {
         setCode_Term(code, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCode_NotEqual(String code) {
+        setCode_NotTerm(code, null);
+    }
+
+    public void setCode_NotEqual(String code, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCode_NotTerm(code, opLambda);
+    }
+
+    public void setCode_NotTerm(String code) {
+        setCode_NotTerm(code, null);
+    }
+
+    public void setCode_NotTerm(String code, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("code", code));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCode_Terms(Collection<String> codeList) {
         setCode_Terms(codeList, null);
     }
@@ -256,6 +360,25 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedTime_NotEqual(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime) {
+        setCreatedTime_NotTerm(createdTime, null);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
         setCreatedTime_Terms(createdTimeList, null);
     }
@@ -373,167 +496,39 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setUpdatedTime_Equal(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUpdatedTime_Term(updatedTime, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setUpdatedTime_Term(Long updatedTime) {
+        setUpdatedTime_Term(updatedTime, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserInfoCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
+    public void setUpdatedTime_NotEqual(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public BsUserInfoCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
     }
 
-    public void setUpdatedTime_Equal(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setUpdatedTime_Term(updatedTime, opLambda);
+    public void setUpdatedTime_NotTerm(Long updatedTime) {
+        setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_Term(Long updatedTime) {
-        setUpdatedTime_Term(updatedTime, null);
-    }
-
-    public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("updatedTime", updatedTime);
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
index 8950a138bee23104bec6e284e7c26beb2b85a908..b4693344323205d986cf413cc852980c26e5236c 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java
@@ -91,12 +91,10 @@ public class ClickLog extends BsClickLog {
         this.clickCount = clickCount;
     }
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
index ed42c6eaceeed375777a7c4966c07e9ceb3f361c..23ce8acfa96242f447d6f29d678176361bc26531 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java
@@ -24,12 +24,10 @@ public class FavoriteLog extends BsFavoriteLog {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java
index 654e0349874e1273ebf594400c7e64dbcf806055..10231541e45b5faad3ec206a70e1e594f24efa49 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java
@@ -24,12 +24,10 @@ public class SearchFieldLog extends BsSearchFieldLog {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
index 5105eb02b65efb0e6f35d6c5dec0ce9e288748af..79d42e4b7b38ab2a3d376d622d6978bea68d3b9b 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
@@ -41,12 +41,10 @@ public class SearchLog extends BsSearchLog {
 
     private OptionalEntity<UserInfo> userInfo;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
index f4dbd4592316fbbcb36babe87a4d88608f293c58..05c0fa2eea6a679fdb55e260c8e4320ba2717bce 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java
@@ -24,12 +24,10 @@ public class UserInfo extends BsUserInfo {
 
     private static final long serialVersionUID = 1L;
 
-    @Override
     public String getId() {
         return asDocMeta().id();
     }
 
-    @Override
     public void setId(final String id) {
         asDocMeta().id(id);
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionFilter.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionFilter.java
deleted file mode 100644
index 3bda8e01c34799146a0d83a103fbc2809e9bcfd8..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionFilter.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.allcommon;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
-import org.elasticsearch.index.query.IdsFilterBuilder;
-import org.elasticsearch.index.query.MatchAllFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.ScriptFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EsAbstractConditionFilter {
-
-    // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    protected List<FilterBuilder> filterBuilderList;
-
-    // ===================================================================================
-    //                                                                             Control
-    //                                                                             =======
-    public boolean hasFilters() {
-        return filterBuilderList != null && !filterBuilderList.isEmpty();
-    }
-
-    public FilterBuilder getFilter() {
-        if (filterBuilderList == null) {
-            return null;
-        } else if (filterBuilderList.size() == 1) {
-            return filterBuilderList.get(0);
-        }
-        return FilterBuilders.andFilter(filterBuilderList.toArray(new FilterBuilder[filterBuilderList.size()]));
-    }
-
-    public void addFilter(FilterBuilder filterBuilder) {
-        regF(filterBuilder);
-    }
-
-    // ===================================================================================
-    //                                                                               Query
-    //                                                                               =====
-    public void setIds_Equal(Collection<String> idList) {
-        checkEsInvalidQueryCollection("ids", idList);
-        doSetIds_Equal(idList, null);
-    }
-
-    public void setIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        checkEsInvalidQueryCollection("ids", idList);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetIds_Equal(idList, opLambda);
-    }
-
-    protected void doSetIds_Equal(Collection<String> idList, ConditionOptionCall<IdsFilterBuilder> opLambda) {
-        IdsFilterBuilder builder = regIdsF(idList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void matchAll() {
-        doMatchAll(null);
-    }
-
-    public void matchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        assertObjectNotNull("opLambda", opLambda);
-        doMatchAll(opLambda);
-    }
-
-    protected void doMatchAll(ConditionOptionCall<MatchAllFilterBuilder> opLambda) {
-        MatchAllFilterBuilder builder = FilterBuilders.matchAllFilter();
-        regF(builder);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setScript(String script) {
-        checkEsInvalidQuery("script", script);
-        doSetScript(script, null);
-    }
-
-    public void setScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        checkEsInvalidQuery("script", script);
-        assertObjectNotNull("opLambda", opLambda);
-        doSetScript(script, opLambda);
-    }
-
-    protected void doSetScript(String script, ConditionOptionCall<ScriptFilterBuilder> opLambda) {
-        ScriptFilterBuilder builder = regScriptF(script);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                            Register
-    //                                                                            ========
-    protected void regF(FilterBuilder builder) {
-        assertObjectNotNull("builder", builder);
-        if (filterBuilderList == null) {
-            filterBuilderList = new ArrayList<>();
-        }
-        filterBuilderList.add(builder);
-    }
-
-    protected TermFilterBuilder regTermF(String name, Object value) {
-        checkEsInvalidQuery(name, value);
-        TermFilterBuilder termFilter = FilterBuilders.termFilter(name, value);
-        regF(termFilter);
-        return termFilter;
-    }
-
-    protected TermsFilterBuilder regTermsF(String name, Collection<?> values) {
-        checkEsInvalidQueryCollection(name, values);
-        TermsFilterBuilder termsFilter = FilterBuilders.termsFilter(name, values);
-        regF(termsFilter);
-        return termsFilter;
-    }
-
-    protected PrefixFilterBuilder regPrefixF(String name, String value) {
-        checkEsInvalidQuery(name, value);
-        PrefixFilterBuilder prefixFilter = FilterBuilders.prefixFilter(name, value);
-        regF(prefixFilter);
-        return prefixFilter;
-    }
-
-    protected ExistsFilterBuilder regExistsF(String name) {
-        ExistsFilterBuilder existsFilter = FilterBuilders.existsFilter(name);
-        regF(existsFilter);
-        return existsFilter;
-    }
-
-    protected MissingFilterBuilder regMissingF(String name) {
-        MissingFilterBuilder missingFilter = FilterBuilders.missingFilter(name);
-        regF(missingFilter);
-        return missingFilter;
-    }
-
-    protected RangeFilterBuilder regRangeF(String name, ConditionKey ck, Object value) {
-        checkEsInvalidQuery(name, value);
-        assertObjectNotNull("ck", ck);
-        for (FilterBuilder builder : filterBuilderList) {
-            if (builder instanceof RangeFilterBuilder) {
-                RangeFilterBuilder rangeFilterBuilder = (RangeFilterBuilder) builder;
-                if (rangeFilterBuilder.toString().replaceAll("\\s", "").startsWith("{\"range\":{\"" + name + "\"")) {
-                    addRangeC(rangeFilterBuilder, ck, value);
-                    return rangeFilterBuilder;
-                }
-            }
-        }
-        RangeFilterBuilder rangeFilterBuilder = FilterBuilders.rangeFilter(name);
-        addRangeC(rangeFilterBuilder, ck, value);
-        regF(rangeFilterBuilder);
-        return rangeFilterBuilder;
-    }
-
-    protected void addRangeC(RangeFilterBuilder builder, ConditionKey ck, Object value) {
-        assertObjectNotNull("builder", builder);
-        assertObjectNotNull("ck", ck);
-        if (ck.equals(ConditionKey.CK_GREATER_THAN)) {
-            builder.gt(value);
-        } else if (ck.equals(ConditionKey.CK_GREATER_EQUAL)) {
-            builder.gte(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_THAN)) {
-            builder.lt(value);
-        } else if (ck.equals(ConditionKey.CK_LESS_EQUAL)) {
-            builder.lte(value);
-        }
-    }
-
-    protected ScriptFilterBuilder regScriptF(String script) {
-        checkEsInvalidQuery("script", script);
-        ScriptFilterBuilder scriptFilter = FilterBuilders.scriptFilter(script);
-        regF(scriptFilter);
-        return scriptFilter;
-    }
-
-    protected IdsFilterBuilder regIdsF(Collection<?> values) {
-        checkEsInvalidQueryCollection("idsF", values);
-        IdsFilterBuilder idsFilter = FilterBuilders.idsFilter(values.toArray(new String[values.size()]));
-        regF(idsFilter);
-        return idsFilter;
-    }
-
-    protected BoolFilterBuilder regBoolF(List<FilterBuilder> mustList, List<FilterBuilder> shouldList, List<FilterBuilder> mustNotList) {
-        assertObjectNotNull("mustList", mustList);
-        assertObjectNotNull("shouldList", shouldList);
-        assertObjectNotNull("mustNotList", mustNotList);
-        BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
-        mustList.forEach(query -> {
-            boolFilter.must(query);
-        });
-        shouldList.forEach(query -> {
-            boolFilter.should(query);
-        });
-        mustNotList.forEach(query -> {
-            boolFilter.mustNot(query);
-        });
-        return boolFilter;
-    }
-
-    protected AndFilterBuilder regAndF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        AndFilterBuilder andFilter = FilterBuilders.andFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected OrFilterBuilder regOrF(List<FilterBuilder> filterList) {
-        assertObjectNotNull("filterList", filterList);
-        OrFilterBuilder andFilter = FilterBuilders.orFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
-        regF(andFilter);
-        return andFilter;
-    }
-
-    protected NotFilterBuilder regNotF(FilterBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        NotFilterBuilder notFilter = FilterBuilders.notFilter(filter);
-        regF(notFilter);
-        return notFilter;
-    }
-
-    protected QueryFilterBuilder regQueryF(QueryBuilder filter) {
-        assertObjectNotNull("filter", filter);
-        QueryFilterBuilder queryFilter = FilterBuilders.queryFilter(filter);
-        regF(queryFilter);
-        return queryFilter;
-    }
-
-    // ===================================================================================
-    //                                                                       Invalid Query
-    //                                                                       =============
-    protected void checkEsInvalidQuery(String name, Object value) {
-        if (value == null || (value instanceof String && ((String) value).isEmpty())) {
-            String msg = "Cannot register null or empty query: name=" + name + " value=" + value;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    protected void checkEsInvalidQueryCollection(String name, Collection<?> values) {
-        if (values == null || values.isEmpty()) {
-            String msg = "Cannot register null or empty query collection: name=" + name + " values=" + values;
-            throw new InvalidQueryRegisteredException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                      General Helper
-    //                                                                      ==============
-    protected void assertObjectNotNull(String variableName, Object value) {
-        if (variableName == null) {
-            String msg = "The value should not be null: variableName=null value=" + value;
-            throw new IllegalArgumentException(msg);
-        }
-        if (value == null) {
-            String msg = "The value should not be null: variableName=" + variableName;
-            throw new IllegalArgumentException(msg);
-        }
-    }
-
-    // ===================================================================================
-    //                                                                        Assist Class
-    //                                                                        ============
-    @FunctionalInterface
-    public interface ConditionOptionCall<OP extends FilterBuilder> {
-
-        /**
-         * @param op The option of condition to be set up. (NotNull)
-         */
-        void callback(OP op);
-    }
-
-    @FunctionalInterface
-    public interface BoolCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF must, CF should, CF mustNot);
-    }
-
-    @FunctionalInterface
-    public interface OperatorCall<CF extends EsAbstractConditionFilter> {
-
-        void callback(CF and);
-    }
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index 700fe5e3fb84a68e990056446abfdb925659b86e..d95a457cc1985fca9cc31ba06c074628915dd643 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -33,9 +33,8 @@ import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 import org.elasticsearch.index.query.FuzzyQueryBuilder;
+import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -141,16 +140,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
-    protected FilteredQueryBuilder regFilteredQ(QueryBuilder queryBuilder, FilterBuilder filterBuilder) {
-        assertObjectNotNull("queryBuilder", queryBuilder);
-        assertObjectNotNull("filterBuilder", filterBuilder);
-        return QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
-    }
 
-    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList) {
+    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList,
+            List<QueryBuilder> filterList) {
         assertObjectNotNull("mustList", mustList);
         assertObjectNotNull("shouldList", shouldList);
         assertObjectNotNull("mustNotList", mustNotList);
+        assertObjectNotNull("filterList", filterList);
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         mustList.forEach(query -> {
             boolQuery.must(query);
@@ -161,6 +157,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         mustNotList.forEach(query -> {
             boolQuery.mustNot(query);
         });
+        filterList.forEach(query -> {
+            boolQuery.filter(query);
+        });
         return boolQuery;
     }
 
@@ -178,6 +177,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return termsQuery;
     }
 
+    protected IdsQueryBuilder regIdsQ(Collection<String> values) {
+        checkEsInvalidQueryCollection("_id", values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        regQ(idsQuery);
+        return idsQuery;
+    }
+
     protected MatchQueryBuilder regMatchQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
         MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, value);
@@ -453,11 +459,11 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface BoolCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ must, CQ should, CQ mustNot);
+        void callback(CQ must, CQ should, CQ mustNot, CQ filter);
     }
 
     @FunctionalInterface
-    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionFilter> {
+    public interface FilteredCall<CQ extends EsAbstractConditionQuery, CF extends EsAbstractConditionQuery> {
 
         void callback(CQ query, CF filter);
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
index 48a0be0e346c0c80dc52f77cacd237f7fa953760..de2f738f4d5f40465bf60b5a84b00786f2150ba5 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
@@ -176,39 +176,54 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl
     }
 
     // ===================================================================================
-    //                                                                      Basic Override
+    //                                                                      Classification
     //                                                                      ==============
     @Override
-    public int instanceHash() { // #pending
-        return 0;
+    public void myunlockUndefinedClassificationAccess() {
     }
 
     @Override
-    public String toStringWithRelation() { // #pending
-        return null;
+    public boolean myundefinedClassificationAccessAllowed() {
+        return false;
     }
 
-    @Override
-    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
-        return null;
+    // ===================================================================================
+    //                                                                        Empty String
+    //                                                                        ============
+    protected String convertEmptyToNull(String value) {
+        return (value != null && value.length() == 0) ? null : value;
     }
 
     // ===================================================================================
-    //                                                                      Classification
+    //                                                                              Source
+    //                                                                              ======
+    public abstract Map<String, Object> toSource();
+
+    // ===================================================================================
+    //                                                                      Basic Override
     //                                                                      ==============
+    // #pending hashCode(), equals()
     @Override
-    public void myunlockUndefinedClassificationAccess() {
+    public int instanceHash() {
+        return super.hashCode();
     }
 
     @Override
-    public boolean myundefinedClassificationAccessAllowed() {
-        return false;
+    public String toString() {
+        return getClass().getSimpleName() + ":" + doBuildColumnString(", ") + "@" + Integer.toHexString(hashCode());
     }
 
-    // ===================================================================================
-    //                                                                              Source
-    //                                                                              ======
-    public abstract Map<String, Object> toSource();
+    protected abstract String doBuildColumnString(String dm);
+
+    @Override
+    public String toStringWithRelation() { // #pending
+        return toString();
+    }
+
+    @Override
+    public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
+        return toString();
+    }
 
     // ===================================================================================
     //                                                                        Assist Class
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index c11cfd3bbcdb0839c3c7cf6ec431cfb243254631..ad65e64fa29b6ffd5e627e2107829fb08edbed1a 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -74,7 +74,6 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
     protected <RESULT extends Group> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index fffb5056b815f35c2803c8a860918bed4e54f9a9..ce1f91d0585ebcfb70ea649a186ea6b5b16b5e92 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -74,7 +74,6 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
     protected <RESULT extends Role> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             return result;
         } catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index cb7acac2198ac62e08f2309f9e9da0a1280e35a6..9e46789106de6aae7f6e65309adfe9916593be89 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -75,7 +75,6 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
         try {
             final RESULT result = entityType.newInstance();
             result.setGroups(toStringArray(source.get("groups")));
-            result.setId(DfTypeUtil.toString(source.get("id")));
             result.setName(DfTypeUtil.toString(source.get("name")));
             result.setPassword(DfTypeUtil.toString(source.get("password")));
             result.setRoles(toStringArray(source.get("roles")));
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
index 7a40e29a6494262e41f04e152e1580812d5d44a9..9afa876db46a33208873d7871805d4ce06c48cbd 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java
@@ -28,9 +28,23 @@ import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
  */
 public class BsGroup extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** name */
+    protected String name;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public GroupDbm asDBMeta() {
         return GroupDbm.getInstance();
@@ -42,45 +56,41 @@ public class BsGroup extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** name */
-    protected String name;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(name);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
         registerModifiedProperty("name");
         this.name = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java
index a01fdea0f389d5411758a1c17a57b4d56283c974..17e2c57399d91b2be4cb3298c48e3f260c3c1882 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java
@@ -28,9 +28,23 @@ import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
  */
 public class BsRole extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
+    // ===================================================================================
+    //                                                                           Attribute
+    //                                                                           =========
+    /** name */
+    protected String name;
+
+    // [Referrers] *comment only
+
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
     @Override
     public RoleDbm asDBMeta() {
         return RoleDbm.getInstance();
@@ -42,45 +56,41 @@ public class BsRole extends EsAbstractEntity {
     }
 
     // ===================================================================================
-    //                                                                           Attribute
-    //                                                                           =========
-    /** name */
-    protected String name;
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        return sourceMap;
+    }
 
-    // [Referrers] *comment only
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(name);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
 
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
         registerModifiedProperty("name");
         this.name = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
index e9600d32fc9b72fbada4b8decc3d2ab879e8468a..227242c6eeea6526a9b20150ac7b1a1b44b36b84 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
  */
 public class BsUser extends EsAbstractEntity {
 
+    // ===================================================================================
+    //                                                                          Definition
+    //                                                                          ==========
     private static final long serialVersionUID = 1L;
     protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
 
-    @Override
-    public UserDbm asDBMeta() {
-        return UserDbm.getInstance();
-    }
-
-    @Override
-    public String asTableDbName() {
-        return "user";
-    }
-
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
@@ -58,6 +51,57 @@ public class BsUser extends EsAbstractEntity {
 
     // [Referrers] *comment only
 
+    // ===================================================================================
+    //                                                                             DB Meta
+    //                                                                             =======
+    @Override
+    public UserDbm asDBMeta() {
+        return UserDbm.getInstance();
+    }
+
+    @Override
+    public String asTableDbName() {
+        return "user";
+    }
+
+    // ===================================================================================
+    //                                                                              Source
+    //                                                                              ======
+    @Override
+    public Map<String, Object> toSource() {
+        Map<String, Object> sourceMap = new HashMap<>();
+        if (groups != null) {
+            sourceMap.put("groups", groups);
+        }
+        if (name != null) {
+            sourceMap.put("name", name);
+        }
+        if (password != null) {
+            sourceMap.put("password", password);
+        }
+        if (roles != null) {
+            sourceMap.put("roles", roles);
+        }
+        return sourceMap;
+    }
+
+    // ===================================================================================
+    //                                                                      Basic Override
+    //                                                                      ==============
+    @Override
+    protected String doBuildColumnString(String dm) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(dm).append(groups);
+        sb.append(dm).append(name);
+        sb.append(dm).append(password);
+        sb.append(dm).append(roles);
+        if (sb.length() > dm.length()) {
+            sb.delete(0, dm.length());
+        }
+        sb.insert(0, "{").append("}");
+        return sb.toString();
+    }
+
     // ===================================================================================
     //                                                                            Accessor
     //                                                                            ========
@@ -71,19 +115,9 @@ public class BsUser extends EsAbstractEntity {
         this.groups = value;
     }
 
-    public String getId() {
-        checkSpecifiedProperty("id");
-        return asDocMeta().id();
-    }
-
-    public void setId(String value) {
-        registerModifiedProperty("id");
-        asDocMeta().id(value);
-    }
-
     public String getName() {
         checkSpecifiedProperty("name");
-        return name;
+        return convertEmptyToNull(name);
     }
 
     public void setName(String value) {
@@ -93,7 +127,7 @@ public class BsUser extends EsAbstractEntity {
 
     public String getPassword() {
         checkSpecifiedProperty("password");
-        return password;
+        return convertEmptyToNull(password);
     }
 
     public void setPassword(String value) {
@@ -110,25 +144,4 @@ public class BsUser extends EsAbstractEntity {
         registerModifiedProperty("roles");
         this.roles = value;
     }
-
-    @Override
-    public Map<String, Object> toSource() {
-        Map<String, Object> sourceMap = new HashMap<>();
-        if (groups != null) {
-            sourceMap.put("groups", groups);
-        }
-        if (asDocMeta().id() != null) {
-            sourceMap.put("id", asDocMeta().id());
-        }
-        if (name != null) {
-            sourceMap.put("name", name);
-        }
-        if (password != null) {
-            sourceMap.put("password", password);
-        }
-        if (roles != null) {
-            sourceMap.put("roles", roles);
-        }
-        return sourceMap;
-    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
index 0b941b4c5dd8c0bcdbd8a27e4cdc61dcb26d193d..be622015a4f03178c8119a863b0fba81e7fea81a 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
@@ -79,7 +79,6 @@ public class GroupDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((Group) et).getId(), (et, vl) -> ((Group) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((Group) et).getName(), (et, vl) -> ((Group) et).setName(DfTypeUtil.toString(vl)), "name");
     }
 
@@ -117,22 +116,15 @@ public class GroupDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnName());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
index 665251d43d0a98e7825047ae28a536a6f1f51ae5..9fb8aeacc0f9e91596a847d499e1c79ea2c3622e 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
@@ -79,7 +79,6 @@ public class RoleDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((Role) et).getId(), (et, vl) -> ((Role) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((Role) et).getName(), (et, vl) -> ((Role) et).setName(DfTypeUtil.toString(vl)), "name");
     }
 
@@ -117,22 +116,15 @@ public class RoleDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
-        ls.add(columnId());
         ls.add(columnName());
         return ls;
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
index cc1f6eca3c0ca9233012c224737e93d1a1723285..95f422c7fa1d18501f1af0139f33067b091c9ae2 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
@@ -80,7 +80,6 @@ public class UserDbm extends AbstractDBMeta {
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
         setupEpg(_epgMap, et -> ((User) et).getGroups(), (et, vl) -> ((User) et).setGroups((String[]) vl), "groups");
-        setupEpg(_epgMap, et -> ((User) et).getId(), (et, vl) -> ((User) et).setId(DfTypeUtil.toString(vl)), "id");
         setupEpg(_epgMap, et -> ((User) et).getName(), (et, vl) -> ((User) et).setName(DfTypeUtil.toString(vl)), "name");
         setupEpg(_epgMap, et -> ((User) et).getPassword(), (et, vl) -> ((User) et).setPassword(DfTypeUtil.toString(vl)), "password");
         setupEpg(_epgMap, et -> ((User) et).getRoles(), (et, vl) -> ((User) et).setRoles((String[]) vl), "roles");
@@ -122,8 +121,6 @@ public class UserDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false,
             "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
-            false, null, null, null, null, null, false);
     protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
@@ -135,10 +132,6 @@ public class UserDbm extends AbstractDBMeta {
         return _columnGroups;
     }
 
-    public ColumnInfo columnId() {
-        return _columnId;
-    }
-
     public ColumnInfo columnName() {
         return _columnName;
     }
@@ -154,7 +147,6 @@ public class UserDbm extends AbstractDBMeta {
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
         ls.add(columnGroups());
-        ls.add(columnId());
         ls.add(columnName());
         ls.add(columnPassword());
         ls.add(columnRoles());
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
index ba8e5aacf9f2a0b863f0541214aef9b6b40da514..27661c41145ece9058b44f8802c6c7172014c1d3 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
@@ -155,7 +155,7 @@ public class BsGroupCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnName() {
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
index 54897bb1829daf0ea9a2bd83a876d2fc5be675c2..ee1edd2bff119c1040959740ab63111ea738942a 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
@@ -155,7 +155,7 @@ public class BsRoleCB extends EsAbstractConditionBean {
         }
 
         public void columnId() {
-            doColumn("id");
+            doColumn("_id");
         }
 
         public void columnName() {
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
index accc7955ad4a11a539d8c481000871dbd823786a..d26d2d4610c1698ac73c1e4d851f4a9ef5e93cb6 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
@@ -154,12 +154,12 @@ public class BsUserCB extends EsAbstractConditionBean {
             columnList.add(name);
         }
 
-        public void columnGroups() {
-            doColumn("groups");
+        public void columnId() {
+            doColumn("_id");
         }
 
-        public void columnId() {
-            doColumn("id");
+        public void columnGroups() {
+            doColumn("groups");
         }
 
         public void columnName() {
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/GroupCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/GroupCF.java
deleted file mode 100644
index 5e664b627c95016ebdde5a81e7e74f61a7d382a5..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/GroupCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf;
-
-import org.codelibs.fess.es.user.cbean.cf.bs.BsGroupCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class GroupCF extends BsGroupCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/RoleCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/RoleCF.java
deleted file mode 100644
index a4aaacabe520a257978fd6e0499cf6f5cd206bbd..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/RoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf;
-
-import org.codelibs.fess.es.user.cbean.cf.bs.BsRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class RoleCF extends BsRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/UserCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/UserCF.java
deleted file mode 100644
index a84dfd4999aacb40e40dec3e485c83f6572e6fef..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/UserCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf;
-
-import org.codelibs.fess.es.user.cbean.cf.bs.BsUserCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class UserCF extends BsUserCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsGroupCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsGroupCF.java
deleted file mode 100644
index 352f5a4b09b237a8ca2323077b6a79c79d77d9d1..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsGroupCF.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.user.cbean.cf.GroupCF;
-import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsGroupCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<GroupCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<GroupCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        GroupCF mustFilter = new GroupCF();
-        GroupCF shouldFilter = new GroupCF();
-        GroupCF mustNotFilter = new GroupCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<GroupCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<GroupCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        GroupCF andFilter = new GroupCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<GroupCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<GroupCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        GroupCF orFilter = new GroupCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<GroupCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<GroupCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        GroupCF notFilter = new GroupCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<GroupCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<GroupCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        GroupCQ query = new GroupCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsRoleCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsRoleCF.java
deleted file mode 100644
index 171df25d1408e89e0e76e05c87f54468b146bf30..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsRoleCF.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.user.cbean.cf.RoleCF;
-import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsRoleCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<RoleCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<RoleCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        RoleCF mustFilter = new RoleCF();
-        RoleCF shouldFilter = new RoleCF();
-        RoleCF mustNotFilter = new RoleCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<RoleCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<RoleCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        RoleCF andFilter = new RoleCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<RoleCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<RoleCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        RoleCF orFilter = new RoleCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<RoleCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<RoleCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        RoleCF notFilter = new RoleCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<RoleCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<RoleCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        RoleCQ query = new RoleCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsUserCF.java b/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsUserCF.java
deleted file mode 100644
index fbf8e3d0faa59b9de801158a0d950edf67b279ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cf/bs/BsUserCF.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Copyright 2012-2015 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.user.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.user.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.user.cbean.cf.UserCF;
-import org.codelibs.fess.es.user.cbean.cq.UserCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsUserCF extends EsAbstractConditionFilter {
-
-    protected static final Class<?> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
-    // ===================================================================================
-    //                                                                       Query Control
-    //                                                                       =============
-    public void bool(BoolCall<UserCF> boolLambda) {
-        bool(boolLambda, null);
-    }
-
-    public void bool(BoolCall<UserCF> boolLambda, ConditionOptionCall<BoolFilterBuilder> opLambda) {
-        UserCF mustFilter = new UserCF();
-        UserCF shouldFilter = new UserCF();
-        UserCF mustNotFilter = new UserCF();
-        boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
-        if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
-            BoolFilterBuilder builder =
-                    regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void and(OperatorCall<UserCF> andLambda) {
-        and(andLambda, null);
-    }
-
-    public void and(OperatorCall<UserCF> andLambda, ConditionOptionCall<AndFilterBuilder> opLambda) {
-        UserCF andFilter = new UserCF();
-        andLambda.callback(andFilter);
-        if (andFilter.hasFilters()) {
-            AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void or(OperatorCall<UserCF> orLambda) {
-        or(orLambda, null);
-    }
-
-    public void or(OperatorCall<UserCF> orLambda, ConditionOptionCall<OrFilterBuilder> opLambda) {
-        UserCF orFilter = new UserCF();
-        orLambda.callback(orFilter);
-        if (orFilter.hasFilters()) {
-            OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void not(OperatorCall<UserCF> notLambda) {
-        not(notLambda, null);
-    }
-
-    public void not(OperatorCall<UserCF> notLambda, ConditionOptionCall<NotFilterBuilder> opLambda) {
-        UserCF notFilter = new UserCF();
-        notLambda.callback(notFilter);
-        if (notFilter.hasFilters()) {
-            if (notFilter.filterBuilderList.size() > 1) {
-                final String msg = "not filter must be one filter.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<UserCQ> queryLambda) {
-        query(queryLambda, null);
-    }
-
-    public void query(org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery.OperatorCall<UserCQ> queryLambda,
-            ConditionOptionCall<QueryFilterBuilder> opLambda) {
-        UserCQ query = new UserCQ();
-        queryLambda.callback(query);
-        if (query.hasQueries()) {
-            QueryFilterBuilder builder = regQueryF(query.getQuery());
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
-    }
-
-    // ===================================================================================
-    //                                                                           Query Set
-    //                                                                           =========
-    public void setGroups_NotEqual(String groups) {
-        setGroups_NotEqual(groups, null, null);
-    }
-
-    public void setGroups_NotEqual(String groups, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setGroups_Equal(groups, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setGroups_Equal(String groups) {
-        setGroups_Term(groups, null);
-    }
-
-    public void setGroups_Equal(String groups, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setGroups_Term(groups, opLambda);
-    }
-
-    public void setGroups_Term(String groups) {
-        setGroups_Term(groups, null);
-    }
-
-    public void setGroups_Term(String groups, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_Terms(Collection<String> groupsList) {
-        setGroups_Terms(groupsList, null);
-    }
-
-    public void setGroups_Terms(Collection<String> groupsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("groups", groupsList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_InScope(Collection<String> groupsList) {
-        setGroups_Terms(groupsList, null);
-    }
-
-    public void setGroups_InScope(Collection<String> groupsList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setGroups_Terms(groupsList, opLambda);
-    }
-
-    public void setGroups_Prefix(String groups) {
-        setGroups_Prefix(groups, null);
-    }
-
-    public void setGroups_Prefix(String groups, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("groups", groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_Exists() {
-        setGroups_Exists(null);
-    }
-
-    public void setGroups_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("groups");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_Missing() {
-        setGroups_Missing(null);
-    }
-
-    public void setGroups_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("groups");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_GreaterThan(String groups) {
-        setGroups_GreaterThan(groups, null);
-    }
-
-    public void setGroups_GreaterThan(String groups, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("groups", ConditionKey.CK_GREATER_THAN, groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_LessThan(String groups) {
-        setGroups_LessThan(groups, null);
-    }
-
-    public void setGroups_LessThan(String groups, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("groups", ConditionKey.CK_LESS_THAN, groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_GreaterEqual(String groups) {
-        setGroups_GreaterEqual(groups, null);
-    }
-
-    public void setGroups_GreaterEqual(String groups, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("groups", ConditionKey.CK_GREATER_EQUAL, groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setGroups_LessEqual(String groups) {
-        setGroups_LessEqual(groups, null);
-    }
-
-    public void setGroups_LessEqual(String groups, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("groups", ConditionKey.CK_LESS_EQUAL, groups);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_NotEqual(String id) {
-        setId_NotEqual(id, null, null);
-    }
-
-    public void setId_NotEqual(String id, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setId_Equal(id, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setId_Equal(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Equal(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setId_Term(id, opLambda);
-    }
-
-    public void setId_Term(String id) {
-        setId_Term(id, null);
-    }
-
-    public void setId_Term(String id, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("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<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("id", 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<TermsFilterBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Exists() {
-        setId_Exists(null);
-    }
-
-    public void setId_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Missing() {
-        setId_Missing(null);
-    }
-
-    public void setId_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("id");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
-    }
-
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
-    }
-
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_NotEqual(String name) {
-        setName_NotEqual(name, null, null);
-    }
-
-    public void setName_NotEqual(String name, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setName_Equal(name, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Equal(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setName_Term(name, opLambda);
-    }
-
-    public void setName_Term(String name) {
-        setName_Term(name, null);
-    }
-
-    public void setName_Term(String name, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Terms(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_Terms(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("name", nameList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_InScope(Collection<String> nameList) {
-        setName_Terms(nameList, null);
-    }
-
-    public void setName_InScope(Collection<String> nameList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setName_Terms(nameList, opLambda);
-    }
-
-    public void setName_Prefix(String name) {
-        setName_Prefix(name, null);
-    }
-
-    public void setName_Prefix(String name, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("name", name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Exists() {
-        setName_Exists(null);
-    }
-
-    public void setName_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_Missing() {
-        setName_Missing(null);
-    }
-
-    public void setName_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("name");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterThan(String name) {
-        setName_GreaterThan(name, null);
-    }
-
-    public void setName_GreaterThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessThan(String name) {
-        setName_LessThan(name, null);
-    }
-
-    public void setName_LessThan(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_THAN, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_GreaterEqual(String name) {
-        setName_GreaterEqual(name, null);
-    }
-
-    public void setName_GreaterEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_GREATER_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setName_LessEqual(String name) {
-        setName_LessEqual(name, null);
-    }
-
-    public void setName_LessEqual(String name, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("name", ConditionKey.CK_LESS_EQUAL, name);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_NotEqual(String password) {
-        setPassword_NotEqual(password, null, null);
-    }
-
-    public void setPassword_NotEqual(String password, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setPassword_Equal(password, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setPassword_Equal(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Equal(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setPassword_Term(password, opLambda);
-    }
-
-    public void setPassword_Term(String password) {
-        setPassword_Term(password, null);
-    }
-
-    public void setPassword_Term(String password, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_Terms(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("password", passwordList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList) {
-        setPassword_Terms(passwordList, null);
-    }
-
-    public void setPassword_InScope(Collection<String> passwordList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setPassword_Terms(passwordList, opLambda);
-    }
-
-    public void setPassword_Prefix(String password) {
-        setPassword_Prefix(password, null);
-    }
-
-    public void setPassword_Prefix(String password, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("password", password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Exists() {
-        setPassword_Exists(null);
-    }
-
-    public void setPassword_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_Missing() {
-        setPassword_Missing(null);
-    }
-
-    public void setPassword_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("password");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterThan(String password) {
-        setPassword_GreaterThan(password, null);
-    }
-
-    public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessThan(String password) {
-        setPassword_LessThan(password, null);
-    }
-
-    public void setPassword_LessThan(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_THAN, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_GreaterEqual(String password) {
-        setPassword_GreaterEqual(password, null);
-    }
-
-    public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_GREATER_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setPassword_LessEqual(String password) {
-        setPassword_LessEqual(password, null);
-    }
-
-    public void setPassword_LessEqual(String password, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("password", ConditionKey.CK_LESS_EQUAL, password);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_NotEqual(String roles) {
-        setRoles_NotEqual(roles, null, null);
-    }
-
-    public void setRoles_NotEqual(String roles, ConditionOptionCall<NotFilterBuilder> notOpLambda,
-            ConditionOptionCall<TermFilterBuilder> eqOpLambda) {
-        not(subCf -> {
-            subCf.setRoles_Equal(roles, eqOpLambda);
-        }, notOpLambda);
-    }
-
-    public void setRoles_Equal(String roles) {
-        setRoles_Term(roles, null);
-    }
-
-    public void setRoles_Equal(String roles, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        setRoles_Term(roles, opLambda);
-    }
-
-    public void setRoles_Term(String roles) {
-        setRoles_Term(roles, null);
-    }
-
-    public void setRoles_Term(String roles, ConditionOptionCall<TermFilterBuilder> opLambda) {
-        TermFilterBuilder builder = regTermF("roles", roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_Terms(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
-    }
-
-    public void setRoles_Terms(Collection<String> rolesList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        TermsFilterBuilder builder = regTermsF("roles", rolesList);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_InScope(Collection<String> rolesList) {
-        setRoles_Terms(rolesList, null);
-    }
-
-    public void setRoles_InScope(Collection<String> rolesList, ConditionOptionCall<TermsFilterBuilder> opLambda) {
-        setRoles_Terms(rolesList, opLambda);
-    }
-
-    public void setRoles_Prefix(String roles) {
-        setRoles_Prefix(roles, null);
-    }
-
-    public void setRoles_Prefix(String roles, ConditionOptionCall<PrefixFilterBuilder> opLambda) {
-        PrefixFilterBuilder builder = regPrefixF("roles", roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_Exists() {
-        setRoles_Exists(null);
-    }
-
-    public void setRoles_Exists(ConditionOptionCall<ExistsFilterBuilder> opLambda) {
-        ExistsFilterBuilder builder = regExistsF("roles");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_Missing() {
-        setRoles_Missing(null);
-    }
-
-    public void setRoles_Missing(ConditionOptionCall<MissingFilterBuilder> opLambda) {
-        MissingFilterBuilder builder = regMissingF("roles");
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_GreaterThan(String roles) {
-        setRoles_GreaterThan(roles, null);
-    }
-
-    public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roles", ConditionKey.CK_GREATER_THAN, roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_LessThan(String roles) {
-        setRoles_LessThan(roles, null);
-    }
-
-    public void setRoles_LessThan(String roles, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roles", ConditionKey.CK_LESS_THAN, roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_GreaterEqual(String roles) {
-        setRoles_GreaterEqual(roles, null);
-    }
-
-    public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roles", ConditionKey.CK_GREATER_EQUAL, roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setRoles_LessEqual(String roles) {
-        setRoles_LessEqual(roles, null);
-    }
-
-    public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeFilterBuilder> opLambda) {
-        RangeFilterBuilder builder = regRangeF("roles", ConditionKey.CK_LESS_EQUAL, roles);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index 9f33d8ee9cd61ab4311441e80b2cfb7e650107cf..2fffa13941464a502c4b0f3b7693967c4ace9603 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cf.GroupCF;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<GroupCQ, GroupCF> filteredLambda) {
+    public void filtered(FilteredCall<GroupCQ, GroupCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<GroupCQ, GroupCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        GroupCQ query = new GroupCQ();
-        GroupCF filter = new GroupCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<GroupCQ, GroupCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<GroupCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<GroupCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        GroupCQ notQuery = new GroupCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         GroupCQ mustQuery = new GroupCQ();
         GroupCQ shouldQuery = new GroupCQ();
         GroupCQ mustNotQuery = new GroupCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        GroupCQ filterQuery = new GroupCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -103,137 +121,57 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
+        TermQueryBuilder builder = regTermQ("_id", id);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    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_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsGroupCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsGroupCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -256,6 +194,25 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index 951fd891793297cf2c04a265067216fd28a06353..76a3313bc771fe0770df246ea6e6ecac6a0bb921 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cf.RoleCF;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<RoleCQ, RoleCF> filteredLambda) {
+    public void filtered(FilteredCall<RoleCQ, RoleCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<RoleCQ, RoleCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        RoleCQ query = new RoleCQ();
-        RoleCF filter = new RoleCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<RoleCQ, RoleCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<RoleCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<RoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        RoleCQ notQuery = new RoleCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         RoleCQ mustQuery = new RoleCQ();
         RoleCQ shouldQuery = new RoleCQ();
         RoleCQ mustNotQuery = new RoleCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        RoleCQ filterQuery = new RoleCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -103,137 +121,57 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setId_Term(String id, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = 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<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
+        TermQueryBuilder builder = regTermQ("_id", id);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
+    public void setId_NotEqual(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
     }
 
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
+    public void setId_NotTerm(String id) {
+        setId_NotTerm(id, null);
     }
 
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
+    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_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setId_Terms(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
+    public void setId_Terms(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        IdsQueryBuilder builder = regIdsQ(idList);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setId_InScope(Collection<String> idList) {
+        setId_Terms(idList, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_InScope(Collection<String> idList, ConditionOptionCall<IdsQueryBuilder> opLambda) {
+        setId_Terms(idList, opLambda);
     }
 
     public BsRoleCQ addOrderBy_Id_Asc() {
-        regOBA("id");
+        regOBA("_id");
         return this;
     }
 
     public BsRoleCQ addOrderBy_Id_Desc() {
-        regOBD("id");
+        regOBD("_id");
         return this;
     }
 
@@ -256,6 +194,25 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_Terms(Collection<String> nameList) {
         setName_Terms(nameList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index 6c7b729d4fb99ea51fd9bac08b8e8c22aee7766c..8e805668ccc73666981a596b437dc486b2a1b780 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -19,14 +19,16 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
-import org.codelibs.fess.es.user.cbean.cf.UserCF;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
+import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
 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;
@@ -54,16 +56,29 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                       Query Control
     //                                                                       =============
-    public void filtered(FilteredCall<UserCQ, UserCF> filteredLambda) {
+    public void filtered(FilteredCall<UserCQ, UserCQ> filteredLambda) {
         filtered(filteredLambda, null);
     }
 
-    public void filtered(FilteredCall<UserCQ, UserCF> filteredLambda, ConditionOptionCall<FilteredQueryBuilder> opLambda) {
-        UserCQ query = new UserCQ();
-        UserCF filter = new UserCF();
-        filteredLambda.callback(query, filter);
-        if (query.hasQueries()) {
-            FilteredQueryBuilder builder = regFilteredQ(query.getQuery(), filter.getFilter());
+    public void filtered(FilteredCall<UserCQ, UserCQ> filteredLambda, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> {
+            filteredLambda.callback(must, filter);
+        }, opLambda);
+    }
+
+    public void not(OperatorCall<UserCQ> notLambda) {
+        not(notLambda, null);
+    }
+
+    public void not(OperatorCall<UserCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        UserCQ notQuery = new UserCQ();
+        notLambda.callback(notQuery);
+        if (notQuery.hasQueries()) {
+            if (notQuery.queryBuilderList.size() > 1) {
+                final String msg = "not query must be one query.";
+                throw new IllegalConditionBeanOperationException(msg);
+            }
+            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.queryBuilderList.get(0));
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -78,9 +93,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         UserCQ mustQuery = new UserCQ();
         UserCQ shouldQuery = new UserCQ();
         UserCQ mustNotQuery = new UserCQ();
-        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery);
-        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries()) {
-            BoolQueryBuilder builder = regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList);
+        UserCQ filterQuery = new UserCQ();
+        boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
+        if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
+            BoolQueryBuilder builder =
+                    regBoolCQ(mustQuery.queryBuilderList, shouldQuery.queryBuilderList, mustNotQuery.queryBuilderList,
+                            filterQuery.queryBuilderList);
             if (opLambda != null) {
                 opLambda.callback(builder);
             }
@@ -90,6 +108,73 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     // ===================================================================================
     //                                                                           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 BsUserCQ addOrderBy_Id_Asc() {
+        regOBA("_id");
+        return this;
+    }
+
+    public BsUserCQ addOrderBy_Id_Desc() {
+        regOBD("_id");
+        return this;
+    }
+
     public void setGroups_Equal(String groups) {
         setGroups_Term(groups, null);
     }
@@ -109,6 +194,25 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setGroups_NotEqual(String groups) {
+        setGroups_NotTerm(groups, null);
+    }
+
+    public void setGroups_NotEqual(String groups, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setGroups_NotTerm(groups, opLambda);
+    }
+
+    public void setGroups_NotTerm(String groups) {
+        setGroups_NotTerm(groups, null);
+    }
+
+    public void setGroups_NotTerm(String groups, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("groups", groups));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setGroups_Terms(Collection<String> groupsList) {
         setGroups_Terms(groupsList, null);
     }
@@ -237,167 +341,39 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         return this;
     }
 
-    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_Terms(Collection<String> idList) {
-        setId_Terms(idList, null);
-    }
-
-    public void setId_Terms(Collection<String> idList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
-        TermsQueryBuilder builder = regTermsQ("id", 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<TermsQueryBuilder> opLambda) {
-        setId_Terms(idList, opLambda);
-    }
-
-    public void setId_Match(String id) {
-        setId_Match(id, null);
-    }
-
-    public void setId_Match(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrase(String id) {
-        setId_MatchPhrase(id, null);
-    }
-
-    public void setId_MatchPhrase(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_MatchPhrasePrefix(String id) {
-        setId_MatchPhrasePrefix(id, null);
-    }
-
-    public void setId_MatchPhrasePrefix(String id, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Fuzzy(String id) {
-        setId_Fuzzy(id, null);
-    }
-
-    public void setId_Fuzzy(String id, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_Prefix(String id) {
-        setId_Prefix(id, null);
-    }
-
-    public void setId_Prefix(String id, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
-        PrefixQueryBuilder builder = regPrefixQ("id", id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterThan(String id) {
-        setId_GreaterThan(id, null);
-    }
-
-    public void setId_GreaterThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_LessThan(String id) {
-        setId_LessThan(id, null);
-    }
-
-    public void setId_LessThan(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_THAN, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
-    }
-
-    public void setId_GreaterEqual(String id) {
-        setId_GreaterEqual(id, null);
+    public void setName_Equal(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_GreaterEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_GREATER_EQUAL, id);
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setName_Term(name, opLambda);
     }
 
-    public void setId_LessEqual(String id) {
-        setId_LessEqual(id, null);
+    public void setName_Term(String name) {
+        setName_Term(name, null);
     }
 
-    public void setId_LessEqual(String id, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("id", ConditionKey.CK_LESS_EQUAL, id);
+    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public BsUserCQ addOrderBy_Id_Asc() {
-        regOBA("id");
-        return this;
-    }
-
-    public BsUserCQ addOrderBy_Id_Desc() {
-        regOBD("id");
-        return this;
-    }
-
-    public void setName_Equal(String name) {
-        setName_Term(name, null);
+    public void setName_NotEqual(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_Equal(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        setName_Term(name, opLambda);
+    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
     }
 
-    public void setName_Term(String name) {
-        setName_Term(name, null);
+    public void setName_NotTerm(String name) {
+        setName_NotTerm(name, null);
     }
 
-    public void setName_Term(String name, ConditionOptionCall<TermQueryBuilder> opLambda) {
-        TermQueryBuilder builder = regTermQ("name", name);
+    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -550,6 +526,25 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_NotEqual(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotEqual(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
+    }
+
+    public void setPassword_NotTerm(String password) {
+        setPassword_NotTerm(password, null);
+    }
+
+    public void setPassword_NotTerm(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("password", password));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_Terms(Collection<String> passwordList) {
         setPassword_Terms(passwordList, null);
     }
@@ -697,6 +692,25 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoles_NotEqual(String roles) {
+        setRoles_NotTerm(roles, null);
+    }
+
+    public void setRoles_NotEqual(String roles, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        setRoles_NotTerm(roles, opLambda);
+    }
+
+    public void setRoles_NotTerm(String roles) {
+        setRoles_NotTerm(roles, null);
+    }
+
+    public void setRoles_NotTerm(String roles, ConditionOptionCall<NotQueryBuilder> opLambda) {
+        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roles", roles));
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoles_Terms(Collection<String> rolesList) {
         setRoles_Terms(rolesList, null);
     }
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java b/src/main/java/org/codelibs/fess/es/user/exentity/Group.java
index 0c7ab649c5830551494245b6058a545ff0361660..b46a5472e897a56aed4fc46c8fc9a684db0eb31f 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java
+++ b/src/main/java/org/codelibs/fess/es/user/exentity/Group.java
@@ -31,4 +31,13 @@ public class Group extends BsGroup {
     public void setVersionNo(final Long version) {
         asDocMeta().version(version);
     }
+
+    public String getId() {
+        return asDocMeta().id();
+    }
+
+    public void setId(String id) {
+        asDocMeta().id(id);
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java b/src/main/java/org/codelibs/fess/es/user/exentity/Role.java
index 8af31f403da9da65540e06027ccdf73da4483c7a..1c39981879ca8ae2faa8010452cbef43ba07b1b0 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java
+++ b/src/main/java/org/codelibs/fess/es/user/exentity/Role.java
@@ -31,4 +31,12 @@ public class Role extends BsRole {
     public void setVersionNo(final Long version) {
         asDocMeta().version(version);
     }
+
+    public String getId() {
+        return asDocMeta().id();
+    }
+
+    public void setId(String id) {
+        asDocMeta().id(id);
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/User.java b/src/main/java/org/codelibs/fess/es/user/exentity/User.java
index ed9fef45ed037ad3e01993c14f49cdfd84f1096b..96b6ea389aed65d9d25528e7e812254aef20ce7c 100644
--- a/src/main/java/org/codelibs/fess/es/user/exentity/User.java
+++ b/src/main/java/org/codelibs/fess/es/user/exentity/User.java
@@ -36,6 +36,14 @@ public class User extends BsUser {
         asDocMeta().version(version);
     }
 
+    public String getId() {
+        return asDocMeta().id();
+    }
+
+    public void setId(String id) {
+        asDocMeta().id(id);
+    }
+
     public String[] getRoleNames() {
         return Stream.of(getRoles()).map(role -> new String(Base64.getDecoder().decode(role), Constants.CHARSET_UTF_8))
                 .toArray(n -> new String[n]);
@@ -45,4 +53,5 @@ public class User extends BsUser {
         return Stream.of(getGroups()).map(group -> new String(Base64.getDecoder().decode(group), Constants.CHARSET_UTF_8))
                 .toArray(n -> new String[n]);
     }
+
 }
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java
index bb2d0e57c3e8c6b7beb7ddb6b27c78d47246a97b..5fb1236e056f7d9876c4823acf44baa4e70bca13 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java
@@ -165,7 +165,7 @@ public class CrawlingSessionHelper implements Serializable {
                         final Terms terms = response.getAggregations().get(fieldHelper.segmentField);
                         for (final Bucket bucket : terms.getBuckets()) {
                             final Map<String, String> map = new HashMap<String, String>(2);
-                            map.put(fieldHelper.segmentField, bucket.getKey());
+                            map.put(fieldHelper.segmentField, bucket.getKey().toString());
                             map.put(FACET_COUNT_KEY, Long.toString(bucket.getDocCount()));
                             sessionIdList.add(map);
                         }
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 2cb48ffde04d4168138237bf0162c1511f9d4eb6..71a52475bd77aab2026fb7ce8a920a6c0c5cfd22 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.elasticsearch.action.count.CountResponse;
-import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.slf4j.Logger;
@@ -69,8 +68,8 @@ public class IndexingHelper {
             }
 
             final QueryBuilder queryBuilder =
-                    QueryBuilders.filteredQuery(QueryBuilders.termQuery(fieldHelper.urlField, inputDoc.get(fieldHelper.urlField)),
-                            FilterBuilders.termFilter(fieldHelper.configIdField, configIdValue));
+                    QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fieldHelper.urlField, inputDoc.get(fieldHelper.urlField)))
+                            .filter(QueryBuilders.termQuery(fieldHelper.configIdField, configIdValue));
 
             final List<Map<String, Object>> docs =
                     getDocumentListByQuery(fessEsClient, queryBuilder, new String[] { fieldHelper.idField, fieldHelper.docIdField });
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index 8bb42555c0e2c587847b09bef925f5e1ea8be7bb..5f4f05071d5fc45627b81628e33be1997a81ab94 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -57,8 +57,6 @@ import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
@@ -230,10 +228,13 @@ public class QueryHelper implements Serializable {
         if (roleQueryHelper != null) {
             final Set<String> roleSet = roleQueryHelper.build();
             if (!roleSet.isEmpty()) {
-                final FilterBuilder filterBuilder =
-                        FilterBuilders.orFilter(roleSet.stream().map(name -> FilterBuilders.termFilter(fieldHelper.roleField, name))
-                                .toArray(n -> new FilterBuilder[n]));
-                queryContext.addFilter(filterBuilder);
+                queryContext.addQuery(boolQuery -> {
+                    BoolQueryBuilder roleQuery = QueryBuilders.boolQuery();
+                    roleSet.stream().forEach(name -> {
+                        roleQuery.filter(QueryBuilders.termQuery(fieldHelper.roleField, name));
+                    });
+                    boolQuery.filter(roleQuery);
+                });
             }
         }
 
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index e00665dfbdba9262bc84a74989eca7765173c0cc..1bb6185f693da7be5b6436e5c6599a04bbcbec8e 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -47,7 +47,6 @@ import org.codelibs.fess.helper.SearchLogHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.sort.SortOrder;
@@ -169,13 +168,11 @@ public class IndexUpdater extends Thread {
             final Consumer<SearchRequestBuilder> cb =
                     builder -> {
                         final QueryBuilder queryBuilder =
-                                QueryBuilders.filteredQuery(
-                                        QueryBuilders.matchAllQuery(),
-                                        FilterBuilders
-                                                .boolFilter()
-                                                .must(FilterBuilders.termsFilter(EsAccessResult.SESSION_ID, sessionIdList))
-                                                .must(FilterBuilders.termFilter(EsAccessResult.STATUS,
-                                                        org.codelibs.fess.crawler.Constants.OK_STATUS)));
+                                QueryBuilders
+                                        .boolQuery()
+                                        .filter(QueryBuilders.termQuery(EsAccessResult.SESSION_ID, sessionIdList))
+                                        .filter(QueryBuilders.termQuery(EsAccessResult.STATUS,
+                                                org.codelibs.fess.crawler.Constants.OK_STATUS));
                         builder.setQuery(queryBuilder);
                         builder.setFrom(0);
                         if (maxDocumentCacheSize <= 0) {
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index 04565f3e75ee737cd02756743185a634bb5a28c6..5ace0f2527ead3c31429a9743b31239b734585fc 100644
--- a/src/main/java/org/codelibs/fess/util/FacetResponse.java
+++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java
@@ -21,11 +21,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.Constants;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 
+import com.google.common.base.Charsets;
 import com.google.common.io.BaseEncoding;
 
 public class FacetResponse {
@@ -60,7 +60,7 @@ public class FacetResponse {
             final String encodedField = termFacet.getName().substring(Constants.FACET_FIELD_PREFIX.length());
             name = new String(BaseEncoding.base64().decode(encodedField), Charsets.UTF_8);
             for (final Terms.Bucket tfEntry : termFacet.getBuckets()) {
-                valueCountMap.put(tfEntry.getKeyAsText().string(), tfEntry.getDocCount());
+                valueCountMap.put(tfEntry.getKeyAsString(), tfEntry.getDocCount());
             }
         }
 
diff --git a/src/main/resources/fess_indices/.fess_config/boost_document_rule.json b/src/main/resources/fess_indices/.fess_config/boost_document_rule.json
index ee2ba99d692865c8879f5af8a6a9dfb1abe0f0c9..04d46ea5ba50b5485c30a235710f8c521be72ee6 100644
--- a/src/main/resources/fess_indices/.fess_config/boost_document_rule.json
+++ b/src/main/resources/fess_indices/.fess_config/boost_document_rule.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "urlExpr": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/crawling_session.json b/src/main/resources/fess_indices/.fess_config/crawling_session.json
index 3aee89c3e9008d0582e4ab8a759b2ba9ed66f633..cd18839233f489c5f449233c1fad2e102a4fd949 100644
--- a/src/main/resources/fess_indices/.fess_config/crawling_session.json
+++ b/src/main/resources/fess_indices/.fess_config/crawling_session.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "sessionId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/crawling_session_info.json b/src/main/resources/fess_indices/.fess_config/crawling_session_info.json
index 007ced1f6dab7e301864d9612f8621528525648f..57396b5db71a53918279bd649abdb0e654e39cb3 100644
--- a/src/main/resources/fess_indices/.fess_config/crawling_session_info.json
+++ b/src/main/resources/fess_indices/.fess_config/crawling_session_info.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "crawlingSessionId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/data_config.json b/src/main/resources/fess_indices/.fess_config/data_config.json
index dad61a232275b1fdb88aa62b24f1bf59cc51eded..4057db5bb55d9164097dcead6f287c8b4d3947fe 100644
--- a/src/main/resources/fess_indices/.fess_config/data_config.json
+++ b/src/main/resources/fess_indices/.fess_config/data_config.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_label.json b/src/main/resources/fess_indices/.fess_config/data_config_to_label.json
index f0803d62c8953f5c78890666e9c8b17e35f1c86d..9acd486becfd9254f491fb9dcd094004a4cdff7c 100644
--- a/src/main/resources/fess_indices/.fess_config/data_config_to_label.json
+++ b/src/main/resources/fess_indices/.fess_config/data_config_to_label.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "dataConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_role.json b/src/main/resources/fess_indices/.fess_config/data_config_to_role.json
index c77f0c8dd3e7a5b289615944329eea7ee98aa0d7..69b7d387d0800f8821c9e4690f895c8236a56155 100644
--- a/src/main/resources/fess_indices/.fess_config/data_config_to_role.json
+++ b/src/main/resources/fess_indices/.fess_config/data_config_to_role.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "dataConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/failure_url.json b/src/main/resources/fess_indices/.fess_config/failure_url.json
index 7aac70957eec14b50656157968d1b0f996e9830c..b878641071158bc1909e6b0c54f9caa3bcfa43c7 100644
--- a/src/main/resources/fess_indices/.fess_config/failure_url.json
+++ b/src/main/resources/fess_indices/.fess_config/failure_url.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "url": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/file_authentication.json b/src/main/resources/fess_indices/.fess_config/file_authentication.json
index 50a4b1ea7d75bd55b32a9a0429a6ce7c2e8551fc..fb6683d144af0c53d65b6006874bb85f1d552990 100644
--- a/src/main/resources/fess_indices/.fess_config/file_authentication.json
+++ b/src/main/resources/fess_indices/.fess_config/file_authentication.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "hostname": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/file_config.json b/src/main/resources/fess_indices/.fess_config/file_config.json
index 9d925728544adacf9ecaa789bf945e53dabf5b57..9941424c6713b47236e85a9071141219f0677adb 100644
--- a/src/main/resources/fess_indices/.fess_config/file_config.json
+++ b/src/main/resources/fess_indices/.fess_config/file_config.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_label.json b/src/main/resources/fess_indices/.fess_config/file_config_to_label.json
index 8ed7859d6582f1e9cef28b05c72ab9bf56b59a22..efab44c1aea108f849cff9752060bdcbc5acf6e4 100644
--- a/src/main/resources/fess_indices/.fess_config/file_config_to_label.json
+++ b/src/main/resources/fess_indices/.fess_config/file_config_to_label.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "fileConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_role.json b/src/main/resources/fess_indices/.fess_config/file_config_to_role.json
index 1951b07446b86abe537d538d916918433a6e7d9e..a055d619f37b61e472de8c0f0e7207d2c68d8a91 100644
--- a/src/main/resources/fess_indices/.fess_config/file_config_to_role.json
+++ b/src/main/resources/fess_indices/.fess_config/file_config_to_role.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "fileConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/job_log.json b/src/main/resources/fess_indices/.fess_config/job_log.json
index 3d07f70a85feca1522ef660ac428b878619a7f02..1f8fc35ba2f41dd855e61811aa90ce20ac90ab2d 100644
--- a/src/main/resources/fess_indices/.fess_config/job_log.json
+++ b/src/main/resources/fess_indices/.fess_config/job_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "jobName": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/key_match.json b/src/main/resources/fess_indices/.fess_config/key_match.json
index ee925d8fdc7a228f1977a1d305455aedfab53ec5..4de9e522387155b3928f1b32cfd9c8d47b869c8a 100644
--- a/src/main/resources/fess_indices/.fess_config/key_match.json
+++ b/src/main/resources/fess_indices/.fess_config/key_match.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "term": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/label_to_role.json b/src/main/resources/fess_indices/.fess_config/label_to_role.json
index d5584eeefffa8f839f59af131ae601af8800c4ce..df1db26eb2fb6779b56f4e455d59350137269e3b 100644
--- a/src/main/resources/fess_indices/.fess_config/label_to_role.json
+++ b/src/main/resources/fess_indices/.fess_config/label_to_role.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "labelTypeId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/label_type.json b/src/main/resources/fess_indices/.fess_config/label_type.json
index 24e2841ff78984e272df18bb997887668543b6fd..8ef81bc187572a88fb5a2fbc27f8e1ea236e781f 100644
--- a/src/main/resources/fess_indices/.fess_config/label_type.json
+++ b/src/main/resources/fess_indices/.fess_config/label_type.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/overlapping_host.json b/src/main/resources/fess_indices/.fess_config/overlapping_host.json
index 5947bea9eb11f6a5f745e7ff187bdbb0ef01cb25..a57ee27b6e76d711269adebc7a383b4233ba398b 100644
--- a/src/main/resources/fess_indices/.fess_config/overlapping_host.json
+++ b/src/main/resources/fess_indices/.fess_config/overlapping_host.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "regularName": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/path_mapping.json b/src/main/resources/fess_indices/.fess_config/path_mapping.json
index 8f104f50542e49bb29b8f8b6b9fec0ab0a7e1ad6..10c8aecbd9d7a62a8cb00c2ee7656b794039e452 100644
--- a/src/main/resources/fess_indices/.fess_config/path_mapping.json
+++ b/src/main/resources/fess_indices/.fess_config/path_mapping.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "regex": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/request_header.json b/src/main/resources/fess_indices/.fess_config/request_header.json
index a261074c763c8d7931389b9c4d879001ff47abe0..ecf3a4be3699858f588375075cc43e2ed5cee1cf 100644
--- a/src/main/resources/fess_indices/.fess_config/request_header.json
+++ b/src/main/resources/fess_indices/.fess_config/request_header.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/role_type.json b/src/main/resources/fess_indices/.fess_config/role_type.json
index 52f288c054303c87a29e713382c30d4a9346bc60..db22571df1ebb2e8acd65e7b7c55aa2cc82e0820 100644
--- a/src/main/resources/fess_indices/.fess_config/role_type.json
+++ b/src/main/resources/fess_indices/.fess_config/role_type.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/scheduled_job.json b/src/main/resources/fess_indices/.fess_config/scheduled_job.json
index 3a0f285f5cf85bd653cc4a2e743340ef9d3dfd11..51b2d2cb92eb26073740ca3a2174c6ea0eedd739 100644
--- a/src/main/resources/fess_indices/.fess_config/scheduled_job.json
+++ b/src/main/resources/fess_indices/.fess_config/scheduled_job.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json b/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json
index d571819b4d79d64a473e5ecb63dec93a2ac61f2e..b959e7ebcbedabdc6a6be44cb27050385dd43c3d 100644
--- a/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json
+++ b/src/main/resources/fess_indices/.fess_config/suggest_bad_word.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "suggestWord": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json b/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json
index 0e68e06cb6f834e65aa3f4d5eb0360c5d612caae..898b9b75fb277701f1e89b728b3c627b1378876b 100644
--- a/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json
+++ b/src/main/resources/fess_indices/.fess_config/suggest_elevate_word.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "suggestWord": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/web_authentication.json b/src/main/resources/fess_indices/.fess_config/web_authentication.json
index 4544fc20cb6b7419d1ecf0784f9116b2a63fdb79..5ffb32a23678a8a044e8c44b33040a84645d8213 100644
--- a/src/main/resources/fess_indices/.fess_config/web_authentication.json
+++ b/src/main/resources/fess_indices/.fess_config/web_authentication.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "hostname": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/web_config.json b/src/main/resources/fess_indices/.fess_config/web_config.json
index 69d78c65fecb81ca77a76122105501a8ca64b5ad..3577b24c2eb3bf7735170e962160eb98a50251f1 100644
--- a/src/main/resources/fess_indices/.fess_config/web_config.json
+++ b/src/main/resources/fess_indices/.fess_config/web_config.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_label.json b/src/main/resources/fess_indices/.fess_config/web_config_to_label.json
index 8f1cef278108a3ffb617eb1ae90490304169aae2..c29f27b6fb8eb456d7925458b43627b4a06cc22f 100644
--- a/src/main/resources/fess_indices/.fess_config/web_config_to_label.json
+++ b/src/main/resources/fess_indices/.fess_config/web_config_to_label.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "webConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_role.json b/src/main/resources/fess_indices/.fess_config/web_config_to_role.json
index 86ae5c968b17e56558d3d9a3e4a475860b44b43d..baed9a200206a0b3b21869ed1d163df048870ab5 100644
--- a/src/main/resources/fess_indices/.fess_config/web_config_to_role.json
+++ b/src/main/resources/fess_indices/.fess_config/web_config_to_role.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "webConfigId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_user/group.json b/src/main/resources/fess_indices/.fess_user/group.json
index 205abd2872cc251b284d86a4a29f6f5652f488d4..98658ff4a0783c73061f74e955e67e0f96823086 100644
--- a/src/main/resources/fess_indices/.fess_user/group.json
+++ b/src/main/resources/fess_indices/.fess_user/group.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_user/role.json b/src/main/resources/fess_indices/.fess_user/role.json
index fc5097dc48fde93faa19ebbd259c03022514a652..00b48461fb2eaccc198909e81a60070537990295 100644
--- a/src/main/resources/fess_indices/.fess_user/role.json
+++ b/src/main/resources/fess_indices/.fess_user/role.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/.fess_user/user.json b/src/main/resources/fess_indices/.fess_user/user.json
index c0869f61d71696d44e3d3066bf8ceb198fcd6a1b..53be8e94c50cf3e5268763028f75a58e0938fb1f 100644
--- a/src/main/resources/fess_indices/.fess_user/user.json
+++ b/src/main/resources/fess_indices/.fess_user/user.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "name": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess/doc.json b/src/main/resources/fess_indices/fess/doc.json
index a0e3ff6ce9ddbdf66ff1dbf776bdb34874b86dab..3253de5f6ca2a18084f65198cd5038ba428fa29f 100644
--- a/src/main/resources/fess_indices/fess/doc.json
+++ b/src/main/resources/fess_indices/fess/doc.json
@@ -6,9 +6,6 @@
     "_source": {
       "enabled": true
     },
-    "_id": {
-      "path": "id"
-    },
     "dynamic_templates": [
       {
         "lang_ar": {
@@ -479,10 +476,6 @@
         "type": "string",
         "index": "not_analyzed"
       },
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "lang": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/click_log.json b/src/main/resources/fess_indices/fess_log/click_log.json
index 348760e1ad0d5c2866108d66691002fb3d9ecd1d..fb313995fd9c6c38b3b1cb8fa9368d1b8554935f 100644
--- a/src/main/resources/fess_indices/fess_log/click_log.json
+++ b/src/main/resources/fess_indices/fess_log/click_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "searchLogId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/event_log.json b/src/main/resources/fess_indices/fess_log/event_log.json
index f2e827b2d4f7e4ed032c3054c8039518156b3c27..53ce3000d9c47e4b7a4a5197e99bd483341127b1 100644
--- a/src/main/resources/fess_indices/fess_log/event_log.json
+++ b/src/main/resources/fess_indices/fess_log/event_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "eventType": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/favorite_log.json b/src/main/resources/fess_indices/fess_log/favorite_log.json
index e2a0623e413d138c6519853b635b066b5d3cc766..56da2cda59bc0ebf767a647adfd891886682ec25 100644
--- a/src/main/resources/fess_indices/fess_log/favorite_log.json
+++ b/src/main/resources/fess_indices/fess_log/favorite_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "userInfoId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/search_field_log.json b/src/main/resources/fess_indices/fess_log/search_field_log.json
index d1c0466fba7dc2f3cf1625444f463608ce181120..8d7bbe0e77fe4678d62247b80547861a68e44a94 100644
--- a/src/main/resources/fess_indices/fess_log/search_field_log.json
+++ b/src/main/resources/fess_indices/fess_log/search_field_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "searchLogId": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/search_log.json b/src/main/resources/fess_indices/fess_log/search_log.json
index 9408bb8d0e7fd405cadf7f98ef4364889f30a99e..8172112c012d6bf6e4560dea8a6dd70b9e916ee4 100644
--- a/src/main/resources/fess_indices/fess_log/search_log.json
+++ b/src/main/resources/fess_indices/fess_log/search_log.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "searchWord": {
         "type": "string",
         "index": "not_analyzed"
diff --git a/src/main/resources/fess_indices/fess_log/user_info.json b/src/main/resources/fess_indices/fess_log/user_info.json
index 0ea8e698943513e6aa945f2b592c18ea2c86a8ad..c5636a932d707e7a3669f1c64e449f917fbd4388 100644
--- a/src/main/resources/fess_indices/fess_log/user_info.json
+++ b/src/main/resources/fess_indices/fess_log/user_info.json
@@ -6,14 +6,7 @@
     "_all": {
       "enabled": false
     },
-    "_id": {
-      "path": "id"
-    },
     "properties": {
-      "id": {
-        "type": "string",
-        "index": "not_analyzed"
-      },
       "code": {
         "type": "string",
         "index": "not_analyzed"