#591 elasticsearch 5 support

dbflute_fess/dfprop/esfluteMap.dfprop

@@ -31,5 +31,5 @@ map:{
             }
         }
     }
-    ; elasticsearchVersion = 2.3.3
+    ; elasticsearchVersion = 5.0.2
 }

plugin.xml

@@ -13,72 +13,58 @@
 		<mkdir dir="${plugins.dir}" />
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.133315-1" />
 		</antcall>
 		<!-- analysis-ja -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-ja" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.132732-1" />
 		</antcall>
 		<!-- analysis-synonym -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-synonym" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.131354-1" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.4.2" />
-			<param name="plugin.zip.version" value="2.4.2" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161222.140933-3" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="dataformat" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
-		</antcall>
-		<!-- groovy -->
-		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/elasticsearch/module" />
-			<param name="plugin.name.prefix" value="" />
-			<param name="plugin.name" value="lang-groovy" />
-			<param name="plugin.version" value="${elasticsearch.version}" />
-			<param name="plugin.zip.version" value="${elasticsearch.version}" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161222.135233-2" />
 		</antcall>
 		<!-- langfield -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="langfield" />
-			<param name="plugin.version" value="2.4.1" />
-			<param name="plugin.zip.version" value="2.4.1" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.132043-1" />
 		</antcall>
-		<!-- kopf -->
-		<get dest="${target.dir}">
-			<url url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-2.0.1.0.zip" />
-		</get>
-		<unzip dest="${plugins.dir}/kopf" src="${target.dir}/elasticsearch-kopf-2.0.1.0.zip" />
 
 		<antcall target="remove.jars" />
 	</target>
@@ -93,11 +79,16 @@
 	<target name="remove.jars" if="with.fess">
 		<delete>
 			<fileset dir="${plugins.dir}">
+				<include name="configsync/commons-codec-*" />
+				<include name="dataformat/commons-codec-*" />
 				<include name="dataformat/curvesapi-*" />
+				<include name="dataformat/netty-*" />
+				<include name="dataformat/orangesignal-csv-*" />
 				<include name="dataformat/poi-*" />
-				<include name="dataformat/xmlbeans-*" />
 				<include name="dataformat/stax-api-*" />
-				<include name="lang-groovy/groovy-*" />
+				<include name="dataformat/transport-*" />
+				<include name="dataformat/xmlbeans-*" />
+				<include name="langfield/jackson-*" />
 			</fileset>
 		</delete>
 	</target>

pom.xml

@@ -57,14 +57,14 @@
 		<utflute.version>0.6.3</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>1.0.12-SNAPSHOT</crawler.version>
+		<crawler.version>1.1.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>2.3.1</suggest.version>
+		<suggest.version>5.0.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>2.4.2</elasticsearch.version>
-		<cluster.runner.version>2.4.0.0</cluster.runner.version>
+		<elasticsearch.version>5.0.2</elasticsearch.version>
+		<cluster.runner.version>5.0.2.0-SNAPSHOT</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.5</tomcat.version>
@@ -1061,14 +1061,49 @@
 			<artifactId>elasticsearch</artifactId>
 			<version>${elasticsearch.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>transport</artifactId>
+			<version>${elasticsearch.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>lang-mustache-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>percolator-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>reindex-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>transport-netty3-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>transport-netty4-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.codelibs</groupId>
 			<artifactId>elasticsearch-cluster-runner</artifactId>
 			<version>${cluster.runner.version}</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-debug-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.groovy</groupId>
+					<artifactId>groovy</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>

src/main/config/es/fess_config.json

@@ -7,34 +7,28 @@
         },
         "properties": {
           "name": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "token": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "permissions": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "parameter_name" : {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "expiredTime" : {
             "type" : "long"
           },
           "createdBy": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "createdTime": {
             "type": "long"
           },
           "updatedBy": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime": {
             "type": "long"
@@ -47,12 +41,10 @@
         },
         "properties" : {
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           }
         }
       },
@@ -62,12 +54,10 @@
         },
         "properties" : {
           "dataConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           }
         }
       },
@@ -77,34 +67,28 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "processType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "regex" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "replacement" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -117,12 +101,10 @@
         },
         "properties" : {
           "boostExpr" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -131,15 +113,13 @@
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "urlExpr" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -149,12 +129,10 @@
         },
         "properties" : {
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -167,31 +145,25 @@
             "type" : "long"
           },
           "jobName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "jobStatus" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptData" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptResult" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "startTime" : {
             "type" : "long"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "lastUpdated" : {
             "type" : "long"
@@ -204,29 +176,25 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -242,12 +210,10 @@
             "type" : "float"
           },
           "configParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -256,20 +222,16 @@
             "type" : "integer"
           },
           "excludedDocUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "excludedUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedDocUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "intervalTime" : {
             "type" : "integer"
@@ -281,33 +243,28 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "numOfThread" : {
             "type" : "integer"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "urls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -317,49 +274,40 @@
         },
         "properties" : {
           "authRealm" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "hostname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "parameters" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "port" : {
             "type" : "integer"
           },
           "protocolScheme" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "username" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -369,12 +317,10 @@
         },
         "properties" : {
           "dataConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -384,26 +330,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "duplicateHostName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "regularName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -416,30 +358,25 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -449,27 +386,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "suggestWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetLabel" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetRole" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -488,38 +420,31 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "handlerName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "handlerParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "handlerScript" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -532,19 +457,16 @@
         },
         "properties" : {
           "crawlingInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "key" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -554,12 +476,10 @@
         },
         "properties" : {
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -569,45 +489,37 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "hostname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "parameters" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "port" : {
             "type" : "integer"
           },
           "protocolScheme" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "username" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -623,12 +535,10 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -641,8 +551,7 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -651,16 +560,13 @@
             "type" : "integer"
           },
           "query" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "term" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -673,12 +579,10 @@
         },
         "properties" : {
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -688,12 +592,10 @@
         },
         "properties" : {
           "elevateWordId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -706,35 +608,28 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "reading" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "suggestWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetLabel" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetRole" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -747,12 +642,10 @@
         },
         "properties" : {
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -768,12 +661,10 @@
             "type" : "float"
           },
           "configParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -782,20 +673,16 @@
             "type" : "integer"
           },
           "excludedDocPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "excludedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedDocPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "intervalTime" : {
             "type" : "integer"
@@ -807,26 +694,22 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "numOfThread" : {
             "type" : "integer"
           },
           "paths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -845,41 +728,34 @@
             "type" : "boolean"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "cronExpression" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "jobLogging" : {
             "type" : "boolean"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptData" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -892,30 +768,25 @@
         },
         "properties" : {
           "configId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "errorCount" : {
             "type" : "integer"
           },
           "errorLog" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "errorName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "lastAccessTime" : {
             "type" : "long"
           },
           "threadName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -925,41 +796,34 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "excludedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -969,27 +833,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "generator" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "path" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       }

src/main/config/es/fess_log.json

@@ -7,16 +7,13 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "searchLogId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -30,20 +27,16 @@
             "format" : "date_optional_time"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "docId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -61,20 +54,16 @@
             "format" : "date_optional_time"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "docId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userSessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "order" : {
             "type" : "integer"
@@ -87,24 +76,19 @@
         },
         "properties" : {
           "accessType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "user" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roles" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "clientIp" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "hitCount" : {
             "type" : "long"
@@ -116,8 +100,7 @@
             "type" : "integer"
           },
           "referer" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "requestedAt" : {
             "type" : "date",
@@ -130,24 +113,19 @@
             "type" : "long"
           },
           "searchWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userSessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "languages" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },

src/main/config/es/fess_user.json

@@ -7,8 +7,7 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -18,144 +17,109 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "surname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "givenName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "employeeNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "mail" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "telephoneNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "homePhone" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "homePostalAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labeledURI" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roomNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "description" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "title" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "pager" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "street" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postalCode" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "physicalDeliveryOfficeName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "destinationIndicator" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "internationaliSDNNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "state" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "employeeType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "facsimileTelephoneNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postOfficeBox" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "initials" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "carLicense" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "mobile" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postalAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "city" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "teletexTerminalIdentifier" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "x121Address" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "businessCategory" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "registeredAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "displayName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "preferredLanguage" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "departmentNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "uidNumber" : {
             "type" : "long"
@@ -164,16 +128,13 @@
             "type" : "long"
           },
           "homeDirectory" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "groups" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roles" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -183,8 +144,7 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "gidNumber" : {
             "type" : "long"

src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java

@@ -65,6 +65,18 @@ public abstract class BaseJsonApiManager extends BaseApiManager {
     }
 
     protected void writeJsonResponse(final int status, final String body, final String errMsg) {
+        String content = null;
+        if (status == 0) {
+            if (StringUtil.isNotBlank(body)) {
+                content = body;
+            }
+        } else {
+            content = "\"message\":" + escapeJson(errMsg);
+        }
+        writeJsonResponse(status, content);
+    }
+
+    protected void writeJsonResponse(final int status, final String body) {
         final String callback = LaRequestUtil.getRequest().getParameter("callback");
         final boolean isJsonp = StringUtil.isNotBlank(callback);
 
@@ -79,15 +91,9 @@ public abstract class BaseJsonApiManager extends BaseApiManager {
         buf.append(',');
         buf.append("\"status\":");
         buf.append(status);
-        if (status == 0) {
-            if (StringUtil.isNotBlank(body)) {
-                buf.append(',');
-                buf.append(body);
-            }
-        } else {
+        if (StringUtil.isNotBlank(body)) {
             buf.append(',');
-            buf.append("\"message\":");
-            buf.append(escapeJson(errMsg));
+            buf.append(body);
         }
         buf.append('}');
         buf.append('}');

src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.api.json;
 
-import static org.codelibs.core.stream.StreamUtil.stream;
-
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -24,7 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -116,11 +113,7 @@ public class JsonApiManager extends BaseJsonApiManager {
         try {
             final PingResponse pingResponse = fessEsClient.ping();
             status = pingResponse.getStatus();
-            String errMsg = null;
-            if (status != 0) {
-                errMsg = stream(pingResponse.getFailures()).get(stream -> stream.collect(Collectors.joining()));
-            }
-            writeJsonResponse(status, null, errMsg);
+            writeJsonResponse(status, "\"message\":" + pingResponse.getMessage());
         } catch (final Exception e) {
             status = 9;
             err = e;
@@ -429,7 +422,7 @@ public class JsonApiManager extends BaseJsonApiManager {
                             final Map<String, Object> upsertMap = new HashMap<>();
                             upsertMap.put(fessConfig.getIndexFieldFavoriteCount(), 1);
                             builder.setUpsert(upsertMap);
-                            builder.setRefresh(true);
+                            builder.setRefreshPolicy(Constants.TRUE);
                         });
 
                         writeJsonResponse(0, "\"result\":\"ok\"", (String) null);

src/main/java/org/codelibs/fess/app/service/AccessTokenService.java

@@ -57,13 +57,13 @@ public class AccessTokenService {
 
     public void store(final AccessToken accessToken) {
 
-        accessTokenBhv.insertOrUpdate(accessToken, op -> op.setRefresh(true));
+        accessTokenBhv.insertOrUpdate(accessToken, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final AccessToken accessToken) {
 
-        accessTokenBhv.delete(accessToken, op -> op.setRefresh(true));
+        accessTokenBhv.delete(accessToken, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 

src/main/java/org/codelibs/fess/app/service/BadWordService.java

@@ -74,13 +74,13 @@ public class BadWordService {
 
     public void store(final BadWord badWord) {
 
-        badWordBhv.insertOrUpdate(badWord, op -> op.setRefresh(true));
+        badWordBhv.insertOrUpdate(badWord, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final BadWord badWord) {
 
-        badWordBhv.delete(badWord, op -> op.setRefresh(true));
+        badWordBhv.delete(badWord, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 

src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java

@@ -57,13 +57,13 @@ public class BoostDocumentRuleService {
 
     public void store(final BoostDocumentRule boostDocumentRule) {
 
-        boostDocumentRuleBhv.insertOrUpdate(boostDocumentRule, op -> op.setRefresh(true));
+        boostDocumentRuleBhv.insertOrUpdate(boostDocumentRule, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final BoostDocumentRule boostDocumentRule) {
 
-        boostDocumentRuleBhv.delete(boostDocumentRule, op -> op.setRefresh(true));
+        boostDocumentRuleBhv.delete(boostDocumentRule, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 

src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

@@ -88,14 +88,14 @@ public class CrawlingInfoService {
     public void store(final CrawlingInfo crawlingInfo) {
         setupStoreCondition(crawlingInfo);
 
-        crawlingInfoBhv.insertOrUpdate(crawlingInfo, op -> op.setRefresh(true));
+        crawlingInfoBhv.insertOrUpdate(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final CrawlingInfo crawlingInfo) {
         setupDeleteCondition(crawlingInfo);
 
-        crawlingInfoBhv.delete(crawlingInfo, op -> op.setRefresh(true));
+        crawlingInfoBhv.delete(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
@@ -146,7 +146,7 @@ public class CrawlingInfoService {
                 crawlingInfoIdList.add(cs.getId());
             }
             crawlingInfoParamBhv.queryDelete(cb2 -> cb2.query().setCrawlingInfoId_InScope(crawlingInfoIdList));
-            crawlingInfoBhv.batchDelete(crawlingInfoList, op -> op.setRefresh(true));
+            crawlingInfoBhv.batchDelete(crawlingInfoList, op -> op.setRefreshPolicy(Constants.TRUE));
         }
     }
 
@@ -161,7 +161,7 @@ public class CrawlingInfoService {
                 crawlingInfoParam.setCreatedTime(now);
             }
         }
-        crawlingInfoParamBhv.batchInsert(crawlingInfoParamList, op -> op.setRefresh(true));
+        crawlingInfoParamBhv.batchInsert(crawlingInfoParamList, op -> op.setRefreshPolicy(Constants.TRUE));
     }
 
     public List<CrawlingInfoParam> getCrawlingInfoParamList(final String id) {
@@ -225,7 +225,7 @@ public class CrawlingInfoService {
                         crawlingInfo = new CrawlingInfo();
                         crawlingInfo.setSessionId(list.get(0));
                         crawlingInfo.setCreatedTime(formatter.parse(list.get(1)).getTime());
-                        crawlingInfoBhv.insert(crawlingInfo, op -> op.setRefresh(true));
+                        crawlingInfoBhv.insert(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
                     }
 
                     final CrawlingInfoParam entity = new CrawlingInfoParam();
@@ -233,7 +233,7 @@ public class CrawlingInfoService {
                     entity.setKey(list.get(2));
                     entity.setValue(list.get(3));
                     entity.setCreatedTime(formatter.parse(list.get(4)).getTime());
-                    crawlingInfoParamBhv.insert(entity, op -> op.setRefresh(true));
+                    crawlingInfoParamBhv.insert(entity, op -> op.setRefreshPolicy(Constants.TRUE));
                 } catch (final Exception e) {
                     logger.warn("Failed to read a click log: " + list, e);
                 }

src/main/java/org/codelibs/fess/app/service/DataConfigService.java

@@ -65,7 +65,7 @@ public class DataConfigService {
         final String dataConfigId = dataConfig.getId();
 
         dataConfigBhv.delete(dataConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         dataConfigToLabelBhv.queryDelete(cb -> {
@@ -124,7 +124,7 @@ public class DataConfigService {
         final String[] labelTypeIds = dataConfig.getLabelTypeIds();
 
         dataConfigBhv.insertOrUpdate(dataConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String dataConfigId = dataConfig.getId();
         if (isNew) {
@@ -138,7 +138,7 @@ public class DataConfigService {
                     fctltmList.add(mapping);
                 }
                 dataConfigToLabelBhv.batchInsert(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -169,10 +169,10 @@ public class DataConfigService {
                 }
                 fctltmList.removeAll(matchedList);
                 dataConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 dataConfigToLabelBhv.batchDelete(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }

src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java

@@ -60,7 +60,7 @@ public class DuplicateHostService {
     public void store(final DuplicateHost duplicateHost) {
 
         duplicateHostBhv.insertOrUpdate(duplicateHost, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class DuplicateHostService {
     public void delete(final DuplicateHost duplicateHost) {
 
         duplicateHostBhv.delete(duplicateHost, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/ElevateWordService.java

@@ -105,7 +105,7 @@ public class ElevateWordService {
         final String[] labelTypeIds = elevateWord.getLabelTypeIds();
 
         elevateWordBhv.insertOrUpdate(elevateWord, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String elevateWordId = elevateWord.getId();
         if (isNew) {
@@ -119,7 +119,7 @@ public class ElevateWordService {
                     wctltmList.add(mapping);
                 }
                 elevateWordToLabelBhv.batchInsert(wctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -150,10 +150,10 @@ public class ElevateWordService {
                 }
                 list.removeAll(matchedList);
                 elevateWordToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 elevateWordToLabelBhv.batchDelete(list, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
@@ -162,7 +162,7 @@ public class ElevateWordService {
     public void delete(final ElevateWord elevateWord) {
 
         elevateWordBhv.delete(elevateWord, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/FailureUrlService.java

@@ -72,7 +72,7 @@ public class FailureUrlService {
     public void store(final FailureUrl failureUrl) {
 
         failureUrlBhv.insertOrUpdate(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -80,7 +80,7 @@ public class FailureUrlService {
     public void delete(final FailureUrl failureUrl) {
 
         failureUrlBhv.delete(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -193,7 +193,7 @@ public class FailureUrlService {
         failureUrl.setThreadName(Thread.currentThread().getName());
 
         bhv.insertOrUpdate(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 

src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java

@@ -60,7 +60,7 @@ public class FileAuthenticationService {
     public void store(final FileAuthentication fileAuthentication) {
 
         fileAuthenticationBhv.insertOrUpdate(fileAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class FileAuthenticationService {
     public void delete(final FileAuthentication fileAuthentication) {
 
         fileAuthenticationBhv.delete(fileAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/FileConfigService.java

@@ -68,7 +68,7 @@ public class FileConfigService {
         final String fileConfigId = fileConfig.getId();
 
         fileConfigBhv.delete(fileConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         fileConfigToLabelBhv.queryDelete(cb -> {
@@ -129,7 +129,7 @@ public class FileConfigService {
         final String[] labelTypeIds = fileConfig.getLabelTypeIds();
 
         fileConfigBhv.insertOrUpdate(fileConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String fileConfigId = fileConfig.getId();
         if (isNew) {
@@ -143,7 +143,7 @@ public class FileConfigService {
                     fctltmList.add(mapping);
                 }
                 fileConfigToLabelBhv.batchInsert(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -174,10 +174,10 @@ public class FileConfigService {
                 }
                 fctltmList.removeAll(matchedList);
                 fileConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 fileConfigToLabelBhv.batchDelete(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }

src/main/java/org/codelibs/fess/app/service/GroupService.java

@@ -71,7 +71,7 @@ public class GroupService {
         ComponentUtil.getLdapManager().insert(group);
 
         groupBhv.insertOrUpdate(group, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -80,7 +80,7 @@ public class GroupService {
         ComponentUtil.getLdapManager().delete(group);
 
         groupBhv.delete(group, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         userBhv.selectCursor(

src/main/java/org/codelibs/fess/app/service/JobLogService.java

@@ -59,7 +59,7 @@ public class JobLogService {
     public void store(final JobLog jobLog) {
 
         jobLogBhv.insertOrUpdate(jobLog, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -67,7 +67,7 @@ public class JobLogService {
     public void delete(final JobLog jobLog) {
 
         jobLogBhv.delete(jobLog, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/KeyMatchService.java

@@ -60,7 +60,7 @@ public class KeyMatchService {
     public void store(final KeyMatch keyMatch) {
 
         keyMatchBhv.insertOrUpdate(keyMatch, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class KeyMatchService {
     public void delete(final KeyMatch keyMatch) {
 
         keyMatchBhv.delete(keyMatch, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/LabelTypeService.java

@@ -58,7 +58,7 @@ public class LabelTypeService {
     public void delete(final LabelType labelType) {
 
         labelTypeBhv.delete(labelType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         final LabelTypeHelper labelTypeHelper = ComponentUtil.getLabelTypeHelper();
@@ -90,7 +90,7 @@ public class LabelTypeService {
 
     public void store(final LabelType labelType) {
         labelTypeBhv.insertOrUpdate(labelType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         final LabelTypeHelper labelTypeHelper = ComponentUtil.getLabelTypeHelper();

src/main/java/org/codelibs/fess/app/service/PathMappingService.java

@@ -62,7 +62,7 @@ public class PathMappingService {
     public void store(final PathMapping pathMapping) {
 
         pathMappingBhv.insertOrUpdate(pathMapping, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         ComponentUtil.getPathMappingHelper().init();
@@ -71,7 +71,7 @@ public class PathMappingService {
     public void delete(final PathMapping pathMapping) {
 
         pathMappingBhv.delete(pathMapping, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         ComponentUtil.getPathMappingHelper().init();

src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java

@@ -60,7 +60,7 @@ public class RequestHeaderService {
     public void store(final RequestHeader requestHeader) {
 
         requestHeaderBhv.insertOrUpdate(requestHeader, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class RequestHeaderService {
     public void delete(final RequestHeader requestHeader) {
 
         requestHeaderBhv.delete(requestHeader, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/RoleService.java

@@ -68,7 +68,7 @@ public class RoleService {
         ComponentUtil.getLdapManager().insert(role);
 
         roleBhv.insertOrUpdate(role, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -77,7 +77,7 @@ public class RoleService {
         ComponentUtil.getLdapManager().delete(role);
 
         roleBhv.delete(role, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         userBhv.selectCursor(

src/main/java/org/codelibs/fess/app/service/RoleTypeService.java

@@ -60,7 +60,7 @@ public class RoleTypeService {
     public void store(final RoleType roleType) {
 
         roleTypeBhv.insertOrUpdate(roleType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class RoleTypeService {
     public void delete(final RoleType roleType) {
 
         roleTypeBhv.delete(roleType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java

@@ -73,7 +73,7 @@ public class ScheduledJobService {
 
     public void delete(final ScheduledJob scheduledJob) {
         scheduledJobBhv.delete(scheduledJob, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 
@@ -101,7 +101,7 @@ public class ScheduledJobService {
 
     public void store(final ScheduledJob scheduledJob) {
         scheduledJobBhv.insertOrUpdate(scheduledJob, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 

src/main/java/org/codelibs/fess/app/service/SearchService.java

@@ -47,6 +47,7 @@ import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
 import org.dbflute.util.DfTypeUtil;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
@@ -215,7 +216,7 @@ public class SearchService {
             final OptionalThing<FessUserBean> userBean) {
         return fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
             builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
-            builder.addFields(fields);
+            builder.setFetchSource(fields, null);
             fessConfig.processSearchPreference(builder, userBean);
             return true;
         });
@@ -226,7 +227,7 @@ public class SearchService {
         return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
             builder.setQuery(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
             builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger().intValue());
-            builder.addFields(fields);
+            builder.setFetchSource(fields, null);
             fessConfig.processSearchPreference(builder, userBean);
             return true;
         });
@@ -242,7 +243,7 @@ public class SearchService {
                     fessEsClient.prepareUpdate(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id);
             builderLambda.accept(builder);
             final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
-            return response.isCreated();
+            return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to update doc  " + id, e);
         }

src/main/java/org/codelibs/fess/app/service/UserService.java

@@ -75,7 +75,7 @@ public class UserService {
         ComponentUtil.getLdapManager().insert(user);
 
         userBhv.insertOrUpdate(user, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -88,7 +88,7 @@ public class UserService {
             userBhv.selectEntity(cb -> cb.query().setName_Equal(username)).ifPresent(entity -> {
                 final String encodedPassword = fessLoginAssist.encryptPassword(password);
                 entity.setPassword(encodedPassword);
-                userBhv.insertOrUpdate(entity, op -> op.setRefresh(true));
+                userBhv.insertOrUpdate(entity, op -> op.setRefreshPolicy(Constants.TRUE));
             }).orElse(() -> {
                 throw new FessUserNotFoundException(username);
             });
@@ -100,7 +100,7 @@ public class UserService {
         ComponentUtil.getLdapManager().delete(user);
 
         userBhv.delete(user, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java

@@ -60,7 +60,7 @@ public class WebAuthenticationService {
     public void store(final WebAuthentication webAuthentication) {
 
         webAuthenticationBhv.insertOrUpdate(webAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class WebAuthenticationService {
     public void delete(final WebAuthentication webAuthentication) {
 
         webAuthenticationBhv.delete(webAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }

src/main/java/org/codelibs/fess/app/service/WebConfigService.java

@@ -72,7 +72,7 @@ public class WebConfigService {
         final String webConfigId = webConfig.getId();
 
         webConfigBhv.delete(webConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         webConfigToLabelBhv.queryDelete(cb -> {
@@ -138,7 +138,7 @@ public class WebConfigService {
         final String[] labelTypeIds = webConfig.getLabelTypeIds();
 
         webConfigBhv.insertOrUpdate(webConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String webConfigId = webConfig.getId();
         if (isNew) {
@@ -152,7 +152,7 @@ public class WebConfigService {
                     wctltmList.add(mapping);
                 }
                 webConfigToLabelBhv.batchInsert(wctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -183,10 +183,10 @@ public class WebConfigService {
                 }
                 list.removeAll(matchedList);
                 webConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 webConfigToLabelBhv.batchDelete(list, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }

src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -1152,7 +1152,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.warn("Failed to delete " + index + " index.", e);
             }
         });

src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java

@@ -61,7 +61,7 @@ public class CacheAction extends FessSearchAction {
                             queryRequestBuilder -> {
                                 final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                                 queryRequestBuilder.setQuery(termQuery);
-                                queryRequestBuilder.addFields(queryHelper.getCacheResponseFields());
+                                queryRequestBuilder.setFetchSource(queryHelper.getCacheResponseFields(), null);
                                 fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                                 return true;
                             }).orElse(null);

src/main/java/org/codelibs/fess/app/web/go/GoAction.java

@@ -77,11 +77,14 @@ public class GoAction extends FessSearchAction {
         Map<String, Object> doc = null;
         try {
             doc =
-                    fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
+                    fessEsClient.getDocument(
+                            fessConfig.getIndexDocumentSearchIndex(),
+                            fessConfig.getIndexDocumentType(),
                             queryRequestBuilder -> {
                                 final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                                 queryRequestBuilder.setQuery(termQuery);
-                                queryRequestBuilder.addFields(fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId());
+                                queryRequestBuilder.setFetchSource(
+                                        new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId() }, null);
                                 fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                                 return true;
                             }).orElse(null);

src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java

@@ -58,7 +58,7 @@ public class ThumbnailAction extends FessSearchAction {
                         queryRequestBuilder -> {
                             final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                             queryRequestBuilder.setQuery(termQuery);
-                            queryRequestBuilder.addFields(queryHelper.getResponseFields());
+                            queryRequestBuilder.setFetchSource(queryHelper.getResponseFields(), null);
                             fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                             return true;
                         }).orElse(null);

src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java

@@ -38,11 +38,12 @@ import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
         final long readInterval = getReadInterval(paramMap);
 
         final Settings settings =
-                Settings.settingsBuilder()
+                Settings.builder()
                         .put(paramMap
                                 .entrySet()
                                 .stream()
@@ -103,7 +104,8 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
             }
             return null;
         }).filter(v -> v != null).toArray(n -> new InetSocketTransportAddress[n]));
-        try (Client client = TransportClient.builder().settings(settings).build().addTransportAddresses(addresses)) {
+        try (PreBuiltTransportClient client = new PreBuiltTransportClient(settings)) {
+            client.addTransportAddresses(addresses);
             processData(dataConfig, callback, paramMap, scriptMap, defaultDataMap, readInterval, client);
         }
     }
@@ -128,9 +130,10 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
             builder.setSize(Integer.parseInt(paramMap.get(SIZE)));
         }
         if (paramMap.containsKey(FIELDS)) {
-            builder.addFields(paramMap.get(FIELDS).trim().split(","));
+            builder.setFetchSource(paramMap.get(FIELDS).trim().split(","), null);
         }
-        builder.setQuery(paramMap.containsKey(QUERY) ? paramMap.get(QUERY).trim() : "{\"query\":{\"match_all\":{}}}");
+        builder.setQuery(QueryBuilders.wrapperQuery(paramMap.containsKey(QUERY) ? paramMap.get(QUERY).trim()
+                : "{\"query\":{\"match_all\":{}}}"));
         builder.setScroll(scroll);
         builder.setPreference(paramMap.containsKey(PREFERENCE) ? paramMap.get(PREFERENCE).trim() : Constants.SEARCH_PREFERENCE_PRIMARY);
         try {

src/main/java/org/codelibs/fess/entity/GeoInfo.java

@@ -64,8 +64,8 @@ public class GeoInfo {
                                                         try {
                                                             final double lat = Double.parseDouble(values[0]);
                                                             final double lon = Double.parseDouble(values[1]);
-                                                            list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance).lat(lat)
-                                                                    .lon(lon));
+                                                            list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance)
+                                                                    .point(lat, lon));
                                                         } catch (final Exception ex) {
                                                             throw new InvalidQueryException(messages -> messages
                                                                     .addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), ex

src/main/java/org/codelibs/fess/entity/PingResponse.java

@@ -15,35 +15,43 @@
  */
 package org.codelibs.fess.entity;
 
-import java.util.List;
+import java.io.IOException;
 
+import org.codelibs.core.lang.StringUtil;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
 
 public class PingResponse {
     private final int status;
 
-    private final List<String> failures;
-
     private final String clusterName;
 
     private final String clusterStatus;
 
+    private String message = StringUtil.EMPTY;
+
     public PingResponse(final ClusterHealthResponse response) {
         status = response.getStatus() == ClusterHealthStatus.RED ? 1 : 0;
-        failures = response.getValidationFailures();
         clusterName = response.getClusterName();
         clusterStatus = response.getStatus().toString();
+        try {
+            XContentBuilder builder = XContentFactory.jsonBuilder();
+            builder.startObject();
+            response.toXContent(builder, ToXContent.EMPTY_PARAMS);
+            builder.endObject();
+            message = builder.string();
+        } catch (IOException e) {
+            message = "{ \"error\" : \"" + e.getMessage() + "\"}";
+        }
     }
 
     public int getStatus() {
         return status;
     }
 
-    public String[] getFailures() {
-        return failures.stream().toArray(n -> new String[n]);
-    }
-
     public String getClusterName() {
         return clusterName;
     }
@@ -51,4 +59,9 @@ public class PingResponse {
     public String getClusterStatus() {
         return clusterStatus;
     }
+
+    public String getMessage() {
+        return message;
+    }
+
 }

src/main/java/org/codelibs/fess/entity/QueryContext.java

@@ -31,7 +31,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.lastaflute.web.util.LaRequestUtil;
 
@@ -64,10 +64,10 @@ public class QueryContext {
         }
     }
 
-    public void addFunctionScore(final Consumer<FunctionScoreQueryBuilder> functionScoreQuery) {
-        final FunctionScoreQueryBuilder builder = QueryBuilders.functionScoreQuery(queryBuilder);
-        functionScoreQuery.accept(builder);
-        queryBuilder = builder;
+    public void addFunctionScore(final Consumer<List<FilterFunctionBuilder>> functionScoreQuery) {
+        List<FilterFunctionBuilder> list = new ArrayList<>();
+        functionScoreQuery.accept(list);
+        queryBuilder = QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
     }
 
     public void addQuery(final Consumer<BoolQueryBuilder> boolQuery) {

src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -31,8 +31,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -71,6 +69,7 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
@@ -85,15 +84,9 @@ import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.count.CountRequest;
-import org.elasticsearch.action.count.CountRequestBuilder;
-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.exists.ExistsRequest;
-import org.elasticsearch.action.exists.ExistsRequestBuilder;
-import org.elasticsearch.action.exists.ExistsResponse;
 import org.elasticsearch.action.explain.ExplainRequest;
 import org.elasticsearch.action.explain.ExplainRequestBuilder;
 import org.elasticsearch.action.explain.ExplainResponse;
@@ -110,21 +103,6 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexRequest.OpType;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptRequest;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptRequestBuilder;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptResponse;
-import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptRequest;
-import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptRequestBuilder;
-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.percolate.MultiPercolateRequest;
-import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder;
-import org.elasticsearch.action.percolate.MultiPercolateResponse;
-import org.elasticsearch.action.percolate.PercolateRequest;
-import org.elasticsearch.action.percolate.PercolateRequestBuilder;
-import org.elasticsearch.action.percolate.PercolateResponse;
 import org.elasticsearch.action.search.ClearScrollRequest;
 import org.elasticsearch.action.search.ClearScrollRequestBuilder;
 import org.elasticsearch.action.search.ClearScrollResponse;
@@ -137,9 +115,7 @@ 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.suggest.SuggestRequest;
-import org.elasticsearch.action.suggest.SuggestRequestBuilder;
-import org.elasticsearch.action.suggest.SuggestResponse;
+import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
 import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
 import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
 import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
@@ -151,7 +127,6 @@ 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;
@@ -169,8 +144,10 @@ 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.Terms.Order;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.lastaflute.core.message.UserMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -279,10 +256,10 @@ public class FessEsClient implements Client {
             client = runner.client();
             addTransportAddress("localhost", runner.node().settings().getAsInt("transport.tcp.port", 9300));
         } else {
-            final Builder settingsBuilder = Settings.settingsBuilder();
+            final Builder settingsBuilder = Settings.builder();
             settingsBuilder.put("cluster.name", fessConfig.getElasticsearchClusterName());
             final Settings settings = settingsBuilder.build();
-            final TransportClient transportClient = TransportClient.builder().settings(settings).build();
+            final TransportClient transportClient = new PreBuiltTransportClient(settings);
             for (final TransportAddress address : transportAddressList) {
                 transportClient.addTransportAddress(address);
             }
@@ -567,8 +544,9 @@ public class FessEsClient implements Client {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         SearchResponse response =
                 client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
-                        .addField(fessConfig.getIndexFieldId()).setQuery(queryBuilder).setPreference(Constants.SEARCH_PREFERENCE_PRIMARY)
-                        .execute().actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
+                        .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
+                        .setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).execute()
+                        .actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
 
         int count = 0;
         String scrollId = response.getScrollId();
@@ -604,21 +582,6 @@ public class FessEsClient implements Client {
         GetResponse response = null;
         final GetRequestBuilder requestBuilder = client.prepareGet(index, type, id);
         if (condition.build(requestBuilder)) {
-
-            if (ComponentUtil.hasQueryHelper()) {
-                final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
-                for (final Map.Entry<String, String[]> entry : queryHelper.getQueryRequestHeaderMap().entrySet()) {
-                    requestBuilder.putHeader(entry.getKey(), entry.getValue());
-                }
-
-                final Set<Entry<String, String[]>> paramSet = queryHelper.getRequestParameterSet();
-                if (!paramSet.isEmpty()) {
-                    for (final Map.Entry<String, String[]> entry : paramSet) {
-                        requestBuilder.putHeader(entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-
             response = requestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexSearchTimeout());
         }
         final long execTime = System.currentTimeMillis() - startTime;
@@ -639,17 +602,6 @@ public class FessEsClient implements Client {
                 if (queryHelper.getTimeAllowed() >= 0) {
                     searchRequestBuilder.setTimeout(TimeValue.timeValueMillis(queryHelper.getTimeAllowed()));
                 }
-
-                for (final Map.Entry<String, String[]> entry : queryHelper.getQueryRequestHeaderMap().entrySet()) {
-                    searchRequestBuilder.putHeader(entry.getKey(), entry.getValue());
-                }
-
-                final Set<Entry<String, String[]>> paramSet = queryHelper.getRequestParameterSet();
-                if (!paramSet.isEmpty()) {
-                    for (final Map.Entry<String, String[]> entry : paramSet) {
-                        searchRequestBuilder.putHeader(entry.getKey(), entry.getValue());
-                    }
-                }
             }
 
             try {
@@ -744,7 +696,8 @@ public class FessEsClient implements Client {
 
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         final SearchResponse response =
-                client.prepareSearch(index).setTypes(type).setSize(1).setQuery(queryBuilder).addField(fessConfig.getIndexFieldId())
+                client.prepareSearch(index).setTypes(type).setSize(1).setQuery(queryBuilder)
+                        .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null)
                         .setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).execute().actionGet(fessConfig.getIndexSearchTimeout());
         final SearchHits hits = response.getHits();
         if (hits.getTotalHits() != 0) {
@@ -802,8 +755,10 @@ public class FessEsClient implements Client {
 
     public boolean update(final String index, final String type, final String id, final String field, final Object value) {
         try {
-            return client.prepareUpdate(index, type, id).setDoc(field, value).execute()
-                    .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).isCreated();
+            final Result result =
+                    client.prepareUpdate(index, type, id).setDoc(field, value).execute()
+                            .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
+            return result == Result.CREATED || result == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
         }
@@ -819,7 +774,7 @@ public class FessEsClient implements Client {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.error("Failed to refresh " + stream(indices).get(stream -> stream.collect(Collectors.joining(", "))) + ".", e);
             }
         });
@@ -837,7 +792,7 @@ public class FessEsClient implements Client {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.error("Failed to flush " + stream(indices).get(stream -> stream.collect(Collectors.joining(", "))) + ".", e);
             }
         });
@@ -864,8 +819,7 @@ public class FessEsClient implements Client {
         final BulkResponse response = bulkRequestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexBulkTimeout());
         if (response.hasFailures()) {
             if (logger.isDebugEnabled()) {
-                @SuppressWarnings("rawtypes")
-                final List<ActionRequest> requests = bulkRequestBuilder.request().requests();
+                final List<ActionRequest<?>> requests = bulkRequestBuilder.request().requests();
                 final BulkItemResponse[] items = response.getItems();
                 if (requests.size() == items.length) {
                     for (int i = 0; i < requests.size(); i++) {
@@ -963,48 +917,52 @@ public class FessEsClient implements Client {
             searchRequestBuilder.setFrom(offset).setSize(size);
 
             if (responseFields != null) {
-                searchRequestBuilder.addFields(responseFields);
+                searchRequestBuilder.setFetchSource(responseFields, null);
             }
 
             // sort
             queryContext.sortBuilders().forEach(sortBuilder -> searchRequestBuilder.addSort(sortBuilder));
 
             // highlighting
-            queryHelper.highlightedFields(stream -> stream.forEach(hf -> searchRequestBuilder.addHighlightedField(hf,
+            HighlightBuilder highlightBuilder = new HighlightBuilder();
+            queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder.field(hf,
                     fessConfig.getQueryHighlightFragmentSizeAsInteger())));
+            searchRequestBuilder.highlighter(highlightBuilder);
 
             // facets
             if (facetInfo != null) {
-                stream(facetInfo.field).of(stream -> stream.forEach(f -> {
-                    if (queryHelper.isFacetField(f)) {
-                        final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
-                        final TermsBuilder termsBuilder = AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
-                        if ("term".equals(facetInfo.sort)) {
-                            termsBuilder.order(Order.term(true));
-                        } else if ("count".equals(facetInfo.sort)) {
-                            termsBuilder.order(Order.count(true));
-                        }
-                        if (facetInfo.size != null) {
-                            termsBuilder.size(facetInfo.size);
-                        }
-                        if (facetInfo.minDocCount != null) {
-                            termsBuilder.minDocCount(facetInfo.minDocCount);
-                        }
-                        if (facetInfo.missing != null) {
-                            termsBuilder.missing(facetInfo.missing);
-                        }
-                        searchRequestBuilder.addAggregation(termsBuilder);
-                    } else {
-                        throw new SearchQueryException("Invalid facet field: " + f);
-                    }
-                }));
+                stream(facetInfo.field).of(
+                        stream -> stream.forEach(f -> {
+                            if (queryHelper.isFacetField(f)) {
+                                final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
+                                final TermsAggregationBuilder termsBuilder =
+                                        AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
+                                if ("term".equals(facetInfo.sort)) {
+                                    termsBuilder.order(Order.term(true));
+                                } else if ("count".equals(facetInfo.sort)) {
+                                    termsBuilder.order(Order.count(true));
+                                }
+                                if (facetInfo.size != null) {
+                                    termsBuilder.size(facetInfo.size);
+                                }
+                                if (facetInfo.minDocCount != null) {
+                                    termsBuilder.minDocCount(facetInfo.minDocCount);
+                                }
+                                if (facetInfo.missing != null) {
+                                    termsBuilder.missing(facetInfo.missing);
+                                }
+                                searchRequestBuilder.addAggregation(termsBuilder);
+                            } else {
+                                throw new SearchQueryException("Invalid facet field: " + f);
+                            }
+                        }));
                 stream(facetInfo.query).of(
                         stream -> stream.forEach(fq -> {
                             final QueryContext facetContext = new QueryContext(fq, false);
                             queryHelper.buildBaseQuery(facetContext, c -> {});
                             final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
                             final FilterAggregationBuilder filterBuilder =
-                                    AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery).filter(
+                                    AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery,
                                             facetContext.getQueryBuilder());
                             searchRequestBuilder.addAggregation(filterBuilder);
                         }));
@@ -1029,18 +987,20 @@ public class FessEsClient implements Client {
             if (id == null) {
                 // create
                 response =
-                        client.prepareIndex(index, type).setSource(new DocMap(source)).setRefresh(true).setOpType(OpType.CREATE).execute()
-                                .actionGet(fessConfig.getIndexIndexTimeout());
+                        client.prepareIndex(index, type).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+                                .setOpType(OpType.CREATE).execute().actionGet(fessConfig.getIndexIndexTimeout());
             } else {
                 // create or update
                 final IndexRequestBuilder builder =
-                        client.prepareIndex(index, type, id).setSource(new DocMap(source)).setRefresh(true).setOpType(OpType.INDEX);
+                        client.prepareIndex(index, type, id).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+                                .setOpType(OpType.INDEX);
                 if (version != null && version.longValue() > 0) {
                     builder.setVersion(version);
                 }
                 response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
             }
-            return response.isCreated();
+            final Result result = response.getResult();
+            return result == Result.CREATED || result == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to store: " + obj, e);
         }
@@ -1048,12 +1008,12 @@ public class FessEsClient implements Client {
 
     public boolean delete(final String index, final String type, final String id, final long version) {
         try {
-            final DeleteRequestBuilder builder = client.prepareDelete(index, type, id).setRefresh(true);
+            final DeleteRequestBuilder builder = client.prepareDelete(index, type, id).setRefreshPolicy(RefreshPolicy.IMMEDIATE);
             if (version > 0) {
                 builder.setVersion(version);
             }
             final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
-            return response.isFound();
+            return response.getResult() == Result.DELETED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to delete: " + index + "/" + type + "/" + id + "/" + version, e);
         }
@@ -1189,66 +1149,6 @@ public class FessEsClient implements Client {
         return client.prepareGet(index, type, id);
     }
 
-    @Override
-    public PutIndexedScriptRequestBuilder preparePutIndexedScript() {
-        return client.preparePutIndexedScript();
-    }
-
-    @Override
-    public PutIndexedScriptRequestBuilder preparePutIndexedScript(final String scriptLang, final String id, final String source) {
-        return client.preparePutIndexedScript(scriptLang, id, source);
-    }
-
-    @Override
-    public void deleteIndexedScript(final DeleteIndexedScriptRequest request, final ActionListener<DeleteIndexedScriptResponse> listener) {
-        client.deleteIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<DeleteIndexedScriptResponse> deleteIndexedScript(final DeleteIndexedScriptRequest request) {
-        return client.deleteIndexedScript(request);
-    }
-
-    @Override
-    public DeleteIndexedScriptRequestBuilder prepareDeleteIndexedScript() {
-        return client.prepareDeleteIndexedScript();
-    }
-
-    @Override
-    public DeleteIndexedScriptRequestBuilder prepareDeleteIndexedScript(final String scriptLang, final String id) {
-        return client.prepareDeleteIndexedScript(scriptLang, id);
-    }
-
-    @Override
-    public void putIndexedScript(final PutIndexedScriptRequest request, final ActionListener<PutIndexedScriptResponse> listener) {
-        client.putIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<PutIndexedScriptResponse> putIndexedScript(final PutIndexedScriptRequest request) {
-        return client.putIndexedScript(request);
-    }
-
-    @Override
-    public GetIndexedScriptRequestBuilder prepareGetIndexedScript() {
-        return client.prepareGetIndexedScript();
-    }
-
-    @Override
-    public GetIndexedScriptRequestBuilder prepareGetIndexedScript(final String scriptLang, final String id) {
-        return client.prepareGetIndexedScript(scriptLang, id);
-    }
-
-    @Override
-    public void getIndexedScript(final GetIndexedScriptRequest request, final ActionListener<GetIndexedScriptResponse> listener) {
-        client.getIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<GetIndexedScriptResponse> getIndexedScript(final GetIndexedScriptRequest request) {
-        return client.getIndexedScript(request);
-    }
-
     @Override
     public ActionFuture<MultiGetResponse> multiGet(final MultiGetRequest request) {
         return client.multiGet(request);
@@ -1264,57 +1164,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiGet();
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public ActionFuture<CountResponse> count(final CountRequest request) {
-        return client.count(request);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void count(final CountRequest request, final ActionListener<CountResponse> listener) {
-        client.count(request, listener);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public CountRequestBuilder prepareCount(final String... indices) {
-        return client.prepareCount(indices);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ActionFuture<ExistsResponse> exists(final ExistsRequest request) {
-        return client.exists(request);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void exists(final ExistsRequest request, final ActionListener<ExistsResponse> listener) {
-        client.exists(request, listener);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ExistsRequestBuilder prepareExists(final String... indices) {
-        return client.prepareExists(indices);
-    }
-
-    @Override
-    public ActionFuture<SuggestResponse> suggest(final SuggestRequest request) {
-        return client.suggest(request);
-    }
-
-    @Override
-    public void suggest(final SuggestRequest request, final ActionListener<SuggestResponse> listener) {
-        client.suggest(request, listener);
-    }
-
-    @Override
-    public SuggestRequestBuilder prepareSuggest(final String... indices) {
-        return client.prepareSuggest(indices);
-    }
-
     @Override
     public ActionFuture<SearchResponse> search(final SearchRequest request) {
         return client.search(request);
@@ -1360,36 +1209,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiSearch();
     }
 
-    @Override
-    public ActionFuture<PercolateResponse> percolate(final PercolateRequest request) {
-        return client.percolate(request);
-    }
-
-    @Override
-    public void percolate(final PercolateRequest request, final ActionListener<PercolateResponse> listener) {
-        client.percolate(request, listener);
-    }
-
-    @Override
-    public PercolateRequestBuilder preparePercolate() {
-        return client.preparePercolate();
-    }
-
-    @Override
-    public ActionFuture<MultiPercolateResponse> multiPercolate(final MultiPercolateRequest request) {
-        return client.multiPercolate(request);
-    }
-
-    @Override
-    public void multiPercolate(final MultiPercolateRequest request, final ActionListener<MultiPercolateResponse> listener) {
-        client.multiPercolate(request, listener);
-    }
-
-    @Override
-    public MultiPercolateRequestBuilder prepareMultiPercolate() {
-        return client.prepareMultiPercolate();
-    }
-
     @Override
     public ExplainRequestBuilder prepareExplain(final String index, final String type, final String id) {
         return client.prepareExplain(index, type, id);
@@ -1440,27 +1259,6 @@ public class FessEsClient implements Client {
         return client.settings();
     }
 
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request) {
-        return client.execute(action, request);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request, final ActionListener<Response> listener) {
-        client.execute(action, request, listener);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
-            final Action<Request, Response, RequestBuilder> action) {
-        return client.prepareExecute(action);
-    }
-
     @Override
     public ActionFuture<TermVectorsResponse> termVectors(final TermVectorsRequest request) {
         return client.termVectors(request);
@@ -1520,11 +1318,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiTermVectors();
     }
 
-    @Override
-    public Headers headers() {
-        return client.headers();
-    }
-
     public void setSizeForDelete(final int sizeForDelete) {
         this.sizeForDelete = sizeForDelete;
     }
@@ -1533,4 +1326,27 @@ public class FessEsClient implements Client {
         this.scrollForDelete = scrollForDelete;
     }
 
+    @Override
+    public Client filterWithHeader(Map<String, String> headers) {
+        return client.filterWithHeader(headers);
+    }
+
+    @Override
+    public <Request extends ActionRequest<Request>, 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<Request>, 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<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
+            Action<Request, Response, RequestBuilder> action) {
+        return client.prepareExecute(action);
+    }
+
 }

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

@@ -39,6 +39,7 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -266,7 +267,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
 
         final IndexResponse response = builder.execute().actionGet(indexTimeout);
         esEntity.asDocMeta().id(response.getId());
-        return response.isCreated() ? 1 : 0;
+        return response.getResult() == Result.CREATED ? 1 : 0;
     }
 
     protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
@@ -315,7 +316,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final DeleteRequestBuilder builder = createDeleteRequest(esEntity);
 
         final DeleteResponse response = builder.execute().actionGet(deleteTimeout);
-        return response.isFound() ? 1 : 0;
+        return response.getResult() == Result.DELETED ? 1 : 0;
     }
 
     protected DeleteRequestBuilder createDeleteRequest(final EsAbstractEntity esEntity) {

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java

@@ -25,28 +25,28 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,148 +58,148 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationBuilderList;
+    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
 
     public boolean hasAggregations() {
-        return aggregationBuilderList != null && !aggregationBuilderList.isEmpty();
+        return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
     public List<AbstractAggregationBuilder> getAggregationBuilderList() {
-        return aggregationBuilderList != null ? aggregationBuilderList : Collections.emptyList();
+        return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
     // ===================================================================================
     //                                                                         Aggregation
     //                                                                               =====
-    public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-        assertObjectNotNull("aggregationBuilder", aggregationBuilder);
-        regA(aggregationBuilder);
+    public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) {
+        assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder);
+        regA(aggregationAggregationBuilder);
     }
 
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
 
-    protected AvgBuilder regAvgA(String name, String field) {
-        AvgBuilder builder = AggregationBuilders.avg(name).field(field);
+    protected AvgAggregationBuilder regAvgA(String name, String field) {
+        AvgAggregationBuilder builder = AggregationBuilders.avg(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MaxBuilder regMaxA(String name, String field) {
-        MaxBuilder builder = AggregationBuilders.max(name).field(field);
+    protected MaxAggregationBuilder regMaxA(String name, String field) {
+        MaxAggregationBuilder builder = AggregationBuilders.max(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MinBuilder regMinA(String name, String field) {
-        MinBuilder builder = AggregationBuilders.min(name).field(field);
+    protected MinAggregationBuilder regMinA(String name, String field) {
+        MinAggregationBuilder builder = AggregationBuilders.min(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SumBuilder regSumA(String name, String field) {
-        SumBuilder builder = AggregationBuilders.sum(name).field(field);
+    protected SumAggregationBuilder regSumA(String name, String field) {
+        SumAggregationBuilder builder = AggregationBuilders.sum(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ExtendedStatsBuilder regExtendedStatsA(String name, String field) {
-        ExtendedStatsBuilder builder = AggregationBuilders.extendedStats(name).field(field);
+    protected ExtendedStatsAggregationBuilder regExtendedStatsA(String name, String field) {
+        ExtendedStatsAggregationBuilder builder = AggregationBuilders.extendedStats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected StatsBuilder regStatsA(String name, String field) {
-        StatsBuilder builder = AggregationBuilders.stats(name).field(field);
+    protected StatsAggregationBuilder regStatsA(String name, String field) {
+        StatsAggregationBuilder builder = AggregationBuilders.stats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentilesBuilder regPercentilesA(String name, String field) {
-        PercentilesBuilder builder = AggregationBuilders.percentiles(name).field(field);
+    protected PercentilesAggregationBuilder regPercentilesA(String name, String field) {
+        PercentilesAggregationBuilder builder = AggregationBuilders.percentiles(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentileRanksBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected CardinalityBuilder regCardinalityA(String name, String field) {
-        CardinalityBuilder builder = AggregationBuilders.cardinality(name).field(field);
+    protected CardinalityAggregationBuilder regCardinalityA(String name, String field) {
+        CardinalityAggregationBuilder builder = AggregationBuilders.cardinality(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ValueCountBuilder regCountA(String name, String field) {
-        ValueCountBuilder builder = AggregationBuilders.count(name).field(field);
+    protected ValueCountAggregationBuilder regCountA(String name, String field) {
+        ValueCountAggregationBuilder builder = AggregationBuilders.count(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected TermsBuilder regTermsA(String name, String field) {
-        TermsBuilder builder = AggregationBuilders.terms(name).field(field);
+    protected TermsAggregationBuilder regTermsA(String name, String field) {
+        TermsAggregationBuilder builder = AggregationBuilders.terms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SignificantTermsBuilder regSignificantTermsA(String name, String field) {
-        SignificantTermsBuilder builder = AggregationBuilders.significantTerms(name).field(field);
+    protected SignificantTermsAggregationBuilder regSignificantTermsA(String name, String field) {
+        SignificantTermsAggregationBuilder builder = AggregationBuilders.significantTerms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected HistogramBuilder regHistogramA(String name, String field) {
-        HistogramBuilder builder = AggregationBuilders.histogram(name).field(field);
+    protected HistogramAggregationBuilder regHistogramA(String name, String field) {
+        HistogramAggregationBuilder builder = AggregationBuilders.histogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateHistogramBuilder regDateHistogramA(String name, String field) {
-        DateHistogramBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
+    protected DateHistogramAggregationBuilder regDateHistogramA(String name, String field) {
+        DateHistogramAggregationBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected RangeBuilder regRangeA(String name, String field) {
-        RangeBuilder builder = AggregationBuilders.range(name).field(field);
+    protected RangeAggregationBuilder regRangeA(String name, String field) {
+        RangeAggregationBuilder builder = AggregationBuilders.range(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateRangeBuilder regDateRangeA(String name, String field) {
-        DateRangeBuilder builder = AggregationBuilders.dateRange(name).field(field);
+    protected DateRangeAggregationBuilder regDateRangeA(String name, String field) {
+        DateRangeAggregationBuilder builder = AggregationBuilders.dateRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected IPv4RangeBuilder regIpRangeA(String name, String field) {
-        IPv4RangeBuilder builder = AggregationBuilders.ipRange(name).field(field);
+    protected IpRangeAggregationBuilder regIpRangeA(String name, String field) {
+        IpRangeAggregationBuilder builder = AggregationBuilders.ipRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MissingBuilder regMissingA(String name, String field) {
-        MissingBuilder builder = AggregationBuilders.missing(name).field(field);
+    protected MissingAggregationBuilder regMissingA(String name, String field) {
+        MissingAggregationBuilder builder = AggregationBuilders.missing(name).field(field);
         regA(builder);
         return builder;
     }
 
     protected FilterAggregationBuilder regFilterA(String name, QueryBuilder filter) {
-        FilterAggregationBuilder builder = AggregationBuilders.filter(name).filter(filter);
+        FilterAggregationBuilder builder = AggregationBuilders.filter(name, filter);
         regA(builder);
         return builder;
     }
 
-    protected GlobalBuilder regGlobalA(String name) {
-        GlobalBuilder builder = AggregationBuilders.global(name);
+    protected GlobalAggregationBuilder regGlobalA(String name) {
+        GlobalAggregationBuilder builder = AggregationBuilders.global(name);
         regA(builder);
         return builder;
     }
@@ -210,24 +210,24 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected ScriptedMetricBuilder regScriptedMetricA(String name) {
-        ScriptedMetricBuilder builder = AggregationBuilders.scriptedMetric(name);
+    protected ScriptedMetricAggregationBuilder regScriptedMetricA(String name) {
+        ScriptedMetricAggregationBuilder builder = AggregationBuilders.scriptedMetric(name);
         regA(builder);
         return builder;
     }
 
-    protected TopHitsBuilder regTopHitsA(String name) {
-        TopHitsBuilder builder = AggregationBuilders.topHits(name);
+    protected TopHitsAggregationBuilder regTopHitsA(String name) {
+        TopHitsAggregationBuilder builder = AggregationBuilders.topHits(name);
         regA(builder);
         return builder;
     }
 
     protected void regA(AbstractAggregationBuilder builder) {
         assertObjectNotNull("builder", builder);
-        if (aggregationBuilderList == null) {
-            aggregationBuilderList = new ArrayList<>();
+        if (aggregationAggregationBuilderList == null) {
+            aggregationAggregationBuilderList = new ArrayList<>();
         }
-        aggregationBuilderList.add(builder);
+        aggregationAggregationBuilderList.add(builder);
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java

@@ -15,10 +15,16 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
@@ -32,12 +38,14 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -46,10 +54,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
@@ -152,8 +162,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     //                                                                            Register
     //                                                                            ========
 
-    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder) {
-        FunctionScoreQueryBuilder functionScoreQuery = QueryBuilders.functionScoreQuery(queryBuilder);
+    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder, Collection<FilterFunctionBuilder> list) {
+        FunctionScoreQueryBuilder functionScoreQuery =
+                QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
         regQ(functionScoreQuery);
         return functionScoreQuery;
     }
@@ -197,7 +208,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     protected IdsQueryBuilder regIdsQ(Collection<String> values) {
         checkEsInvalidQueryCollection("_id", values);
-        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values.toArray(new String[values.size()]));
         regQ(idsQuery);
         return idsQuery;
     }
@@ -209,23 +220,23 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhraseQ(String name, Object value) {
+    protected MatchPhraseQueryBuilder regMatchPhraseQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
+        MatchPhraseQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
+    protected MatchPhrasePrefixQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
+        MatchPhrasePrefixQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected FuzzyQueryBuilder regFuzzyQ(String name, Object value) {
+    protected MatchQueryBuilder regFuzzyQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        FuzzyQueryBuilder fuzzyQuery = QueryBuilders.fuzzyQuery(name, value);
+        MatchQueryBuilder fuzzyQuery = QueryBuilders.matchQuery(name, value).fuzziness(Fuzziness.AUTO);
         regQ(fuzzyQuery);
         return fuzzyQuery;
     }
@@ -297,12 +308,19 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return commonTermsQuery;
     }
 
-    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name) {
-        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(name);
+    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name, String[] likeTexts) {
+        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(new String[] { name }, likeTexts, null);
         regQ(moreLikeThisQuery);
         return moreLikeThisQuery;
     }
 
+    protected SpanTermQueryBuilder regSpanTermQ(String name, String value) {
+        checkEsInvalidQuery(name, value);
+        SpanTermQueryBuilder spanTermQuery = QueryBuilders.spanTermQuery(name, value);
+        regQ(spanTermQuery);
+        return spanTermQuery;
+    }
+
     protected void regQ(QueryBuilder builder) {
         assertObjectNotNull("builder", builder);
         if (queryBuilderList == null) {
@@ -488,6 +506,28 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         }
     }
 
+    protected String toRangeDateString(Date date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.getTime());
+        } else if (format.contains("date_optional_time")) {
+            final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            return sdf.format(date);
+        } else {
+            return Long.toString(date.getTime());
+        }
+    }
+
+    protected String toRangeLocalDateTimeString(LocalDateTime date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        } else if (format.contains("date_optional_time")) {
+            return DateTimeFormatter.ISO_DATE_TIME.format(date);
+        } else {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        }
+    }
+
     // ===================================================================================
     //                                                                        Assist Class
     //                                                                        ============

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java

@@ -131,22 +131,22 @@ public class AccessTokenDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameterName = cci("parameter_name", "parameter_name", null, null, String.class, "parameterName",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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 _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java

@@ -130,17 +130,17 @@ public class BadWordDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java

@@ -130,19 +130,19 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
     protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnBoostExpr() {
         return _columnBoostExpr;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java

@@ -126,10 +126,10 @@ public class CrawlingInfoDbm 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 _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedTime() {
         return _columnCreatedTime;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java

@@ -124,13 +124,13 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCrawlingInfoId = cci("crawlingInfoId", "crawlingInfoId", null, null, String.class, "crawlingInfoId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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 _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0,
+    protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "keyword", 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",
-            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,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCrawlingInfoId() {
         return _columnCrawlingInfoId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java

@@ -142,23 +142,23 @@ public class DataConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnHandlerName = cci("handlerName", "handlerName", null, null, String.class, "handlerName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class,
-            "handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "handlerParameter", null, false, false, false, "keyword", 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 _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+            null, false, false, false, "keyword", 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, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java

@@ -120,9 +120,9 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnDataConfigId() {
         return _columnDataConfigId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java

@@ -120,9 +120,9 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnDataConfigId() {
         return _columnDataConfigId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java

@@ -130,17 +130,17 @@ public class DuplicateHostDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class,
-            "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "duplicateHostName", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java

@@ -137,21 +137,21 @@ public class ElevateWordDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java

@@ -120,9 +120,9 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnElevateWordId() {
         return _columnElevateWordId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java

@@ -129,18 +129,18 @@ public class FailureUrlDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
+            false, "keyword", 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,
-            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,
+            false, false, "keyword", 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, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnConfigId() {

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java

@@ -138,27 +138,27 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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);
+            false, "keyword", 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);
+            false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
     protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java

@@ -156,39 +156,39 @@ public class FileConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
-            "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class,
-            "excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "excludedDocPaths", null, false, false, false, "keyword", 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);
+            null, false, false, false, "keyword", 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);
+            "includedDocPaths", null, false, false, false, "keyword", 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);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
             null, false, false, false, "Long", 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,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java

@@ -120,9 +120,9 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnFileConfigId() {
         return _columnFileConfigId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java

@@ -120,9 +120,9 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnFileConfigId() {
         return _columnFileConfigId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java

@@ -131,19 +131,19 @@ 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 _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLastUpdated = cci("lastUpdated", "lastUpdated", null, null, Long.class, "lastUpdated", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java

@@ -130,17 +130,17 @@ public class KeyMatchDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _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",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java

@@ -120,9 +120,9 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java

@@ -134,25 +134,25 @@ public class LabelTypeDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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,
+            null, false, false, false, "keyword", 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, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
-    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);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java

@@ -133,21 +133,21 @@ public class PathMappingDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _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",
-            0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 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,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 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 _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java

@@ -129,19 +129,19 @@ public class RequestHeaderDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
-    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);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java

@@ -128,19 +128,19 @@ public class RoleTypeDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
-    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);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java

@@ -145,25 +145,25 @@ public class ScheduledJobDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false,
             "Boolean", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 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 _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
 

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java

@@ -126,16 +126,16 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGenerator = cci("generator", "generator", null, null, String.class, "generator", 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,
+            false, "keyword", 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, "keyword", 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,
+    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java

@@ -140,29 +140,29 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
+            false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
     protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnAuthRealm() {
         return _columnAuthRealm;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java

@@ -158,43 +158,43 @@ public class WebConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
-            "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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 _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class,
-            "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "excludedDocUrls", null, false, false, false, "keyword", 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);
+            false, false, false, "keyword", 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);
+            "includedDocUrls", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
             null, false, false, false, "Long", 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,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 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,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 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);
-    protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnAvailable() {
         return _columnAvailable;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java

@@ -120,9 +120,9 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java

@@ -120,9 +120,9 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     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);
+            false, false, "keyword", 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);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnRoleTypeId() {
         return _columnRoleTypeId;

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java

@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,17 +230,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,16 +256,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -280,12 +281,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,12 +296,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,16 +311,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,17 +332,16 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long expiredTime
     public void setExpiredTime_Avg() {
         setExpiredTime_Avg(null);
     }
 
-    public void setExpiredTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setExpiredTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setExpiredTime_Avg("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "expiredTime");
+    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,12 +351,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Max(null);
     }
 
-    public void setExpiredTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setExpiredTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setExpiredTime_Max("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "expiredTime");
+    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -365,12 +366,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Min(null);
     }
 
-    public void setExpiredTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setExpiredTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setExpiredTime_Min("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "expiredTime");
+    public void setExpiredTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -380,12 +381,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Sum(null);
     }
 
-    public void setExpiredTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setExpiredTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setExpiredTime_Sum("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "expiredTime");
+    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -395,12 +396,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_ExtendedStats(null);
     }
 
-    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setExpiredTime_ExtendedStats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "expiredTime");
+    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +411,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Stats(null);
     }
 
-    public void setExpiredTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setExpiredTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setExpiredTime_Stats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "expiredTime");
+    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +426,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Percentiles(null);
     }
 
-    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setExpiredTime_Percentiles("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "expiredTime");
+    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,12 +441,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_PercentileRanks(null);
     }
 
-    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setExpiredTime_PercentileRanks("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "expiredTime");
+    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -455,17 +456,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Histogram(null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "expiredTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,16 +482,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Range(null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setExpiredTime_Range("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Range("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "expiredTime");
+    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -504,12 +507,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Count(null);
     }
 
-    public void setExpiredTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExpiredTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExpiredTime_Count("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "expiredTime");
+    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +522,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Cardinality(null);
     }
 
-    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExpiredTime_Cardinality("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "expiredTime");
+    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -534,16 +537,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Missing(null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "expiredTime");
+    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -554,22 +558,20 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -584,17 +586,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,16 +612,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +637,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +652,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,16 +667,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,22 +688,21 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String sessionId
-
     public void setSessionId_Terms() {
         setSessionId_Terms(null);
     }
 
-    public void setSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSessionId_Terms("sessionId", opLambda, null);
     }
 
-    public void setSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_Terms("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "sessionId");
+    public void setSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -713,18 +717,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_SignificantTerms(null);
     }
 
-    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSessionId_SignificantTerms("sessionId", opLambda, null);
     }
 
-    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_SignificantTerms("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "sessionId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -739,16 +743,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_IpRange(null);
     }
 
-    public void setSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSessionId_IpRange("sessionId", opLambda, null);
     }
 
-    public void setSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_IpRange("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "sessionId");
+    public void setSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,12 +768,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Count(null);
     }
 
-    public void setSessionId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSessionId_Count("sessionId", opLambda);
     }
 
-    public void setSessionId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sessionId");
+    public void setSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,12 +783,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Cardinality(null);
     }
 
-    public void setSessionId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSessionId_Cardinality("sessionId", opLambda);
     }
 
-    public void setSessionId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sessionId");
+    public void setSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -793,16 +798,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Missing(null);
     }
 
-    public void setSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSessionId_Missing("sessionId", opLambda, null);
     }
 
-    public void setSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_Missing("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sessionId");
+    public void setSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java

@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,37 +92,36 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String crawlingInfoId
-
     public void setCrawlingInfoId_Terms() {
         setCrawlingInfoId_Terms(null);
     }
 
-    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCrawlingInfoId_Terms("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_Terms("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setCrawlingInfoId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "crawlingInfoId");
+        TermsAggregationBuilder builder = regTermsA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -137,18 +136,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_SignificantTerms(null);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCrawlingInfoId_SignificantTerms("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_SignificantTerms("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCrawlingInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "crawlingInfoId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -163,17 +162,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_IpRange(null);
     }
 
-    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCrawlingInfoId_IpRange("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_IpRange("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCrawlingInfoId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "crawlingInfoId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -188,12 +188,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Count(null);
     }
 
-    public void setCrawlingInfoId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCrawlingInfoId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCrawlingInfoId_Count("crawlingInfoId", opLambda);
     }
 
-    public void setCrawlingInfoId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "crawlingInfoId");
+    public void setCrawlingInfoId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -203,12 +203,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Cardinality(null);
     }
 
-    public void setCrawlingInfoId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCrawlingInfoId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCrawlingInfoId_Cardinality("crawlingInfoId", opLambda);
     }
 
-    public void setCrawlingInfoId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "crawlingInfoId");
+    public void setCrawlingInfoId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -218,17 +218,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Missing(null);
     }
 
-    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCrawlingInfoId_Missing("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_Missing("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCrawlingInfoId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "crawlingInfoId");
+        MissingAggregationBuilder builder = regMissingA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -239,17 +240,16 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,12 +259,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -274,12 +274,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -289,12 +289,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -304,12 +304,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,12 +319,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -334,12 +334,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +349,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,17 +364,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -389,16 +390,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -413,12 +415,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -428,12 +430,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -443,17 +445,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -464,22 +467,21 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String key
-
     public void setKey_Terms() {
         setKey_Terms(null);
     }
 
-    public void setKey_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setKey_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setKey_Terms("key", opLambda, null);
     }
 
-    public void setKey_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_Terms("key", opLambda, aggsLambda);
     }
 
-    public void setKey_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "key");
+    public void setKey_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -494,18 +496,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_SignificantTerms(null);
     }
 
-    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setKey_SignificantTerms("key", opLambda, null);
     }
 
-    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_SignificantTerms("key", opLambda, aggsLambda);
     }
 
-    public void setKey_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setKey_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "key");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,16 +522,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_IpRange(null);
     }
 
-    public void setKey_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setKey_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setKey_IpRange("key", opLambda, null);
     }
 
-    public void setKey_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_IpRange("key", opLambda, aggsLambda);
     }
 
-    public void setKey_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "key");
+    public void setKey_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -544,12 +547,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Count(null);
     }
 
-    public void setKey_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setKey_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setKey_Count("key", opLambda);
     }
 
-    public void setKey_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "key");
+    public void setKey_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -559,12 +562,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Cardinality(null);
     }
 
-    public void setKey_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setKey_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setKey_Cardinality("key", opLambda);
     }
 
-    public void setKey_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "key");
+    public void setKey_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -574,16 +577,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Missing(null);
     }
 
-    public void setKey_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setKey_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setKey_Missing("key", opLambda, null);
     }
 
-    public void setKey_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_Missing("key", opLambda, aggsLambda);
     }
 
-    public void setKey_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "key");
+    public void setKey_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -594,22 +598,21 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -624,18 +627,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -650,16 +653,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -674,12 +678,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -689,12 +693,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -704,16 +708,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToLabelCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.DataConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,37 +82,35 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String dataConfigId
-
     public void setDataConfigId_Terms() {
         setDataConfigId_Terms(null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "dataConfigId");
+        TermsAggregationBuilder builder = regTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -127,18 +125,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_SignificantTerms(null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "dataConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -153,17 +151,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_IpRange(null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "dataConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -178,12 +177,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Count(null);
     }
 
-    public void setDataConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDataConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDataConfigId_Count("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "dataConfigId");
+    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -193,12 +192,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Cardinality(null);
     }
 
-    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDataConfigId_Cardinality("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "dataConfigId");
+    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -208,17 +207,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Missing(null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "dataConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -229,22 +229,21 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,18 +258,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,17 +284,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,12 +310,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -325,12 +325,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,17 +340,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToRoleCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.DataConfigToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String dataConfigId
-
     public void setDataConfigId_Terms() {
         setDataConfigId_Terms(null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "dataConfigId");
+    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_SignificantTerms(null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "dataConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_IpRange(null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "dataConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Count(null);
     }
 
-    public void setDataConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDataConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDataConfigId_Count("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "dataConfigId");
+    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Cardinality(null);
     }
 
-    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDataConfigId_Cardinality("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "dataConfigId");
+    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Missing(null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "dataConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,17 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +309,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +324,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +339,17 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -83,37 +83,36 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String elevateWordId
-
     public void setElevateWordId_Terms() {
         setElevateWordId_Terms(null);
     }
 
-    public void setElevateWordId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setElevateWordId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setElevateWordId_Terms("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_Terms("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setElevateWordId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "elevateWordId");
+        TermsAggregationBuilder builder = regTermsA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -128,18 +127,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_SignificantTerms(null);
     }
 
-    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setElevateWordId_SignificantTerms("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_SignificantTerms("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setElevateWordId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "elevateWordId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -154,17 +153,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_IpRange(null);
     }
 
-    public void setElevateWordId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setElevateWordId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setElevateWordId_IpRange("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_IpRange("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setElevateWordId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "elevateWordId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -179,12 +179,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Count(null);
     }
 
-    public void setElevateWordId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setElevateWordId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setElevateWordId_Count("elevateWordId", opLambda);
     }
 
-    public void setElevateWordId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "elevateWordId");
+    public void setElevateWordId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -194,12 +194,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Cardinality(null);
     }
 
-    public void setElevateWordId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setElevateWordId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setElevateWordId_Cardinality("elevateWordId", opLambda);
     }
 
-    public void setElevateWordId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "elevateWordId");
+    public void setElevateWordId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -209,17 +209,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Missing(null);
     }
 
-    public void setElevateWordId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setElevateWordId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setElevateWordId_Missing("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_Missing("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setElevateWordId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "elevateWordId");
+        MissingAggregationBuilder builder = regMissingA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -230,23 +231,21 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,18 +260,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -287,17 +286,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +312,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,12 +327,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -342,17 +342,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToLabelCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.FileConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,37 +82,35 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String fileConfigId
-
     public void setFileConfigId_Terms() {
         setFileConfigId_Terms(null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "fileConfigId");
+        TermsAggregationBuilder builder = regTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -127,18 +125,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_SignificantTerms(null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "fileConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -153,17 +151,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_IpRange(null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "fileConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -178,12 +177,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Count(null);
     }
 
-    public void setFileConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFileConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFileConfigId_Count("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "fileConfigId");
+    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -193,12 +192,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Cardinality(null);
     }
 
-    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFileConfigId_Cardinality("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "fileConfigId");
+    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -208,17 +207,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Missing(null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "fileConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -229,22 +229,21 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,18 +258,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,17 +284,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,12 +310,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -325,12 +325,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,17 +340,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToRoleCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.FileConfigToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String fileConfigId
-
     public void setFileConfigId_Terms() {
         setFileConfigId_Terms(null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "fileConfigId");
+    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_SignificantTerms(null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "fileConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_IpRange(null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "fileConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Count(null);
     }
 
-    public void setFileConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFileConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFileConfigId_Count("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "fileConfigId");
+    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Cardinality(null);
     }
 
-    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFileConfigId_Cardinality("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "fileConfigId");
+    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Missing(null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "fileConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,17 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +309,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +324,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +339,17 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelToRoleCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.LabelToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,16 +151,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -176,12 +176,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -191,12 +191,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -206,16 +206,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -226,22 +227,21 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,18 +256,18 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -282,16 +282,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,12 +307,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -321,12 +322,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -336,16 +337,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java

@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,17 +161,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -187,12 +186,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -202,12 +201,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -217,16 +216,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -237,17 +237,16 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -257,12 +256,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,12 +271,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -287,12 +286,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -302,12 +301,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,12 +316,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -332,12 +331,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -347,12 +346,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -362,17 +361,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -387,16 +387,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -411,12 +412,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -426,12 +427,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -441,17 +442,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -462,22 +463,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String target
-
     public void setTarget_Terms() {
         setTarget_Terms(null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTarget_Terms("target", opLambda, null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_Terms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "target");
+    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -492,18 +492,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_SignificantTerms(null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTarget_SignificantTerms("target", opLambda, null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_SignificantTerms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "target");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -518,16 +518,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_IpRange(null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTarget_IpRange("target", opLambda, null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_IpRange("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "target");
+    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -542,12 +543,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Count(null);
     }
 
-    public void setTarget_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTarget_Count("target", opLambda);
     }
 
-    public void setTarget_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "target");
+    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,12 +558,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Cardinality(null);
     }
 
-    public void setTarget_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTarget_Cardinality("target", opLambda);
     }
 
-    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "target");
+    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -572,16 +573,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Missing(null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTarget_Missing("target", opLambda, null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_Missing("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "target");
+    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -592,22 +594,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String generator
-
     public void setGenerator_Terms() {
         setGenerator_Terms(null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setGenerator_Terms("generator", opLambda, null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_Terms("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "generator");
+    public void setGenerator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -622,18 +623,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_SignificantTerms(null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setGenerator_SignificantTerms("generator", opLambda, null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_SignificantTerms("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "generator");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,17 +649,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_IpRange(null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setGenerator_IpRange("generator", opLambda, null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_IpRange("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setGenerator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "generator");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -673,12 +674,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Count(null);
     }
 
-    public void setGenerator_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGenerator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGenerator_Count("generator", opLambda);
     }
 
-    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "generator");
+    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -688,12 +689,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Cardinality(null);
     }
 
-    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGenerator_Cardinality("generator", opLambda);
     }
 
-    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "generator");
+    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -703,16 +704,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Missing(null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGenerator_Missing("generator", opLambda, null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_Missing("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "generator");
+    public void setGenerator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -723,22 +725,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String path
-
     public void setPath_Terms() {
         setPath_Terms(null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPath_Terms("path", opLambda, null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_Terms("path", opLambda, aggsLambda);
     }
 
-    public void setPath_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "path");
+    public void setPath_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -753,17 +754,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_SignificantTerms(null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPath_SignificantTerms("path", opLambda, null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_SignificantTerms("path", opLambda, aggsLambda);
     }
 
-    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "path");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,16 +780,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_IpRange(null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPath_IpRange("path", opLambda, null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_IpRange("path", opLambda, aggsLambda);
     }
 
-    public void setPath_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "path");
+    public void setPath_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -802,12 +805,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Count(null);
     }
 
-    public void setPath_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPath_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPath_Count("path", opLambda);
     }
 
-    public void setPath_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "path");
+    public void setPath_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -817,12 +820,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Cardinality(null);
     }
 
-    public void setPath_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPath_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPath_Cardinality("path", opLambda);
     }
 
-    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "path");
+    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -832,16 +835,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Missing(null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPath_Missing("path", opLambda, null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_Missing("path", opLambda, aggsLambda);
     }
 
-    public void setPath_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "path");
+    public void setPath_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -852,22 +856,20 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String url
-
     public void setUrl_Terms() {
         setUrl_Terms(null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrl_Terms("url", opLambda, null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_Terms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "url");
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,17 +884,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_SignificantTerms(null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrl_SignificantTerms("url", opLambda, null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_SignificantTerms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "url");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,16 +910,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_IpRange(null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrl_IpRange("url", opLambda, null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_IpRange("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "url");
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -931,12 +935,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Count(null);
     }
 
-    public void setUrl_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrl_Count("url", opLambda);
     }
 
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "url");
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -946,12 +950,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Cardinality(null);
     }
 
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrl_Cardinality("url", opLambda);
     }
 
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "url");
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -961,16 +965,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Missing(null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrl_Missing("url", opLambda, null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_Missing("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "url");
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }

src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToLabelCA.java

@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.WebConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String webConfigId
-
     public void setWebConfigId_Terms() {
         setWebConfigId_Terms(null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "webConfigId");
+    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_SignificantTerms(null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "webConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_IpRange(null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "webConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +310,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Count(null);
     }
 
-    public void setWebConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setWebConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setWebConfigId_Count("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "webConfigId");
+    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +325,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Cardinality(null);
     }
 
-    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setWebConfigId_Cardinality("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "webConfigId");
+    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +340,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Missing(null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "webConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }