Skip to content

Commit 6b342aa

Browse files
author
Vincent Potucek
committed
[prone] Add UnusedMethod
Signed-off-by: Vincent Potucek <vpotucek@me.com>
1 parent 46164b5 commit 6b342aa

File tree

12 files changed

+54
-102
lines changed

12 files changed

+54
-102
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2020
- Add build-tooling to run in FIPS environment ([#18921](https://github.com/opensearch-project/OpenSearch/pull/18921))
2121
- Add SMILE/CBOR/YAML document format support to Bulk GRPC endpoint ([#19744](https://github.com/opensearch-project/OpenSearch/pull/19744))
2222
- Implement GRPC ConstantScoreQuery, FuzzyQuery, MatchBoolPrefixQuery, MatchPhrasePrefix, PrefixQuery, MatchQuery ([#19854](https://github.com/opensearch-project/OpenSearch/pull/19854))
23+
- [prone] Add `UnusedMethod` ([#19896](https://github.com/opensearch-project/OpenSearch/pull/19896))
2324

2425
### Changed
2526
- Faster `terms` query creation for `keyword` field with index and docValues enabled ([#19350](https://github.com/opensearch-project/OpenSearch/pull/19350))

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ plugins {
5959
id "org.gradle.test-retry" version "1.6.2" apply false
6060
id "test-report-aggregation"
6161
id 'jacoco-report-aggregation'
62+
id 'net.ltgt.errorprone' version '4.3.0' apply false
6263
}
6364

6465
apply from: 'gradle/build-complete.gradle'
@@ -71,13 +72,10 @@ apply from: 'gradle/run.gradle'
7172
apply from: 'gradle/missing-javadoc.gradle'
7273
apply from: 'gradle/code-coverage.gradle'
7374

74-
// Apply FIPS configuration to all projects
7575
allprojects {
76+
apply from: "$rootDir/gradle/error-prone.gradle"
7677
apply from: "$rootDir/gradle/fips.gradle"
77-
}
78-
79-
// common maven publishing configuration
80-
allprojects {
78+
// common maven publishing configuration
8179
group = 'org.opensearch'
8280
version = VersionProperties.getOpenSearch()
8381
description = "OpenSearch subproject ${project.path}"

gradle/error-prone.gradle

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
apply plugin: 'net.ltgt.errorprone'
10+
11+
tasks.withType(JavaCompile).configureEach {
12+
options.errorprone {
13+
disableAllChecks = true // remove once complain
14+
error(
15+
'UnusedMethod'
16+
)
17+
errorproneArgs.add(
18+
'-XepExcludedPaths:' +
19+
'.*AggregatorTestCase.java|' + // https://github.com/google/error-prone/issues/5289
20+
'.*FactoryProvider.java|' +
21+
'.*IT.java|' + // 6+ findings
22+
'.*MockBigArrays.java|' +
23+
'.*MoreTypes.java|' +
24+
'.*OpenSearchNode.java|' +
25+
'.*SnapshotsService.java|' +
26+
'.*Terms.java|' +
27+
'.*Tests.java|' + // 15+ findings
28+
'.*x-content.*' // generated code
29+
)
30+
}
31+
}
32+
33+
dependencies {
34+
errorprone('com.google.errorprone:error_prone_core:2.42.0')
35+
errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.25.0')
36+
}
37+
38+
configurations.configureEach { // remove once in sync (collision resolved)
39+
resolutionStrategy {
40+
force 'com.google.code.findbugs:jsr305:3.0.2'
41+
force 'com.google.errorprone:error_prone_annotations:2.42.0'
42+
force 'com.google.errorprone:error_prone_core:2.42.0'
43+
force 'com.google.guava:guava:33.4.0-jre'
44+
force 'org.checkerframework:checker-qual:3.43.0'
45+
}
46+
}
47+
48+
repositories {
49+
mavenCentral()
50+
}

server/src/main/java/org/opensearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,6 @@ public static final class EmptyResult implements Writeable {
687687

688688
private EmptyResult() {}
689689

690-
private EmptyResult(StreamInput in) {}
691-
692690
@Override
693691
public void writeTo(StreamOutput out) {}
694692

server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,6 @@ private class NodeTasksResponse extends TransportResponse {
440440
this.exceptions = exceptions;
441441
}
442442

443-
public String getNodeId() {
444-
return nodeId;
445-
}
446-
447-
public List<TaskOperationFailure> getExceptions() {
448-
return exceptions;
449-
}
450-
451443
@Override
452444
public void writeTo(StreamOutput out) throws IOException {
453445
out.writeString(nodeId);

server/src/main/java/org/opensearch/common/inject/matcher/Matchers.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
package org.opensearch.common.inject.matcher;
3131

32-
import org.opensearch.common.SuppressForbidden;
33-
3432
import java.lang.annotation.Annotation;
3533
import java.lang.annotation.Retention;
3634
import java.lang.annotation.RetentionPolicy;
@@ -72,10 +70,6 @@ public boolean matches(Object o) {
7270
public String toString() {
7371
return "any()";
7472
}
75-
76-
public Object readResolve() {
77-
return any();
78-
}
7973
}
8074

8175
/**
@@ -372,12 +366,6 @@ public int hashCode() {
372366
public String toString() {
373367
return "inPackage(" + targetPackage.getName() + ")";
374368
}
375-
376-
@SuppressForbidden(reason = "ClassLoader.getDefinedPackage not available yet")
377-
public Object readResolve() {
378-
// TODO minJava >= 9 : use ClassLoader.getDefinedPackage and remove @SuppressForbidden
379-
return inPackage(Package.getPackage(packageName));
380-
}
381369
}
382370

383371
/**

server/src/main/java/org/opensearch/common/inject/spi/InjectionPoint.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ public final class InjectionPoint {
7676
private final Member member;
7777
private final List<Dependency<?>> dependencies;
7878

79-
private InjectionPoint(Member member, List<Dependency<?>> dependencies, boolean optional) {
80-
this.member = member;
81-
this.dependencies = dependencies;
82-
this.optional = optional;
83-
}
84-
8579
InjectionPoint(TypeLiteral<?> type, Method method) {
8680
this.member = method;
8781

server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,6 @@ private JavaDateFormatter(
245245
this.canCacheLastParsedFormatter = canCacheLastParsedFormatter;
246246
}
247247

248-
private JavaDateFormatter(
249-
String format,
250-
DateTimeFormatter printer,
251-
List<DateTimeFormatter> roundUpParsers,
252-
List<DateTimeFormatter> parsers
253-
) {
254-
this(format, format, wrapFormatter(printer), wrapAllFormatters(roundUpParsers), wrapAllFormatters(parsers), false);
255-
}
256-
257248
private JavaDateFormatter(
258249
String format,
259250
OpenSearchDateTimePrinter printer,

server/src/main/java/org/opensearch/gateway/GatewayMetaState.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@
3838
import org.opensearch.ExceptionsHelper;
3939
import org.opensearch.OpenSearchException;
4040
import org.opensearch.Version;
41-
import org.opensearch.cluster.ClusterChangedEvent;
4241
import org.opensearch.cluster.ClusterName;
4342
import org.opensearch.cluster.ClusterState;
44-
import org.opensearch.cluster.ClusterStateApplier;
4543
import org.opensearch.cluster.coordination.CoordinationMetadata;
4644
import org.opensearch.cluster.coordination.CoordinationState.PersistedState;
4745
import org.opensearch.cluster.coordination.InMemoryPersistedState;
@@ -379,40 +377,6 @@ private static boolean applyPluginUpgraders(
379377
return false;
380378
}
381379

382-
private static class GatewayClusterApplier implements ClusterStateApplier {
383-
384-
private static final Logger logger = LogManager.getLogger(GatewayClusterApplier.class);
385-
386-
private final IncrementalClusterStateWriter incrementalClusterStateWriter;
387-
388-
private GatewayClusterApplier(IncrementalClusterStateWriter incrementalClusterStateWriter) {
389-
this.incrementalClusterStateWriter = incrementalClusterStateWriter;
390-
}
391-
392-
@Override
393-
public void applyClusterState(ClusterChangedEvent event) {
394-
if (event.state().blocks().disableStatePersistence()) {
395-
incrementalClusterStateWriter.setIncrementalWrite(false);
396-
return;
397-
}
398-
399-
try {
400-
// Hack: This is to ensure that non-cluster-manager-eligible Zen2 nodes always store a current term
401-
// that's higher than the last accepted term.
402-
// TODO: can we get rid of this hack?
403-
if (event.state().term() > incrementalClusterStateWriter.getPreviousManifest().getCurrentTerm()) {
404-
incrementalClusterStateWriter.setCurrentTerm(event.state().term());
405-
}
406-
407-
incrementalClusterStateWriter.updateClusterState(event.state());
408-
incrementalClusterStateWriter.setIncrementalWrite(true);
409-
} catch (WriteStateException e) {
410-
logger.warn("Exception occurred when storing new meta data", e);
411-
}
412-
}
413-
414-
}
415-
416380
@Override
417381
public void close() throws IOException {
418382
IOUtils.close(persistedStateRegistry);

server/src/main/java/org/opensearch/indices/replication/common/ReplicationLuceneIndex.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,6 @@ public int size() {
374374
return fileMetadataMap.size();
375375
}
376376

377-
public boolean isEmpty() {
378-
return fileMetadataMap.isEmpty();
379-
}
380-
381377
public void clear() {
382378
fileMetadataMap.clear();
383379
complete = false;

0 commit comments

Comments
 (0)