Merge branch 'main' into dependabot/maven/org.apache.maven.plugins-ma…

…ven-release-plugin-3.1.0
querqy · Jan 28, 2025 · 1bcf929 · 1bcf929
2 parents ebc2100 + c3d34ed
commit 1bcf929
Show file tree

Hide file tree

Showing 35 changed files with 281 additions and 344 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.querqy</groupId>
     <artifactId>querqy-elasticsearch</artifactId>
-    <version>1.8.es8114.0-SNAPSHOT</version>
+    <version>1.8.es8171.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <prerequisites>
@@ -39,13 +39,13 @@
 
     <properties>
 
-        <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
+        <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
-        <maven-release-plugin.version>3.1.0</maven-release-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
@@ -56,9 +56,9 @@
         <jts.version>1.19.0</jts.version>
         <json-path.version>2.7.0</json-path.version>
 
-        <querqy.lucene.version>5.7.lucene942.0</querqy.lucene.version>
+        <querqy.lucene.version>5.7.lucene961.0</querqy.lucene.version>
 
-        <elasticsearch.version>8.11.4</elasticsearch.version>
+        <elasticsearch.version>8.17.1</elasticsearch.version>
         <jacoco.version>0.8.12</jacoco.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.25.3</version>
+            <version>3.26.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -248,7 +248,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.2</version>
+                        <version>3.2.4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/src/main/java/querqy/elasticsearch/QuerqyPlugin.java b/src/main/java/querqy/elasticsearch/QuerqyPlugin.java
@@ -6,33 +6,23 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
-import org.elasticsearch.cluster.routing.allocation.AllocationService;
-import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
-import org.elasticsearch.indices.IndicesService;
-import org.elasticsearch.telemetry.TelemetryProvider;
-import org.elasticsearch.xcontent.NamedXContentRegistry;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.env.NodeEnvironment;
+import org.elasticsearch.features.NodeFeature;
+
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;
-import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
-import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.watcher.ResourceWatcherService;
 import querqy.elasticsearch.infologging.Log4jSink;
 import querqy.elasticsearch.query.QuerqyQueryBuilder;
 import querqy.elasticsearch.rewriterstore.DeleteRewriterAction;
@@ -50,13 +40,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class QuerqyPlugin extends Plugin implements SearchPlugin, ActionPlugin {
-
-
-    private final QuerqyProcessor querqyProcessor;
     private final RewriterShardContexts rewriterShardContexts;
+    private final QuerqyProcessor querqyProcessor;
 
     public QuerqyPlugin(final Settings settings) {
         rewriterShardContexts = new RewriterShardContexts(settings);
@@ -65,9 +54,7 @@ public QuerqyPlugin(final Settings settings) {
 
     @Override
     public void onIndexModule(final IndexModule indexModule) {
-
         indexModule.addIndexEventListener(rewriterShardContexts);
-
     }
 
     /**
@@ -81,47 +68,37 @@ public List<QuerySpec<?>> getQueries() {
                         (in) -> new QuerqyQueryBuilder(in, querqyProcessor),
                         (parser) -> QuerqyQueryBuilder.fromXContent(parser, querqyProcessor)));
     }
-
+    
     @Override
-    public List<RestHandler> getRestHandlers(final Settings settings, final RestController restController,
-                                             final ClusterSettings clusterSettings,
-                                             final IndexScopedSettings indexScopedSettings,
-                                             final SettingsFilter settingsFilter,
-                                             final IndexNameExpressionResolver indexNameExpressionResolver,
-                                             final Supplier<DiscoveryNodes> nodesInCluster) {
-
-        return Arrays.asList(new RestPutRewriterAction(), new RestDeleteRewriterAction());
-
-    }
+    public List<RestHandler> getRestHandlers(
+    	    final Settings settings,
+    	    final NamedWriteableRegistry namedWriteableRegistry, // This parameter was missing
+    	    final RestController restController,
+    	    final ClusterSettings clusterSettings,
+    	    final IndexScopedSettings indexScopedSettings,
+    	    final SettingsFilter settingsFilter,
+    	    final IndexNameExpressionResolver indexNameExpressionResolver,
+    	    final Supplier<DiscoveryNodes> nodesInCluster,
+    	    final Predicate<NodeFeature> clusterSupportsFeature  // This parameter was missing
+    	) {
+	    return Arrays.asList(new RestPutRewriterAction(), new RestDeleteRewriterAction());
+	}
 
     @Override
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         return unmodifiableList(asList(
                 new ActionHandler<>(PutRewriterAction.INSTANCE, TransportPutRewriterAction.class),
                 new ActionHandler<>(NodesReloadRewriterAction.INSTANCE, TransportNodesReloadRewriterAction.class),
                 new ActionHandler<>(DeleteRewriterAction.INSTANCE, TransportDeleteRewriterAction.class),
-                new ActionHandler<>(NodesClearRewriterCacheAction.INSTANCE, TransportNodesClearRewriterCacheAction
-                        .class)
-
+                new ActionHandler<>(NodesClearRewriterCacheAction.INSTANCE, TransportNodesClearRewriterCacheAction.class)
         ));
     }
 
     @Override
-    public Collection<Object> createComponents(final Client client, final ClusterService clusterService,
-                                               final ThreadPool threadPool,
-                                               final ResourceWatcherService resourceWatcherService,
-                                               final ScriptService scriptService,
-                                               final NamedXContentRegistry xContentRegistry,
-                                               final Environment environment, final NodeEnvironment nodeEnvironment,
-                                               final NamedWriteableRegistry namedWriteableRegistry,
-                                               final IndexNameExpressionResolver indexNameExpressionResolver,
-                                               final Supplier<RepositoriesService> repositoriesServiceSupplier,
-                                               final TelemetryProvider telemetryProvider,
-                                               final AllocationService allocationService,
-                                               final IndicesService indicesService) {
+    public Collection<Object> createComponents(PluginServices services) {
         return Arrays.asList(rewriterShardContexts, querqyProcessor);
     }
-
+    
     @Override
     public List<Setting<?>> getSettings() {
         return Collections.singletonList(Setting.intSetting(SETTINGS_QUERQY_INDEX_NUM_REPLICAS, 1, 0,

diff --git a/src/main/java/querqy/elasticsearch/QuerqyProcessor.java b/src/main/java/querqy/elasticsearch/QuerqyProcessor.java
@@ -21,7 +21,6 @@
 import java.security.PrivilegedAction;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -30,8 +29,8 @@ public class QuerqyProcessor {
 
     private static final RewriteChain EMPTY_REWRITE_CHAIN = new RewriteChain(Collections.emptyList());
 
-    private RewriterShardContexts rewriterShardContexts;
-    private Sink infoLoggingSink;
+    private final RewriterShardContexts rewriterShardContexts;
+    private final Sink infoLoggingSink;
 
     public QuerqyProcessor(final RewriterShardContexts rewriterShardContexts, final Sink infoLoggingSink) {
         this.rewriterShardContexts = rewriterShardContexts;

diff --git a/src/main/java/querqy/elasticsearch/RewriterShardContexts.java b/src/main/java/querqy/elasticsearch/RewriterShardContexts.java
@@ -4,7 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.index.shard.IndexEventListener;
@@ -20,15 +20,13 @@ public class RewriterShardContexts implements IndexEventListener {
 
     private static final Logger LOGGER = LogManager.getLogger(RewriterShardContexts.class);
 
-
     private final Map<ShardId, RewriterShardContext> shardContexts;
-
     private IndicesService indicesService;
-    private Settings settings;
+    private final Settings settings;
 
     public RewriterShardContexts(final Settings settings) {
         this.settings = settings;
-        shardContexts = new ConcurrentHashMap<>();
+        this.shardContexts = new ConcurrentHashMap<>();
     }
 
     public RewriteChainAndLogging getRewriteChain(final List<String> rewriterIds,
@@ -91,5 +89,4 @@ public synchronized void afterIndexShardClosed(final ShardId shardId, final Inde
     public void setIndicesService(final IndicesService indicesService) {
         this.indicesService = indicesService;
     }
-
 }
diff --git a/src/main/java/querqy/elasticsearch/query/QuerqyQueryBuilder.java b/src/main/java/querqy/elasticsearch/query/QuerqyQueryBuilder.java
@@ -81,7 +81,6 @@ public QuerqyQueryBuilder() {
         super();
     }
 
-
     public QuerqyQueryBuilder(final QuerqyProcessor querqyProcessor) {
         super();
         this.querqyProcessor = querqyProcessor;

diff --git a/src/main/java/querqy/elasticsearch/query/Rewriter.java b/src/main/java/querqy/elasticsearch/query/Rewriter.java
@@ -25,7 +25,7 @@ public Rewriter(final StreamInput in) throws IOException {
         name = in.readString();
         final boolean hasParams = in.readBoolean();
         if (hasParams) {
-            params = in.readMap();
+            params = in.readGenericMap();
         }
     }
 

diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/DeleteRewriterAction.java b/src/main/java/querqy/elasticsearch/rewriterstore/DeleteRewriterAction.java
@@ -11,7 +11,7 @@ public class DeleteRewriterAction extends ActionType<DeleteRewriterResponse> {
      * @param name The name of the action, must be unique across actions.
      */
     protected DeleteRewriterAction(final String name) {
-        super(name, DeleteRewriterResponse::new);
+        super(name);
     }
 
 }
diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheAction.java b/src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheAction.java
@@ -12,7 +12,7 @@ public class NodesClearRewriterCacheAction extends ActionType<NodesClearRewriter
 
 
     protected NodesClearRewriterCacheAction(final String name) {
-        super(name, NodesClearRewriterCacheResponse::new);
+        super(name);
     }
 
 }
diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheRequest.java b/src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheRequest.java
@@ -12,11 +12,6 @@ public class NodesClearRewriterCacheRequest extends BaseNodesRequest<NodesClearR
 
     private final String rewriterId;
 
-    public NodesClearRewriterCacheRequest(final StreamInput in) throws IOException {
-        super(in);
-        rewriterId = in.readOptionalString();
-    }
-
     public NodesClearRewriterCacheRequest() {
         super((String[]) null);
         rewriterId = null;
@@ -27,12 +22,6 @@ public NodesClearRewriterCacheRequest(final String rewriterId, final String... n
         this.rewriterId = rewriterId;
     }
 
-    @Override
-    public void writeTo(final StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeOptionalString(rewriterId);
-    }
-
     public Optional<String> getRewriterId() {
         return Optional.ofNullable(rewriterId);
     }

diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/NodesReloadRewriterAction.java b/src/main/java/querqy/elasticsearch/rewriterstore/NodesReloadRewriterAction.java
@@ -9,7 +9,7 @@ public class NodesReloadRewriterAction extends ActionType<NodesReloadRewriterRes
 
 
     protected NodesReloadRewriterAction(final String name) {
-        super(name, NodesReloadRewriterResponse::new);
+        super(name);
     }
 
 }
diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/NodesReloadRewriterRequest.java b/src/main/java/querqy/elasticsearch/rewriterstore/NodesReloadRewriterRequest.java
@@ -16,17 +16,6 @@ public NodesReloadRewriterRequest(final String rewriterId, final String... nodes
         this.rewriterId = rewriterId;
     }
 
-    public NodesReloadRewriterRequest(final StreamInput in) throws IOException {
-        super(in);
-        rewriterId = in.readString();
-    }
-
-    @Override
-    public void writeTo(final StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeString(rewriterId);
-    }
-
     public NodeRequest newNodeRequest() {
         return new NodeRequest(rewriterId);
     }

diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterAction.java b/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterAction.java
@@ -11,8 +11,6 @@ public class PutRewriterAction extends ActionType<PutRewriterResponse> {
      * @param name The name of the action, must be unique across actions.
      */
     protected PutRewriterAction(final String name) {
-        super(name, PutRewriterResponse::new);
+        super(name);
     }
-
-
 }
diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterRequest.java b/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterRequest.java
@@ -24,7 +24,7 @@ public class PutRewriterRequest extends ActionRequest {
     public PutRewriterRequest(final StreamInput in) throws IOException {
         super(in);
         rewriterId = in.readString();
-        content = in.readMap();
+        content = in.readGenericMap();
     }
 
     public PutRewriterRequest(final String rewriterId, final Map<String, Object> content) {

diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterResponse.java b/src/main/java/querqy/elasticsearch/rewriterstore/PutRewriterResponse.java
@@ -13,8 +13,8 @@
 
 public class PutRewriterResponse extends ActionResponse implements ToXContentObject {
 
-    private DocWriteResponse indexResponse;
-    private NodesReloadRewriterResponse reloadResponse;
+    private final DocWriteResponse indexResponse;
+    private final NodesReloadRewriterResponse reloadResponse;
 
     public PutRewriterResponse(final DocWriteResponse indexResponse, final NodesReloadRewriterResponse reloadResponse) {
         this.indexResponse = indexResponse;

diff --git a/src/main/java/querqy/elasticsearch/rewriterstore/TransportDeleteRewriterAction.java b/src/main/java/querqy/elasticsearch/rewriterstore/TransportDeleteRewriterAction.java
@@ -10,7 +10,7 @@
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;