Bladeren bron

elasticsearch 7.3

Shinsuke Sugaya 6 jaren geleden
bovenliggende
commit
0d8dc7e12e
2 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 4 4
      pom.xml
  2. 4 4
      src/main/java/org/codelibs/fess/es/client/FessEsClient.java

+ 4 - 4
pom.xml

@@ -58,14 +58,14 @@
 		<utflute.version>0.9.1</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>3.2.1</crawler.version>
+		<crawler.version>3.3.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>7.2.1</suggest.version>
+		<suggest.version>7.3.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>7.2.1</elasticsearch.version>
-		<elasticsearch.httpclient.version>7.2.1</elasticsearch.httpclient.version>
+		<elasticsearch.version>7.3.0</elasticsearch.version>
+		<elasticsearch.httpclient.version>7.3.0-SNAPSHOT</elasticsearch.httpclient.version>
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 
 		<!-- Tomcat -->

+ 4 - 4
src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -68,11 +68,11 @@ import org.codelibs.fess.util.DocMap;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.optional.OptionalEntity;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.DocWriteRequest.OpType;
 import org.elasticsearch.action.DocWriteResponse.Result;
@@ -1564,13 +1564,13 @@ public class FessEsClient implements Client {
     }
 
     @Override
-    public <Request extends ActionRequest, Response extends ActionResponse> ActionFuture<Response> execute(final Action<Response> action,
-            final Request request) {
+    public <Request extends ActionRequest, Response extends ActionResponse> ActionFuture<Response> execute(
+            final ActionType<Response> action, final Request request) {
         return client.execute(action, request);
     }
 
     @Override
-    public <Request extends ActionRequest, Response extends ActionResponse> void execute(final Action<Response> action,
+    public <Request extends ActionRequest, Response extends ActionResponse> void execute(final ActionType<Response> action,
             final Request request, final ActionListener<Response> listener) {
         client.execute(action, request, listener);
     }