Skip to content

Commit 1bcf929

Browse files
renekrierenekrie
authored
Merge branch 'main' into dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.1.0
2 parents ebc2100 + c3d34ed commit 1bcf929

35 files changed

+281
-344
lines changed

‎pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.querqy</groupId>
55
<artifactId>querqy-elasticsearch</artifactId>
6-
<version>1.8.es8114.0-SNAPSHOT</version>
6+
<version>1.8.es8171.0-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<prerequisites>
@@ -39,13 +39,13 @@
3939

4040
<properties>
4141

42-
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
42+
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
4343
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
44-
<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
45-
<maven-release-plugin.version>3.1.0</maven-release-plugin.version>
44+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
45+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
4646
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
47-
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
48-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
47+
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
48+
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
4949

5050
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5151
<java.version>17</java.version>
@@ -56,9 +56,9 @@
5656
<jts.version>1.19.0</jts.version>
5757
<json-path.version>2.7.0</json-path.version>
5858

59-
<querqy.lucene.version>5.7.lucene942.0</querqy.lucene.version>
59+
<querqy.lucene.version>5.7.lucene961.0</querqy.lucene.version>
6060

61-
<elasticsearch.version>8.11.4</elasticsearch.version>
61+
<elasticsearch.version>8.17.1</elasticsearch.version>
6262
<jacoco.version>0.8.12</jacoco.version>
6363
<maven.compiler.source>17</maven.compiler.source>
6464
<maven.compiler.target>17</maven.compiler.target>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>org.assertj</groupId>
111111
<artifactId>assertj-core</artifactId>
112-
<version>3.25.3</version>
112+
<version>3.26.0</version>
113113
<scope>test</scope>
114114
</dependency>
115115

@@ -248,7 +248,7 @@
248248
<plugin>
249249
<groupId>org.apache.maven.plugins</groupId>
250250
<artifactId>maven-gpg-plugin</artifactId>
251-
<version>3.2.2</version>
251+
<version>3.2.4</version>
252252
<executions>
253253
<execution>
254254
<id>sign-artifacts</id>

‎src/main/java/querqy/elasticsearch/QuerqyPlugin.java

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,23 @@
66

77
import org.elasticsearch.action.ActionRequest;
88
import org.elasticsearch.action.ActionResponse;
9-
import org.elasticsearch.client.internal.Client;
109
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1110
import org.elasticsearch.cluster.node.DiscoveryNodes;
12-
import org.elasticsearch.cluster.routing.allocation.AllocationService;
13-
import org.elasticsearch.cluster.service.ClusterService;
1411
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1512
import org.elasticsearch.common.settings.ClusterSettings;
1613
import org.elasticsearch.common.settings.IndexScopedSettings;
1714
import org.elasticsearch.common.settings.Setting;
1815
import org.elasticsearch.common.settings.Settings;
1916
import org.elasticsearch.common.settings.SettingsFilter;
20-
import org.elasticsearch.indices.IndicesService;
21-
import org.elasticsearch.telemetry.TelemetryProvider;
22-
import org.elasticsearch.xcontent.NamedXContentRegistry;
23-
import org.elasticsearch.env.Environment;
24-
import org.elasticsearch.env.NodeEnvironment;
17+
import org.elasticsearch.features.NodeFeature;
18+
2519
import org.elasticsearch.index.IndexModule;
2620
import org.elasticsearch.index.query.QueryBuilder;
2721
import org.elasticsearch.plugins.ActionPlugin;
2822
import org.elasticsearch.plugins.Plugin;
2923
import org.elasticsearch.plugins.SearchPlugin;
30-
import org.elasticsearch.repositories.RepositoriesService;
3124
import org.elasticsearch.rest.RestController;
3225
import org.elasticsearch.rest.RestHandler;
33-
import org.elasticsearch.script.ScriptService;
34-
import org.elasticsearch.threadpool.ThreadPool;
35-
import org.elasticsearch.watcher.ResourceWatcherService;
3626
import querqy.elasticsearch.infologging.Log4jSink;
3727
import querqy.elasticsearch.query.QuerqyQueryBuilder;
3828
import querqy.elasticsearch.rewriterstore.DeleteRewriterAction;
@@ -50,13 +40,12 @@
5040
import java.util.Collection;
5141
import java.util.Collections;
5242
import java.util.List;
43+
import java.util.function.Predicate;
5344
import java.util.function.Supplier;
5445

5546
public class QuerqyPlugin extends Plugin implements SearchPlugin, ActionPlugin {
56-
57-
58-
private final QuerqyProcessor querqyProcessor;
5947
private final RewriterShardContexts rewriterShardContexts;
48+
private final QuerqyProcessor querqyProcessor;
6049

6150
public QuerqyPlugin(final Settings settings) {
6251
rewriterShardContexts = new RewriterShardContexts(settings);
@@ -65,9 +54,7 @@ public QuerqyPlugin(final Settings settings) {
6554

6655
@Override
6756
public void onIndexModule(final IndexModule indexModule) {
68-
6957
indexModule.addIndexEventListener(rewriterShardContexts);
70-
7158
}
7259

7360
/**
@@ -81,47 +68,37 @@ public List<QuerySpec<?>> getQueries() {
8168
(in) -> new QuerqyQueryBuilder(in, querqyProcessor),
8269
(parser) -> QuerqyQueryBuilder.fromXContent(parser, querqyProcessor)));
8370
}
84-
71+
8572
@Override
86-
public List<RestHandler> getRestHandlers(final Settings settings, final RestController restController,
87-
final ClusterSettings clusterSettings,
88-
final IndexScopedSettings indexScopedSettings,
89-
final SettingsFilter settingsFilter,
90-
final IndexNameExpressionResolver indexNameExpressionResolver,
91-
final Supplier<DiscoveryNodes> nodesInCluster) {
92-
93-
return Arrays.asList(new RestPutRewriterAction(), new RestDeleteRewriterAction());
94-
95-
}
73+
public List<RestHandler> getRestHandlers(
74+
final Settings settings,
75+
final NamedWriteableRegistry namedWriteableRegistry, // This parameter was missing
76+
final RestController restController,
77+
final ClusterSettings clusterSettings,
78+
final IndexScopedSettings indexScopedSettings,
79+
final SettingsFilter settingsFilter,
80+
final IndexNameExpressionResolver indexNameExpressionResolver,
81+
final Supplier<DiscoveryNodes> nodesInCluster,
82+
final Predicate<NodeFeature> clusterSupportsFeature // This parameter was missing
83+
) {
84+
return Arrays.asList(new RestPutRewriterAction(), new RestDeleteRewriterAction());
85+
}
9686

9787
@Override
9888
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
9989
return unmodifiableList(asList(
10090
new ActionHandler<>(PutRewriterAction.INSTANCE, TransportPutRewriterAction.class),
10191
new ActionHandler<>(NodesReloadRewriterAction.INSTANCE, TransportNodesReloadRewriterAction.class),
10292
new ActionHandler<>(DeleteRewriterAction.INSTANCE, TransportDeleteRewriterAction.class),
103-
new ActionHandler<>(NodesClearRewriterCacheAction.INSTANCE, TransportNodesClearRewriterCacheAction
104-
.class)
105-
93+
new ActionHandler<>(NodesClearRewriterCacheAction.INSTANCE, TransportNodesClearRewriterCacheAction.class)
10694
));
10795
}
10896

10997
@Override
110-
public Collection<Object> createComponents(final Client client, final ClusterService clusterService,
111-
final ThreadPool threadPool,
112-
final ResourceWatcherService resourceWatcherService,
113-
final ScriptService scriptService,
114-
final NamedXContentRegistry xContentRegistry,
115-
final Environment environment, final NodeEnvironment nodeEnvironment,
116-
final NamedWriteableRegistry namedWriteableRegistry,
117-
final IndexNameExpressionResolver indexNameExpressionResolver,
118-
final Supplier<RepositoriesService> repositoriesServiceSupplier,
119-
final TelemetryProvider telemetryProvider,
120-
final AllocationService allocationService,
121-
final IndicesService indicesService) {
98+
public Collection<Object> createComponents(PluginServices services) {
12299
return Arrays.asList(rewriterShardContexts, querqyProcessor);
123100
}
124-
101+
125102
@Override
126103
public List<Setting<?>> getSettings() {
127104
return Collections.singletonList(Setting.intSetting(SETTINGS_QUERQY_INDEX_NUM_REPLICAS, 1, 0,

‎src/main/java/querqy/elasticsearch/QuerqyProcessor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.security.PrivilegedAction;
2222
import java.util.Collections;
2323
import java.util.List;
24-
import java.util.Map;
2524
import java.util.Set;
2625
import java.util.stream.Collectors;
2726

@@ -30,8 +29,8 @@ public class QuerqyProcessor {
3029

3130
private static final RewriteChain EMPTY_REWRITE_CHAIN = new RewriteChain(Collections.emptyList());
3231

33-
private RewriterShardContexts rewriterShardContexts;
34-
private Sink infoLoggingSink;
32+
private final RewriterShardContexts rewriterShardContexts;
33+
private final Sink infoLoggingSink;
3534

3635
public QuerqyProcessor(final RewriterShardContexts rewriterShardContexts, final Sink infoLoggingSink) {
3736
this.rewriterShardContexts = rewriterShardContexts;

‎src/main/java/querqy/elasticsearch/RewriterShardContexts.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.apache.logging.log4j.Logger;
55
import org.elasticsearch.ElasticsearchException;
66
import org.elasticsearch.cluster.routing.ShardRouting;
7-
import org.elasticsearch.common.inject.Inject;
7+
import org.elasticsearch.injection.guice.Inject;
88
import org.elasticsearch.common.settings.Settings;
99
import org.elasticsearch.index.query.SearchExecutionContext;
1010
import org.elasticsearch.index.shard.IndexEventListener;
@@ -20,15 +20,13 @@ public class RewriterShardContexts implements IndexEventListener {
2020

2121
private static final Logger LOGGER = LogManager.getLogger(RewriterShardContexts.class);
2222

23-
2423
private final Map<ShardId, RewriterShardContext> shardContexts;
25-
2624
private IndicesService indicesService;
27-
private Settings settings;
25+
private final Settings settings;
2826

2927
public RewriterShardContexts(final Settings settings) {
3028
this.settings = settings;
31-
shardContexts = new ConcurrentHashMap<>();
29+
this.shardContexts = new ConcurrentHashMap<>();
3230
}
3331

3432
public RewriteChainAndLogging getRewriteChain(final List<String> rewriterIds,
@@ -91,5 +89,4 @@ public synchronized void afterIndexShardClosed(final ShardId shardId, final Inde
9189
public void setIndicesService(final IndicesService indicesService) {
9290
this.indicesService = indicesService;
9391
}
94-
9592
}

‎src/main/java/querqy/elasticsearch/query/QuerqyQueryBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public QuerqyQueryBuilder() {
8181
super();
8282
}
8383

84-
8584
public QuerqyQueryBuilder(final QuerqyProcessor querqyProcessor) {
8685
super();
8786
this.querqyProcessor = querqyProcessor;

‎src/main/java/querqy/elasticsearch/query/Rewriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public Rewriter(final StreamInput in) throws IOException {
2525
name = in.readString();
2626
final boolean hasParams = in.readBoolean();
2727
if (hasParams) {
28-
params = in.readMap();
28+
params = in.readGenericMap();
2929
}
3030
}
3131

‎src/main/java/querqy/elasticsearch/rewriterstore/DeleteRewriterAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class DeleteRewriterAction extends ActionType<DeleteRewriterResponse> {
1111
* @param name The name of the action, must be unique across actions.
1212
*/
1313
protected DeleteRewriterAction(final String name) {
14-
super(name, DeleteRewriterResponse::new);
14+
super(name);
1515
}
1616

1717
}

‎src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class NodesClearRewriterCacheAction extends ActionType<NodesClearRewriter
1212

1313

1414
protected NodesClearRewriterCacheAction(final String name) {
15-
super(name, NodesClearRewriterCacheResponse::new);
15+
super(name);
1616
}
1717

1818
}

‎src/main/java/querqy/elasticsearch/rewriterstore/NodesClearRewriterCacheRequest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ public class NodesClearRewriterCacheRequest extends BaseNodesRequest<NodesClearR
1212

1313
private final String rewriterId;
1414

15-
public NodesClearRewriterCacheRequest(final StreamInput in) throws IOException {
16-
super(in);
17-
rewriterId = in.readOptionalString();
18-
}
19-
2015
public NodesClearRewriterCacheRequest() {
2116
super((String[]) null);
2217
rewriterId = null;
@@ -27,12 +22,6 @@ public NodesClearRewriterCacheRequest(final String rewriterId, final String... n
2722
this.rewriterId = rewriterId;
2823
}
2924

30-
@Override
31-
public void writeTo(final StreamOutput out) throws IOException {
32-
super.writeTo(out);
33-
out.writeOptionalString(rewriterId);
34-
}
35-
3625
public Optional<String> getRewriterId() {
3726
return Optional.ofNullable(rewriterId);
3827
}

‎src/main/java/querqy/elasticsearch/rewriterstore/NodesReloadRewriterAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NodesReloadRewriterAction extends ActionType<NodesReloadRewriterRes
99

1010

1111
protected NodesReloadRewriterAction(final String name) {
12-
super(name, NodesReloadRewriterResponse::new);
12+
super(name);
1313
}
1414

1515
}

0 commit comments

Comments
 (0)