elasticsearch 5.4.0

dbflute.xml

@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="es-5.3" />
+	<property name="branch.name" value="es-5.4" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">

plugin.xml

@@ -19,8 +19,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- analysis-ja -->
 		<antcall target="install.plugin">
@@ -28,8 +28,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- analysis-synonym -->
 		<antcall target="install.plugin">
@@ -37,8 +37,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@@ -46,8 +46,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">
@@ -55,8 +55,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- langfield -->
 		<antcall target="install.plugin">
@@ -64,8 +64,8 @@
 			<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="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@@ -73,8 +73,8 @@
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="5.3.1" />
-			<param name="plugin.zip.version" value="5.3.1" />
+			<param name="plugin.version" value="5.4.0" />
+			<param name="plugin.zip.version" value="5.4.0" />
 		</antcall>
 		<!-- kopf -->
 		<get dest="${target.dir}/kopf.zip">

pom.xml

@@ -39,7 +39,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 
 		<!-- Main Framework -->
-		<dbflute.version>1.1.2</dbflute.version>
+		<dbflute.version>1.1.3</dbflute.version>
 		<lastaflute.version>0.9.6</lastaflute.version>
 		<lasta.taglib.version>0.7.1</lasta.taglib.version>
 		<lasta.job.version>0.4.6</lasta.job.version>
@@ -47,7 +47,7 @@
 
 		<!-- Partner Library -->
 		<slf4j.version>1.7.22</slf4j.version>
-		<log4j.version>2.7</log4j.version>
+		<log4j.version>2.8.2</log4j.version>
 		<jackson.version>2.8.6</jackson.version>
 		<commons.fileupload.version>1.3.2</commons.fileupload.version>
 		<asm.version>5.1</asm.version>
@@ -60,15 +60,15 @@
 		<utflute.version>0.7.5</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>1.2.0-SNAPSHOT</crawler.version>
+		<crawler.version>1.3.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>5.3.1-SNAPSHOT</suggest.version>
+		<suggest.version>5.4.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>5.3.2</elasticsearch.version>
+		<elasticsearch.version>5.4.0</elasticsearch.version>
 		<elasticsearch.min.version>5.3.0</elasticsearch.min.version>
-		<cluster.runner.version>5.3.2.0</cluster.runner.version>
+		<cluster.runner.version>5.4.0.1</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.14</tomcat.version>
@@ -1286,6 +1286,10 @@
 					<groupId>javax.annotation</groupId>
 					<artifactId>javax.annotation-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>net.java.dev.jna</groupId>
+					<artifactId>jna</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -1359,6 +1363,10 @@
 					<groupId>org.apache.httpcomponents</groupId>
 					<artifactId>httpclient</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>net.java.dev.jna</groupId>
+					<artifactId>jna</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 

src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java

@@ -19,6 +19,7 @@ import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.g
 import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getEnvItems;
 import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getFessPropItems;
 import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getPropItems;
+
 import java.util.List;
 import java.util.Map;
 

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

@@ -93,6 +93,9 @@ import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.explain.ExplainRequest;
 import org.elasticsearch.action.explain.ExplainRequestBuilder;
 import org.elasticsearch.action.explain.ExplainResponse;
+import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
+import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
+import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
 import org.elasticsearch.action.fieldstats.FieldStatsRequest;
 import org.elasticsearch.action.fieldstats.FieldStatsRequestBuilder;
 import org.elasticsearch.action.fieldstats.FieldStatsResponse;
@@ -664,7 +667,7 @@ public class FessEsClient implements Client {
             return condition.build(searchRequestBuilder);
         }, (queryBuilder, execTime, searchResponse) -> {
             return searchResponse.map(response -> {
-                final SearchHit[] hits = response.getHits().hits();
+                final SearchHit[] hits = response.getHits().getHits();
                 if (hits.length > 0) {
                     return creator.build(response, hits[0]);
                 }
@@ -1335,4 +1338,19 @@ public class FessEsClient implements Client {
         return client.prepareExecute(action);
     }
 
+    @Override
+    public FieldCapabilitiesRequestBuilder prepareFieldCaps() {
+        return client.prepareFieldCaps();
+    }
+
+    @Override
+    public ActionFuture<FieldCapabilitiesResponse> fieldCaps(FieldCapabilitiesRequest request) {
+        return client.fieldCaps(request);
+    }
+
+    @Override
+    public void fieldCaps(FieldCapabilitiesRequest request, ActionListener<FieldCapabilitiesResponse> listener) {
+        client.fieldCaps(request, listener);
+    }
+
 }

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

@@ -154,7 +154,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.totalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTookInMillis());

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

@@ -154,7 +154,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.totalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTookInMillis());

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

@@ -154,7 +154,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.totalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits());
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTookInMillis());